Merge branch 'dev/teguh' into 'development'

fix(BE): fix error get location id when only attach to location in expense

See merge request mbugroup/lti-api!119
This commit is contained in:
Hafizh A. Y.
2025-12-31 02:18:27 +00:00
10 changed files with 102 additions and 31 deletions
@@ -59,6 +59,14 @@ func (s nonstockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
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 {
supplierID := *params.SupplierID
db = db.Joins("JOIN nonstock_suppliers ON nonstock_suppliers.nonstock_id = nonstocks.id").
Where("nonstock_suppliers.supplier_id = ?", supplierID).
Group("nonstocks.id") // Prevent duplicates from join
}
if params.Search != "" {
return db.Where("name LIKE ?", "%"+params.Search+"%")
}
@@ -15,7 +15,8 @@ type Update struct {
}
type Query struct {
Page int `query:"page" validate:"omitempty,number,min=1"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100"`
Search string `query:"search" validate:"omitempty,max=50"`
Page int `query:"page" validate:"omitempty,number,min=1"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100"`
Search string `query:"search" validate:"omitempty,max=50"`
SupplierID *uint `query:"supplier_id" validate:"omitempty,gt=0"`
}