Merge branch 'feat/BE/US-279/closing-produksi' into 'feat/BE/Sprint-6'

Feat/be/us 279/closing produksi

See merge request mbugroup/lti-api!93

internal/database/migrations/20251210125335_add_column_credit_term_purchase_table.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE purchases
+    DROP COLUMN IF EXISTS credit_term;

internal/database/migrations/20251210125335_add_column_credit_term_purchase_table.up.sql

@@ -0,0 +1,5 @@
+ALTER TABLE purchases
+    ADD COLUMN IF NOT EXISTS credit_term INT NOT NULL DEFAULT 0;
+
+ALTER TABLE purchases
+    ALTER COLUMN credit_term DROP DEFAULT;

internal/entities/purchase.go

@@ -5,17 +5,18 @@ import (
 )
 
 type Purchase struct {
-	Id         uint `gorm:"primaryKey;autoIncrement"`
+	Id         uint   `gorm:"primaryKey;autoIncrement"`
 	PrNumber   string `gorm:"not null"`
 	PoNumber   *string
 	PoDate     *time.Time
 	SupplierId uint `gorm:"not null"`
+	CreditTerm int  `gorm:"column:credit_term;not null;default:0"`
 	DueDate    *time.Time
 	Notes      *string
 	CreatedAt  time.Time  `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time  `gorm:"autoUpdateTime"`
 	DeletedAt  *time.Time `gorm:"index"`
-	CreatedBy  uint     `gorm:"not null"`
+	CreatedBy  uint       `gorm:"not null"`
 
 	// Relations
 	Supplier       Supplier       `gorm:"foreignKey:SupplierId;references:Id"`

internal/modules/purchases/dto/purchase.dto.go

@@ -14,11 +14,12 @@ import (
 )
 
 type PurchaseRelationDTO struct {
-	Id       uint       `json:"id"`
+	Id         uint       `json:"id"`
-	PrNumber string     `json:"pr_number"`
+	PrNumber   string     `json:"pr_number"`
-	PoNumber *string    `json:"po_number"`
+	PoNumber   *string    `json:"po_number"`
-	PoDate   *time.Time `json:"po_date"`
+	PoDate     *time.Time `json:"po_date"`
-	Notes    *string    `json:"notes"`
+	CreditTerm int        `json:"credit_term"`
+	Notes      *string    `json:"notes"`
 }
 
 type PurchaseListDTO struct {
@@ -64,11 +65,12 @@ type PurchaseItemDTO struct {
 
 func ToPurchaseRelationDTO(p *entity.Purchase) PurchaseRelationDTO {
 	return PurchaseRelationDTO{
-		Id:       p.Id,
+		Id:         p.Id,
-		PrNumber: p.PrNumber,
+		PrNumber:   p.PrNumber,
-		PoNumber: p.PoNumber,
+		PoNumber:   p.PoNumber,
-		PoDate:   p.PoDate,
+		PoDate:     p.PoDate,
-		Notes:    p.Notes,
+		CreditTerm: p.CreditTerm,
+		Notes:      p.Notes,
 	}
 }
 

internal/modules/purchases/services/purchase.service.go

@@ -309,21 +309,17 @@ func (s *purchaseService) CreateOne(c *fiber.Ctx, req *validation.CreatePurchase
 		indexMap[key] = len(aggregated) - 1
 	}
 
-	// var dueDate *time.Time
+	var dueDate *time.Time
-	// if req.DueDate != nil && strings.TrimSpace(*req.DueDate) != "" {
+	now := time.Now().UTC()
-	// 	parsed, err := utils.ParseDateString(strings.TrimSpace(*req.DueDate))
+	d := now.AddDate(0, 0, req.CreditTerm)
-	// 	if err != nil {
+	dueDate = &d
-	// 		return nil, utils.BadRequest("Invalid due_date, expected YYYY-MM-DD")
-	// 	}
-	// 	parsed = parsed.UTC()
-	// 	dueDate = &parsed
-	// }
 
 	purchase := &entity.Purchase{
 		SupplierId: uint(req.SupplierID),
-		// DueDate:    dueDate,
+		CreditTerm: req.CreditTerm,
-		Notes:     req.Notes,
+		DueDate:    dueDate,
-		CreatedBy: uint(actorID),
+		Notes:      req.Notes,
+		CreatedBy:  uint(actorID),
 	}
 
 	items := make([]*entity.PurchaseItem, 0, len(aggregated))
@@ -683,6 +679,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 
 	visitedItems := make(map[uint]struct{}, len(req.Items))
 	prepared := make([]preparedReceiving, 0, len(req.Items))
+	var earliestReceived *time.Time
 	for _, payload := range req.Items {
 		item, exists := itemMap[payload.PurchaseItemID]
 		if !exists {
@@ -694,6 +691,10 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			return nil, utils.BadRequest(fmt.Sprintf("Invalid received_date for item %d", payload.PurchaseItemID))
 		}
 		receivedDate = receivedDate.UTC()
+		if earliestReceived == nil || receivedDate.Before(*earliestReceived) {
+			copy := receivedDate
+			earliestReceived = &copy
+		}
 
 		warehouseID := uint(item.WarehouseId)
 		overrideWarehouse := false
@@ -869,6 +870,16 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			return err
 		}
 
+		// Update due_date based on earliest received date when receiving approved.
+		if earliestReceived != nil {
+			due := earliestReceived.AddDate(0, 0, purchase.CreditTerm)
+			if err := tx.Model(&entity.Purchase{}).
+				Where("id = ?", purchase.Id).
+				Update("due_date", due).Error; err != nil {
+				return err
+			}
+		}
+
 		if s.FifoSvc != nil {
 			for _, adj := range fifoAdds {
 				if adj.pwID == 0 || adj.qty <= 0 {

internal/modules/purchases/validations/purchase.validation.go

@@ -8,6 +8,7 @@ type PurchaseItemPayload struct {
 
 type CreatePurchaseRequest struct {
 	SupplierID uint                  `json:"supplier_id" validate:"required,gt=0"`
+	CreditTerm int                   `json:"credit_term" validate:"required,number,gte=0"`
 	DueDate    *string               `json:"due_date,omitempty" validate:"omitempty,datetime=2006-01-02"`
 	Notes      *string               `json:"notes" validate:"omitempty,max=500"`
 	Items      []PurchaseItemPayload `json:"items" validate:"required,min=1,dive"`