gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-23 14:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(be): update nonstock query to use SupplierID as a non-pointer type

Browse Source
This commit is contained in:
aguhh18
2025-12-31 09:40:05 +07:00
parent d35d0bbe6b
commit 0fc560b91c
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/master/nonstocks/controllers/nonstock.controller.go
+5 -3
View File
@@ -23,10 +23,12 @@ func NewNonstockController(nonstockService service.NonstockService) *NonstockCon
} }
func (u *NonstockController) GetAll(c *fiber.Ctx) error { func (u *NonstockController) GetAll(c *fiber.Ctx) error {
query := &validation.Query{ query := &validation.Query{
Page: c.QueryInt("page", 1), Page: c.QueryInt("page", 1),
Limit: c.QueryInt("limit", 10), Limit: c.QueryInt("limit", 10),
Search: c.Query("search", ""), Search: c.Query("search", ""),
SupplierID: uint(c.QueryInt("supplier_id", 0)),
} }
if query.Page < 1 || query.Limit < 1 { if query.Page < 1 || query.Limit < 1 {
internal/modules/master/nonstocks/services/nonstock.service.go
+6 -6
View File
@@ -58,15 +58,15 @@ func (s nonstockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
offset := (params.Page - 1) * params.Limit offset := (params.Page - 1) * params.Limit
nonstocks, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB { nonstocks, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
db = s.withRelations(db)
if params.SupplierID != nil { if params.SupplierID > 0 {
supplierID := *params.SupplierID db = db.Joins("INNER JOIN nonstock_suppliers ON nonstock_suppliers.nonstock_id = nonstocks.id").
db = db.Joins("JOIN nonstock_suppliers ON nonstock_suppliers.nonstock_id = nonstocks.id"). Where("nonstock_suppliers.supplier_id = ?", params.SupplierID).
Where("nonstock_suppliers.supplier_id = ?", supplierID). Distinct()
Group("nonstocks.id") // Prevent duplicates from join
} }
db = s.withRelations(db)
if params.Search != "" { if params.Search != "" {
return db.Where("name LIKE ?", "%"+params.Search+"%") return db.Where("name LIKE ?", "%"+params.Search+"%")
} }
internal/modules/master/nonstocks/validations/nonstock.validation.go
+1 -1
View File
@@ -18,5 +18,5 @@ type Query struct {
Page int `query:"page" validate:"omitempty,number,min=1"` Page int `query:"page" validate:"omitempty,number,min=1"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100"` Limit int `query:"limit" validate:"omitempty,number,min=1,max=100"`
Search string `query:"search" validate:"omitempty,max=50"` Search string `query:"search" validate:"omitempty,max=50"`
SupplierID *uint `query:"supplier_id" validate:"omitempty,gt=0"` SupplierID uint `query:"supplier_id" validate:"omitempty,gt=0"`
} }