Merge pull request #7 from andreasgan/master

search

.gitpod.yml

@@ -3,6 +3,10 @@ tasks:
   - init: |
       make dependencies # runs during prebuild
       gp sync-done dependencies
+  - name: Docker
+    init: gp sync-await dependencies
+    command: docker-compose up -d
+    openMode: split-right
   - name: Admin Frontend
     init: gp sync-await dependencies
     command: make admin-backend

Makefile

@@ -1,35 +1,36 @@
 help: .PHONY
 	echo "Read the Makefile, im too lazy"
 
-dependencies:
+dependencies: .PHONY
 	npm install -g pnpm
 	go install -tags 'postgres' github.com/golang-migrate/migrate/v4/cmd/migrate@latest
 	go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
 
-local-setup:
+local-setup: .PHONY
 	cp backend/.env.example backend/.env
-	docker-compose up -d
+	cd local-setup && docker-compose up -d
 	make migrate
-	docker-compose down
-	cd frontend/admin
-	pnpm install
+	cd local-setup && docker-compose down
+	cd frontend/admin && pnpm install
 
-admin-frontend:
-	cd ./frontend/admin/
-	pnpm start
+admin-frontend: .PHONY
+	cd ./frontend/admin/ && pnpm start
 
-admin-backend:
+admin-backend: .PHONY
 	cd ./backend/admin/ && go run .
 
-migrate:
+m:  .PHONY
+	@echo migrate -database "postgres://postgres:password@localhost:5432/postgres?sslmode=disable" -path ./backend/db/migrations
+
+migrate: .PHONY
 	migrate -database "postgres://postgres:password@localhost:5432/postgres?sslmode=disable" -path ./backend/db/migrations up
 
-mock:
+mock: .PHONY
 	mock-dev custom -f ./backend/db/mock/mock_skeleton.yaml --database postgres -v --password password
 
-test-build:
+test-build: .PHONY
 	docker build -t brunstadtv-admin-test:latest -f ./backend/Dockerfile.test ./backend --progress=plain
 
-test:
+test: .PHONY
 	make test-build
 	cd backend && go test ./... -v

README.md

@@ -13,7 +13,7 @@
 
 ### First steps
 
-- Run `docker-compose up` in the repository root folder. This sets up a postgres database and Typesense.
+- Run `docker-compose up` in the /local-setup folder. This sets up a postgres database and Typesense.
 - Run migrations. See [Migrations](#migrations)
 - Open the go project at `backend/admin/` (or run `make admin-backend`)
 - Open `frontend` and run `pnpm install` and `pnpm start`

backend/admin/assets.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -15,7 +14,7 @@ import (
 )
 
 func (s *Server) GetAsset(c *gin.Context) {
-	ctx := context.Background()
+	ctx := c.Request.Context()
 	idString, _ := c.Params.Get("id")
 	id, err := strconv.ParseInt(idString, 10, 64)
 	if err != nil {

backend/admin/main.go

@@ -86,7 +86,7 @@ func main() {
 		MaxAge:           12 * time.Hour,
 	}))
 
-	r.POST("/index", search.Index)
+	r.POST("/search/sync", search.Synchronize)
 	r.GET("/tags", s.GetTags)
 	r.GET("/tags/:id", s.GetTag)
 	r.PUT("/tags/:id", s.UpsertTag)
@@ -119,5 +119,5 @@ func main() {
 	r.POST("/subclip", subclip.Create)
 	r.GET("/subclip/:id", subclip.Get)
 	r.PUT("/subclip/:id", subclip.Update)
-	r.Run() // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
+	r.Run("0.0.0.0:8080") // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
 }

backend/admin/medias.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -20,7 +19,7 @@ type MediaServer struct {
 }
 
 func (s *MediaServer) Get(c *gin.Context) {
-	ctx := context.Background()
+	ctx := c.Request.Context()
 	idString, _ := c.Params.Get("id")
 	id, err := strconv.ParseInt(idString, 10, 64)
 	if err != nil {
@@ -126,7 +125,7 @@ func (s *MediaServer) Create(c *gin.Context) {
 		params.MediaType = null.StringFrom(s.FilterByType)
 	}
 	// os.Getenv("DATABASE_URL")
-	ctx := context.Background()
+	ctx := c.Request.Context()
 	media, err := s.Server.queries.InsertMedia(ctx, params)
 	if err != nil {
 		fmt.Println(err)
@@ -155,7 +154,7 @@ func (s *MediaServer) Update(c *gin.Context) {
 		return
 	}
 	// os.Getenv("DATABASE_URL")
-	ctx := context.Background()
+	ctx := c.Request.Context()
 	media, err := s.Server.queries.UpsertMedia(ctx, params)
 	if err != nil {
 		fmt.Println(err)