Merge branch 'master' of https://github.com/YOGESH-08/devsoc-backend-26

Author: YOGESH-08

.env.example

@@ -15,4 +15,36 @@ ENV=
 
 GOOSE_MIGRATION_DIR=database/schema
 GOOSE_DRIVER=postgres
-GOOSE_DBSTRING=postgres://devsoc:devsoc@localhost:5432/devsoc?sslmode=disable
+GOOSE_DBSTRING=postgres://devsoc:devsoc@localhost:5432/devsoc?sslmode=disable
+
+SMTP_ACCOUNTS=6
+
+SMTP_0_HOST=
+SMTP_0_PORT=
+SMTP_0_USER=
+SMTP_0_PASS=
+
+SMTP_1_HOST=
+SMTP_1_PORT=
+SMTP_1_USER=
+SMTP_1_PASS=
+
+SMTP_2_HOST=
+SMTP_2_PORT=
+SMTP_2_USER=
+SMTP_2_PASS=
+
+SMTP_3_HOST=
+SMTP_3_PORT=
+SMTP_3_USER=
+SMTP_3_PASS=
+
+SMTP_4_HOST=
+SMTP_4_PORT=
+SMTP_4_USER=
+SMTP_4_PASS=
+
+SMTP_5_HOST=
+SMTP_5_PORT=
+SMTP_5_USER=
+SMTP_5_PASS=

database/queries/comments.sql

@@ -0,0 +1,36 @@
+-- name: CreateComment :one
+INSERT INTO comment (
+    id,
+    team_id,
+    comment,
+    round,
+    created_by
+)
+VALUES ($1, $2, $3, $4, $5)
+RETURNING *;
+
+-- name: GetCommentByRound :one
+SELECT *
+FROM comment
+WHERE team_id = $1 AND round = $2;
+
+-- name: GetAllComments :many
+SELECT *
+FROM comment
+WHERE team_id = $1;
+
+-- name: CommentExistsByRound :one
+SELECT EXISTS (
+    SELECT 1
+    FROM comment
+    WHERE team_id = $1 AND round = $2
+);
+
+-- name: UpdateComment :one
+UPDATE comment
+SET comment = $1
+WHERE team_id = $2 and round = $3
+RETURNING *;
+
+-- name: DeleteComment :exec
+DELETE FROM comment WHERE team_id = $1 and round = $2;

database/queries/users.sql

@@ -26,4 +26,9 @@ SELECT EXISTS (
   SELECT 1
   FROM users
   WHERE email = $1
-);
+);
+
+-- name: GetUserIDByEmail :one
+SELECT id
+FROM users
+WHERE email = $1;

database/schema/008_add_round_to_comment.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+
+ALTER TABLE comment
+ADD COLUMN round INTEGER NOT NULL DEFAULT 0;
+
+-- +goose Down
+
+ALTER TABLE comment
+DROP COLUMN round;

database/schema/008_foreign_keys.sql database/schema/009_foreign_keys.sqldatabase/schema/008_foreign_keys.sql renamed to database/schema/009_foreign_keys.sql

@@ -27,6 +27,8 @@ services:
       - .:/app
     env_file:
       - .env
+    environment:
+      - GOFLAGS=-buildvcs=false
     restart: on-failure
     depends_on:
       - postgres

docker-compose.yml

@@ -5,8 +5,6 @@ import (
 	"errors"
 	"time"
 
-	"github.com/google/uuid"
-
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/db"
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/redis"
 	"github.com/CodeChefVIT/devsoc-backend-26/pkg/utils"
@@ -33,7 +31,11 @@ func SendOTP(email string) error {
 		return errors.New("otp already sent")
 	}
 
-	otp := utils.GenerateOTP()
+	otp, err := utils.GenerateOTP()
+	if err != nil {
+		return errors.New("failed to generate otp")
+	}
+
 	hashed := utils.HashOTP(otp)
 
 	err = redis.Client.Set(
@@ -47,26 +49,36 @@ func SendOTP(email string) error {
 		return err
 	}
 
-	println("OTP:", otp)
+	err = utils.SendMail(email, otp)
+	if err != nil {
+		redis.Client.Del(redis.Ctx, key)
+		return err
+	}
+
 	return nil
 }
 
-
 func VerifyOTP(email, otp string) (string, error) {
 	key := "otp:" + email
 
 	storedHash, err := redis.Client.Get(redis.Ctx, key).Result()
 	if err != nil {
+		if redis.IsKeyMissing(err) {
+			return "", errors.New("otp expired or invalid")
+		}
 		return "", err
 	}
 
 	if utils.HashOTP(otp) != storedHash {
-		return "", err
+		return "", errors.New("invalid otp")
 	}
 
 	redis.Client.Del(redis.Ctx, key)
 
-	userID := uuid.New().String()
+	userID, err := db.Queries.GetUserIDByEmail(context.Background(), email)
+	if err != nil {
+		return "", err
+	}
 
-	return utils.CreateJWT(userID, email)
+	return utils.CreateJWT(userID.String(), email)
 }