Add item_expense

2026-05-25 16:19:36 +07:00
parent da87d659df
commit b8be29e110
12 changed files with 439 additions and 181 deletions
@@ -11,19 +11,18 @@ func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
 	}

 	return &models.Expense{
-		ID:               entity.ID,
-		OrganizationID:   entity.OrganizationID,
-		OutletID:         entity.OutletID,
-		Receiver:         entity.Receiver,
-		TransactionDate:  entity.TransactionDate,
-		CodeNumber:       entity.CodeNumber,
-		ChartOfAccountID: entity.ChartOfAccountID,
-		Description:      entity.Description,
-		Tax:              entity.Tax,
-		Total:            entity.Total,
-		Reserved1:        entity.Reserved1,
-		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:        entity.UpdatedAt,
+		ID:              entity.ID,
+		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
+		Receiver:        entity.Receiver,
+		TransactionDate: entity.TransactionDate,
+		CodeNumber:      entity.CodeNumber,
+		Description:     entity.Description,
+		Tax:             entity.Tax,
+		Total:           entity.Total,
+		Reserved1:       entity.Reserved1,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
 	}
 }

@@ -33,19 +32,18 @@ func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
 	}

 	return &entities.Expense{
-		ID:               model.ID,
-		OrganizationID:   model.OrganizationID,
-		OutletID:         model.OutletID,
-		Receiver:         model.Receiver,
-		TransactionDate:  model.TransactionDate,
-		CodeNumber:       model.CodeNumber,
-		ChartOfAccountID: model.ChartOfAccountID,
-		Description:      model.Description,
-		Tax:              model.Tax,
-		Total:            model.Total,
-		Reserved1:        model.Reserved1,
-		CreatedAt:        model.CreatedAt,
-		UpdatedAt:        model.UpdatedAt,
+		ID:              model.ID,
+		OrganizationID:  model.OrganizationID,
+		OutletID:        model.OutletID,
+		Receiver:        model.Receiver,
+		TransactionDate: model.TransactionDate,
+		CodeNumber:      model.CodeNumber,
+		Description:     model.Description,
+		Tax:             model.Tax,
+		Total:           model.Total,
+		Reserved1:       model.Reserved1,
+		CreatedAt:       model.CreatedAt,
+		UpdatedAt:       model.UpdatedAt,
 	}
 }

@@ -55,23 +53,22 @@ func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
 	}

 	resp := &models.ExpenseResponse{
-		ID:               entity.ID,
-		OrganizationID:   entity.OrganizationID,
-		OutletID:         entity.OutletID,
-		Receiver:         entity.Receiver,
-		TransactionDate:  entity.TransactionDate,
-		CodeNumber:       entity.CodeNumber,
-		ChartOfAccountID: entity.ChartOfAccountID,
-		Description:      entity.Description,
-		Tax:              entity.Tax,
-		Total:            entity.Total,
-		Reserved1:        entity.Reserved1,
-		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:        entity.UpdatedAt,
+		ID:              entity.ID,
+		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
+		Receiver:        entity.Receiver,
+		TransactionDate: entity.TransactionDate,
+		CodeNumber:      entity.CodeNumber,
+		Description:     entity.Description,
+		Tax:             entity.Tax,
+		Total:           entity.Total,
+		Reserved1:       entity.Reserved1,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
 	}

-	if entity.ChartOfAccount != nil {
-		resp.ChartOfAccountName = entity.ChartOfAccount.Name
+	if entity.Items != nil {
+		resp.Items = ExpenseItemEntitiesToResponses(entity.Items)
 	}

 	return resp
@@ -88,3 +85,40 @@ func ExpenseEntitiesToResponses(entities []*entities.Expense) []*models.ExpenseR
 	}
 	return responses
 }
+
+func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseItemResponse {
+	if entity == nil {
+		return nil
+	}
+
+	response := &models.ExpenseItemResponse{
+		ID:               entity.ID,
+		ExpenseID:        entity.ExpenseID,
+		ChartOfAccountID: entity.ChartOfAccountID,
+		Description:      entity.Description,
+		Amount:           entity.Amount,
+		CreatedAt:        entity.CreatedAt,
+		UpdatedAt:        entity.UpdatedAt,
+	}
+
+	if entity.ChartOfAccount != nil {
+		response.ChartOfAccountName = entity.ChartOfAccount.Name
+	}
+
+	return response
+}
+
+func ExpenseItemEntitiesToResponses(entities []entities.ExpenseItem) []models.ExpenseItemResponse {
+	if entities == nil {
+		return nil
+	}
+
+	responses := make([]models.ExpenseItemResponse, len(entities))
+	for i, entity := range entities {
+		response := ExpenseItemEntityToResponse(&entity)
+		if response != nil {
+			responses[i] = *response
+		}
+	}
+	return responses
+}