Add base site, needs clean-up

This commit is contained in:
2021-12-26 00:02:51 +01:00
parent ed4475149a
commit ec313045f1
28 changed files with 2806 additions and 18 deletions

View File

@@ -1,6 +1,7 @@
package download
import (
"context"
"downloader/internal/app/api/common/responses"
"downloader/internal/core/entities"
"errors"
@@ -48,6 +49,12 @@ func (a *api) requestDownload(w http.ResponseWriter, r *http.Request) {
func (a *api) getDownloads(writer http.ResponseWriter, request *http.Request) {
ctx := request.Context()
if done := request.URL.Query().Get("done"); done == "true" {
_ = a.getDoneDownloads(writer, request, ctx)
return
}
active := request.URL.Query().Get("active") == "true"
downloads, err := a.drService.GetAll(ctx, active)
if err != nil {
@@ -59,7 +66,20 @@ func (a *api) getDownloads(writer http.ResponseWriter, request *http.Request) {
_ = render.Render(writer, request, responses.ErrInvalidRequest(err))
return
}
}
func (a *api) getDoneDownloads(writer http.ResponseWriter, request *http.Request, ctx context.Context) bool {
downloads, err := a.drService.GetDone(ctx)
if err != nil {
_ = render.Render(writer, request, responses.ErrInvalidRequest(err))
return true
}
if err = render.RenderList(writer, request, newDownloadsResponse(downloads)); err != nil {
_ = render.Render(writer, request, responses.ErrInvalidRequest(err))
return true
}
return false
}
func (a *api) getDownloadById(w http.ResponseWriter, r *http.Request) {

View File

@@ -10,13 +10,13 @@ func New() *zap.SugaredLogger {
consoleEncoder := zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig())
jsonEncoder := zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig())
consoleDebugging := zapcore.Lock(os.Stdout)
lowPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
return lvl < zapcore.ErrorLevel
})
highPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
return lvl >= zapcore.ErrorLevel
})
consoleDebugging := zapcore.Lock(os.Stdout)
consoleErrors := zapcore.Lock(os.Stderr)
core := zapcore.NewTee(
zapcore.NewCore(jsonEncoder, consoleErrors, highPriority),

View File

@@ -17,6 +17,7 @@ import (
"downloader/pkg/common/uuid"
"github.com/go-chi/chi"
"github.com/go-chi/chi/middleware"
"github.com/go-chi/cors"
"net/http"
"time"
)
@@ -49,7 +50,14 @@ func (router *router) setupMiddleware() *router {
router.internalRouter.Use(middleware.RealIP)
router.internalRouter.Use(middleware.Recoverer)
router.internalRouter.Use(middleware.Timeout(time.Second * 60))
router.internalRouter.Use(cors.Handler(cors.Options{
AllowedOrigins: []string{"https://*", "http://*"},
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token"},
ExposedHeaders: []string{"Link"},
AllowCredentials: false,
MaxAge: 300,
}))
return router
}
@@ -80,6 +88,6 @@ func setupDownloadRoute(router *router) {
downloadApi := download.New(drService)
downloadApi.SetupDownloadApi(router.internalRouter)
cleanupJob := cleanup.New(drRepository, newLogger)
cleanupJob := cleanup.New(drRepository, newLogger, fileOrchestrator)
cleanupJob.RunOnSchedule()
}