migrated to models

Author: Shubhaankar-Sharma

Dockerfile

@@ -4,4 +4,5 @@ COPY . .
 RUN go build -o main main.go
 
 EXPOSE 5000
-CMD /app/main migrate_up| true;/app/main runserver --host 0.0.0.0
+CMD /app/main runserver --host 0.0.0.0
+# /app/main migrate_up| true;/app/main runserver --host 0.0.0.0

api/handlers_test.go

@@ -43,8 +43,7 @@ func createAuthToken(exp int64) (string, error) {
 	claims := jwt.MapClaims{}
 
 	claims["uid"] = fmt.Sprintf("%v",
-		utils.RandomInt(328604827967815690,
-			735376244656308274))
+		328604827967815690)
 	claims["exp"] = exp //time.Now().Add(time.Hour * 24).Unix()
 	claims["IssuedAt"] = time.Now().Unix()
 	token := jwt.NewWithClaims(jwt.GetSigningMethod("HS256"), claims)

api/main_test.go

@@ -1,10 +1,12 @@
 package api
 
 import (
+	"context"
 	"log"
 	"os"
 	"testing"
 
+	db "github.com/Tech-With-Tim/cdn/db/sqlc"
 	"github.com/Tech-With-Tim/cdn/server"
 	"github.com/Tech-With-Tim/cdn/utils"
 	"github.com/go-chi/chi/v5"
@@ -25,7 +27,21 @@ func TestMain(m *testing.M) {
 	MainRouter(CdnRouter, s.Store, conf)
 	//Mount Routers here
 	s.Router.Mount("/", CdnRouter)
+	err = createTestUser()
+	if err != nil {
+		log.Fatalf("error: %v", err.Error())
+	}
 
 	os.Exit(m.Run())
 
 }
+
+func createTestUser() error {
+	user := db.CreateUserParams{
+		ID:            328604827967815690,
+		Username:      utils.RandomString(4),
+		Discriminator: "3212",
+	}
+	err := s.Store.CreateUser(context.Background(), user)
+	return err
+}

cache/cache_test.go

@@ -22,7 +22,7 @@ func createRandomAsset(t *testing.T) (db.CreateAssetParams, int64) {
 		Data:      utils.StrToBinary(utils.RandomString(16), 10),
 		Name_2:    utils.RandomString(4), //AssetName
 		UrlPath:   utils.RandomString(4),
-		CreatorID: 735376244656308274,
+		CreatorID: 735376244656308212,
 	}
 	//Context.Background() is to provide empty Context For tests
 	assetId, err := testQueries.CreateAsset(context.Background(), arg)
@@ -40,6 +40,16 @@ func cleanup(t *testing.T, asset db.CreateAssetParams) {
 	require.NoError(t, err)
 }
 
+func createTestUser(t *testing.T) {
+	user := db.CreateUserParams{
+		ID:            735376244656308212,
+		Username:      utils.RandomString(4),
+		Discriminator: "9123",
+	}
+	err := testQueries.CreateUser(context.Background(), user)
+	require.NoError(t, err)
+}
+
 func TestMain(m *testing.M) {
 	config, err := utils.LoadConfig("../", "test")
 	if err != nil {
@@ -59,6 +69,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestRedisCache_Set(t *testing.T) {
+	createTestUser(t)
 	var n = 10
 	fileRowChan := make(chan db.GetFileRow)
 	errChan := make(chan error)

db/migration/000001_init_schema.down.sql

@@ -39,3 +39,7 @@ WHERE creator_id = $1
 ORDER BY id
 LIMIT $2 -- PageSize
     OFFSET $3; -- ((Pagenumber - 1) * PageSize)
+
+
+-- name: CreateUser :exec
+INSERT INTO users (id, username, discriminator) VALUES ($1, $2, $3);

db/migration/000001_init_schema.up.sql

@@ -38,7 +38,6 @@ func cleanup(t *testing.T, asset CreateAssetParams) {
 
 func TestQueries_CreateAsset(t *testing.T) {
 	store := NewStore(testDB) //testDb is a global var check cdn_test.go
-
 	// run 6 concurrent transactions
 	n := 6
 	errors := make(chan error)

db/query/cdn.sql

@@ -1,6 +1,7 @@
 package db
 
 import (
+	"context"
 	"database/sql"
 	"log"
 	"os"
@@ -24,5 +25,19 @@ func TestMain(m *testing.M) {
 		log.Fatalln(err.Error())
 	}
 	testQueries = New(testDB)
+	err = createTestUser()
+	if err != nil {
+		log.Fatalf("error: %v", err.Error())
+	}
 	os.Exit(m.Run())
 }
+
+func createTestUser() error {
+	user := CreateUserParams{
+		ID:            735376244656308274,
+		Username:      utils.RandomString(5),
+		Discriminator: "4876",
+	}
+	err := testQueries.CreateUser(context.Background(), user)
+	return err
+}

db/sqlc/cdn.sql.go

@@ -58,7 +58,7 @@ func commands(config utils.Config) {
 				if err != nil {
 					return err
 				}
-				err = utils.MigrateUp(conf, "./db/migration/")
+				err = utils.MigrateUp(conf, "./models/migrations/")
 				if err != nil {
 					return err
 				}
@@ -80,7 +80,7 @@ func commands(config utils.Config) {
 				if err != nil {
 					return err
 				}
-				err = utils.MigrateDown(conf, "./db/migration/")
+				err = utils.MigrateDown(conf, "./models/migrations/")
 				if err != nil {
 					return err
 				}
@@ -106,7 +106,7 @@ func commands(config utils.Config) {
 				if err != nil {
 					return err
 				}
-				err = utils.MigrateSteps(c.Int("steps"), conf, "./db/migration/")
+				err = utils.MigrateSteps(c.Int("steps"), conf, "./models/migrations/")
 				if err != nil {
 					return err
 				}

db/sqlc/cdn_test.go

@@ -3,7 +3,7 @@ packages:
   - name: "db"
     path: "./db/sqlc"
     queries: "./db/query/"
-    schema: "./db/migration/"
+    schema: "./models/migrations/"
     engine: "postgresql"
     emit_prepared_queries: false
     emit_interface: false

db/sqlc/main_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestMigrateUp(t *testing.T) {
-	err := MigrateUp(config, "../db/migration/")
+	err := MigrateUp(config, "../models/migrations/")
 	if err != nil {
 		if err != migrate.ErrNoChange {
 			require.NoError(t, err)
@@ -17,11 +17,11 @@ func TestMigrateUp(t *testing.T) {
 }
 
 func TestMigrateDown(t *testing.T) {
-	err := MigrateDown(config, "../db/migration/")
+	err := MigrateDown(config, "../models/migrations/")
 	require.NoError(t, err)
 }
 
 func TestMigrateSteps(t *testing.T) {
-	err := MigrateSteps(1, config, "../db/migration/")
+	err := MigrateSteps(1, config, "../models/migrations/")
 	require.NoError(t, err)
 }