chore: resolve remaining issues

Author: 1995parham

.golangci.yml

@@ -14,3 +14,10 @@ linters:
     - wrapcheck
     # we prefer inline error handling
     - noinlineerr
+    # deprecated, replaced by wsl_v5
+    - wsl
+  settings:
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2

internal/infra/http/handler/student.go

@@ -1,8 +1,9 @@
 package handler
 
 import (
+	"crypto/rand"
 	"errors"
-	"math/rand"
+	"math/big"
 	"net/http"
 	"strconv"
 
@@ -69,9 +70,6 @@ func (s *Student) Get(c echo.Context) error {
 		LastName:     lnPtr,
 		EntranceYear: nil,
 	})
-	if len(students) == 0 {
-		return echo.ErrNotFound
-	}
 
 	return c.JSON(http.StatusOK, students)
 }
@@ -84,11 +82,16 @@ func (s *Student) Create(c echo.Context) error {
 	}
 
 	if err := req.Validate(); err != nil {
-		return echo.ErrBadRequest
+		return echo.NewHTTPError(http.StatusBadRequest, err.Error())
+	}
+
+	// nolint: mnd
+	randID, err := rand.Int(rand.Reader, big.NewInt(1_000_000))
+	if err != nil {
+		return echo.ErrInternalServerError
 	}
 
-	// nolint: gosec, mnd
-	id := rand.Uint64() % 1_000_000
+	id := randID.Uint64()
 
 	if err := s.repo.Add(c.Request().Context(), model.Student{
 		ID:           id,
@@ -110,5 +113,5 @@ func (s *Student) Create(c echo.Context) error {
 func (s *Student) Register(g *echo.Group) {
 	g.GET("", s.Get)
 	g.POST("", s.Create)
-	g.GET(":id", s.GetByID)
+	g.GET("/:id", s.GetByID)
 }

internal/infra/repository/studentsql/student.go

@@ -11,8 +11,9 @@ import (
 )
 
 type StudentDTO struct {
-	model.Student
+	model.Student `gorm:"embedded"`
 
+	ID        uint64         `gorm:"primaryKey;autoIncrement:false"`
 	CreatedAt time.Time
 	UpdatedAt time.Time
 	DeletedAt gorm.DeletedAt `gorm:"index"`
@@ -30,7 +31,7 @@ func New(db *gorm.DB) *Repository {
 
 func (r *Repository) Add(ctx context.Context, model model.Student) error {
 	// nolint: exhaustruct
-	if err := r.db.WithContext(ctx).Create(StudentDTO{Student: model}).Error; err != nil {
+	if err := r.db.WithContext(ctx).Create(StudentDTO{ID: model.ID, Student: model}).Error; err != nil {
 		if errors.Is(err, gorm.ErrDuplicatedKey) {
 			return studentrepo.ErrStudentIDDuplicate
 		}
@@ -41,7 +42,7 @@ func (r *Repository) Add(ctx context.Context, model model.Student) error {
 	return nil
 }
 
-func (r *Repository) Get(_ context.Context, cmd studentrepo.GetCommand) []model.Student {
+func (r *Repository) Get(ctx context.Context, cmd studentrepo.GetCommand) []model.Student {
 	var studentDTOs []StudentDTO
 
 	var condition StudentDTO
@@ -62,14 +63,15 @@ func (r *Repository) Get(_ context.Context, cmd studentrepo.GetCommand) []model.
 		condition.EntranceYear = *cmd.EntranceYear
 	}
 
-	if err := r.db.Where(&condition).Find(&studentDTOs).Error; err != nil {
+	if err := r.db.WithContext(ctx).Where(&condition).Find(&studentDTOs).Error; err != nil {
 		return nil
 	}
 
 	students := make([]model.Student, len(studentDTOs))
 
 	for index, dto := range studentDTOs {
 		students[index] = dto.Student
+		students[index].ID = dto.ID
 	}
 
 	return students