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

FIX[BE]: fix logic on Chickin Laying not convert to layer but still Pullet, and inisiate laying transfer migration and base basic API

Browse Source
This commit is contained in:
aguhh18
2025-11-04 08:24:38 +07:00
parent c72db5bd18
commit 8220e34302
22 changed files with 587 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/production/transfer_layings/controllers/transfer_laying.controller.go
+6 -3
View File
@@ -24,9 +24,12 @@ func NewTransferLayingController(transferLayingService service.TransferLayingSer
func (u *TransferLayingController) GetAll(c *fiber.Ctx) error {
query := &validation.Query{
Page: c.QueryInt("page", 1),
Limit: c.QueryInt("limit", 10),
Search: c.Query("search", ""),
Page: c.QueryInt("page", 1),
Limit: c.QueryInt("limit", 10),
SourceProjectFlockId: uint(c.QueryInt("source_project_flock_id", 0)),
TargetProjectFlockId: uint(c.QueryInt("target_project_flock_id", 0)),
TransferDateFrom: c.Query("transfer_date_from", ""),
TransferDateTo: c.Query("transfer_date_to", ""),
}
if query.Page < 1 || query.Limit < 1 {
internal/modules/production/transfer_layings/repositories/laying_transfer.repository.go
+17 -1
View File
@@ -1,6 +1,8 @@
package repository
import (
"context"
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
"gorm.io/gorm"
@@ -8,15 +10,29 @@ import (
type TransferLayingRepository interface {
repository.BaseRepository[entity.LayingTransfer]
GetByTransferNumber(ctx context.Context, transferNumber string) (*entity.LayingTransfer, error)
}
type TransferLayingRepositoryImpl struct {
*repository.BaseRepositoryImpl[entity.LayingTransfer]
db *gorm.DB
}
func NewTransferLayingRepository(db *gorm.DB) TransferLayingRepository {
return &TransferLayingRepositoryImpl{
BaseRepositoryImpl: repository.NewBaseRepository[entity.LayingTransfer](db),
db: db,
}
}
func (r *TransferLayingRepositoryImpl) GetByTransferNumber(ctx context.Context, transferNumber string) (*entity.LayingTransfer, error) {
var transfer entity.LayingTransfer
err := r.db.WithContext(ctx).
Where("transfer_number = ?", transferNumber).
Where("deleted_at IS NULL").
First(&transfer).Error
if err != nil {
return nil, err
}
return &transfer, nil
}
internal/modules/production/transfer_layings/repositories/laying_transfer_source.repository.go
+38
View File
@@ -0,0 +1,38 @@
package repository
import (
"context"
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
"gorm.io/gorm"
)
type LayingTransferSourceRepository interface {
repository.BaseRepository[entity.LayingTransferSource]
GetByLayingTransferId(ctx context.Context, layingTransferId uint) ([]entity.LayingTransferSource, error)
}
type LayingTransferSourceRepositoryImpl struct {
*repository.BaseRepositoryImpl[entity.LayingTransferSource]
db *gorm.DB
}
func NewLayingTransferSourceRepository(db *gorm.DB) LayingTransferSourceRepository {
return &LayingTransferSourceRepositoryImpl{
BaseRepositoryImpl: repository.NewBaseRepository[entity.LayingTransferSource](db),
db: db,
}
}
func (r *LayingTransferSourceRepositoryImpl) GetByLayingTransferId(ctx context.Context, layingTransferId uint) ([]entity.LayingTransferSource, error) {
var sources []entity.LayingTransferSource
err := r.db.WithContext(ctx).
Where("laying_transfer_id = ?", layingTransferId).
Order("created_at DESC").
Find(&sources).Error
if err != nil {
return nil, err
}
return sources, nil
}
internal/modules/production/transfer_layings/repositories/laying_transfer_target.repository.go
+38
View File
@@ -0,0 +1,38 @@
package repository
import (
"context"
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
"gorm.io/gorm"
)
type LayingTransferTargetRepository interface {
repository.BaseRepository[entity.LayingTransferTarget]
GetByLayingTransferId(ctx context.Context, layingTransferId uint) ([]entity.LayingTransferTarget, error)
}
type LayingTransferTargetRepositoryImpl struct {
*repository.BaseRepositoryImpl[entity.LayingTransferTarget]
db *gorm.DB
}
func NewLayingTransferTargetRepository(db *gorm.DB) LayingTransferTargetRepository {
return &LayingTransferTargetRepositoryImpl{
BaseRepositoryImpl: repository.NewBaseRepository[entity.LayingTransferTarget](db),
db: db,
}
}
func (r *LayingTransferTargetRepositoryImpl) GetByLayingTransferId(ctx context.Context, layingTransferId uint) ([]entity.LayingTransferTarget, error) {
var targets []entity.LayingTransferTarget
err := r.db.WithContext(ctx).
Where("laying_transfer_id = ?", layingTransferId).
Order("created_at DESC").
Find(&targets).Error
if err != nil {
return nil, err
}
return targets, nil
}
internal/modules/production/transfer_layings/services/transfer_laying.service.go
+30 -7
View File
@@ -55,8 +55,17 @@ func (s transferLayingService) GetAll(c *fiber.Ctx, params *validation.Query) ([
transferLayings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
db = s.withRelations(db)
if params.Search != "" {
return db.Where("name LIKE ?", "%"+params.Search+"%")
if params.SourceProjectFlockId != 0 {
db = db.Where("from_project_flock_id = ?", params.SourceProjectFlockId)
}
if params.TargetProjectFlockId != 0 {
db = db.Where("to_project_flock_id = ?", params.TargetProjectFlockId)
}
if params.TransferDateFrom != "" {
db = db.Where("transfer_date >= ?", params.TransferDateFrom)
}
if params.TransferDateTo != "" {
db = db.Where("transfer_date <= ?", params.TransferDateTo)
}
return db.Order("created_at DESC").Order("updated_at DESC")
})
@@ -92,9 +101,19 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
return nil, err
}
for _, detail := range req.Details {
// Validate source kandangs
for _, detail := range req.SourceKandangs {
if err := common.EnsureRelations(c.Context(),
common.RelationCheck{Name: "Project Flock Kandang", ID: &detail.SourceProjectFlockKandangId, Exists: s.ProjectFlockKandangRepo.IdExists},
common.RelationCheck{Name: "Source Project Flock Kandang", ID: &detail.ProjectFlockKandangId, Exists: s.ProjectFlockKandangRepo.IdExists},
); err != nil {
return nil, err
}
}
// Validate target kandangs
for _, detail := range req.TargetKandangs {
if err := common.EnsureRelations(c.Context(),
common.RelationCheck{Name: "Target Project Flock Kandang", ID: &detail.ProjectFlockKandangId, Exists: s.ProjectFlockKandangRepo.IdExists},
); err != nil {
return nil, err
}
@@ -106,7 +125,7 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
}
var totalQty float64
for _, item := range req.Details {
for _, item := range req.SourceKandangs {
totalQty += item.Quantity
}
@@ -142,8 +161,12 @@ func (s transferLayingService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
updateBody := make(map[string]any)
if req.Name != nil {
updateBody["name"] = *req.Name
if req.TransferDate != nil {
updateBody["transfer_date"] = *req.TransferDate
}
if req.Reason != nil {
updateBody["notes"] = *req.Reason
}
if len(updateBody) == 0 {
internal/modules/production/transfer_layings/validations/transfer_laying.validation.go
+22 -12
View File
@@ -1,24 +1,34 @@
package validation
type CreateDetail struct {
SourceProjectFlockKandangId uint `json:"source_project_flock_kandang_id" validate:"required"`
Quantity float64 `json:"quantity" validate:"required,gt=0"`
type SourceKandangDetail struct {
ProjectFlockKandangId uint `json:"project_flock_kandang_id" validate:"required"`
Quantity float64 `json:"quantity" validate:"required,gt=0"`
}
type TargetKandangDetail struct {
ProjectFlockKandangId uint `json:"project_flock_kandang_id" validate:"required"`
Quantity float64 `json:"quantity" validate:"required,gt=0"`
}
type Create struct {
TransferDate string `json:"transfer_date" validate:"required,datetime=2006-01-02"`
SourceProjectFlockId uint `json:"source_project_flock_id" validate:"required"`
TargetProjectFlockId uint `json:"target_project_flock_id" validate:"required"`
Details []CreateDetail `json:"details" validate:"required,min=1,dive,required"`
Reason string `json:"reason" validate:"omitempty,max=1000"`
TransferDate string `json:"transfer_date" validate:"required,datetime=2006-01-02"`
SourceProjectFlockId uint `json:"source_project_flock_id" validate:"required"`
TargetProjectFlockId uint `json:"target_project_flock_id" validate:"required"`
SourceKandangs []SourceKandangDetail `json:"source_kandangs" validate:"required,min=1,dive,required"`
TargetKandangs []TargetKandangDetail `json:"target_kandangs" validate:"required,min=1,dive,required"`
Reason string `json:"reason" validate:"omitempty,max=1000"`
}
type Update struct {
Name *string `json:"name,omitempty" validate:"omitempty"`
TransferDate *string `json:"transfer_date,omitempty" validate:"omitempty,datetime=2006-01-02"`
Reason *string `json:"reason,omitempty" validate:"omitempty,max=1000"`
}
type Query struct {
Page int `query:"page" validate:"omitempty,number,min=1,gt=0"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
Search string `query:"search" validate:"omitempty,max=50"`
Page int `query:"page" validate:"omitempty,number,min=1,gt=0"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
SourceProjectFlockId uint `query:"source_project_flock_id" validate:"omitempty"`
TargetProjectFlockId uint `query:"target_project_flock_id" validate:"omitempty"`
TransferDateFrom string `query:"transfer_date_from" validate:"omitempty,datetime=2006-01-02"`
TransferDateTo string `query:"transfer_date_to" validate:"omitempty,datetime=2006-01-02"`
}