gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(BE): edit customer, finance: bank optional, nominal minus, and filter

Browse Source
This commit is contained in:
Hafizh A. Y
2026-01-24 13:35:13 +07:00
parent 42f030a780
commit 458c8e0a91
12 changed files with 226 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/finance/initials/dto/initial.dto.go
+6 -5
View File
@@ -20,7 +20,7 @@ type InitialRelationDTO struct {
InitialBalanceType string `json:"initial_balance_type"`
InitialBalanceTypeLabel string `json:"initial_balance_type_label"`
Party Party `json:"party"`
Bank bankDTO.BankRelationDTO `json:"bank,omitempty"`
Bank *bankDTO.BankRelationDTO `json:"bank"`
Direction string `json:"direction"`
Nominal float64 `json:"nominal"`
Notes string `json:"notes"`
@@ -128,11 +128,12 @@ func partyFromInitial(e entity.Payment) Party {
return party
}
func bankFromInitial(e entity.Payment) bankDTO.BankRelationDTO {
func bankFromInitial(e entity.Payment) *bankDTO.BankRelationDTO {
if e.BankWarehouse.Id == 0 {
return bankDTO.BankRelationDTO{}
return nil
}
return bankDTO.ToBankRelationDTO(e.BankWarehouse)
bank := bankDTO.ToBankRelationDTO(e.BankWarehouse)
return &bank
}
func userFromInitial(e entity.Payment) userDTO.UserRelationDTO {
@@ -161,7 +162,7 @@ func initialBalanceLabel(balanceType string) string {
}
func initialBalanceTypeFromPayment(e entity.Payment) string {
if strings.EqualFold(e.Direction, "OUT") || e.Nominal < 0 {
if e.Nominal < 0 {
return "NEGATIVE"
}
return "POSITIVE"
internal/modules/finance/initials/services/initial.service.go
+43 -15
View File
@@ -82,6 +82,7 @@ func (s initialService) GetOne(c *fiber.Ctx, id uint) (*entity.Payment, error) {
}
func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.Payment, error) {
normalizeOptionalBankId(&req.BankId)
if err := s.Validate.Struct(req); err != nil {
return nil, err
}
@@ -124,7 +125,7 @@ func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
PaymentDate: time.Now(),
PaymentMethod: string(utils.PaymentMethodSaldo),
BankId: req.BankId,
Direction: directionForInitialType(balanceType),
Direction: directionForInitialType(party, balanceType),
Nominal: signedNominal(balanceType, req.Nominal),
Notes: req.Note,
CreatedBy: actorID,
@@ -164,6 +165,7 @@ func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
}
func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.Payment, error) {
normalizeOptionalBankId(&req.BankId)
if err := s.Validate.Struct(req); err != nil {
return nil, err
}
@@ -186,6 +188,8 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
requiresExisting := req.PartyType != nil || req.PartyId != nil || req.InitialBalanceType != nil || req.Nominal != nil
requiresVerification := requiresExisting || req.ReferenceNumber != nil || req.Note != nil || req.BankId != nil
var existing *entity.Payment
var resolvedPartyType string
var resolvedPartyId uint
if requiresVerification {
current, err := s.Repository.GetByID(c.Context(), id, nil)
if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -199,26 +203,25 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
return nil, fiber.NewError(fiber.StatusNotFound, "Initial not found")
}
existing = current
resolvedPartyType = existing.PartyType
resolvedPartyId = existing.PartyId
}
if req.PartyType != nil || req.PartyId != nil {
partyType := existing.PartyType
partyId := existing.PartyId
if req.PartyType != nil {
normalized, err := normalizePartyType(*req.PartyType)
if err != nil {
return nil, err
}
partyType = normalized
updateBody["party_type"] = partyType
resolvedPartyType = normalized
updateBody["party_type"] = resolvedPartyType
}
if req.PartyId != nil {
partyId = *req.PartyId
updateBody["party_id"] = partyId
resolvedPartyId = *req.PartyId
updateBody["party_id"] = resolvedPartyId
}
if err := s.ensurePartyExists(c.Context(), partyType, partyId); err != nil {
if err := s.ensurePartyExists(c.Context(), resolvedPartyType, resolvedPartyId); err != nil {
return nil, err
}
}
@@ -238,8 +241,11 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
nominal = *req.Nominal
}
updateBody["direction"] = directionForInitialType(balanceType)
updateBody["direction"] = directionForInitialType(resolvedPartyType, balanceType)
updateBody["nominal"] = signedNominal(balanceType, nominal)
} else if req.PartyType != nil {
balanceType := balanceTypeFromPayment(existing)
updateBody["direction"] = directionForInitialType(resolvedPartyType, balanceType)
}
if len(updateBody) == 0 {
@@ -262,7 +268,7 @@ func isInitialTransaction(transactionType string) bool {
}
func balanceTypeFromPayment(payment *entity.Payment) string {
if strings.EqualFold(payment.Direction, "OUT") || payment.Nominal < 0 {
if payment.Nominal < 0 {
return "NEGATIVE"
}
return "POSITIVE"
@@ -286,11 +292,24 @@ func normalizeInitialBalanceType(balanceType string) (string, error) {
}
}
func directionForInitialType(balanceType string) string {
if strings.EqualFold(balanceType, "NEGATIVE") {
return "OUT"
func directionForInitialType(partyType string, balanceType string) string {
switch utils.PaymentParty(strings.ToUpper(strings.TrimSpace(partyType))) {
case utils.PaymentPartySupplier:
if strings.EqualFold(balanceType, "POSITIVE") {
return "OUT"
}
return "IN"
case utils.PaymentPartyCustomer:
if strings.EqualFold(balanceType, "NEGATIVE") {
return "OUT"
}
return "IN"
default:
if strings.EqualFold(balanceType, "NEGATIVE") {
return "OUT"
}
return "IN"
}
return "IN"
}
func signedNominal(balanceType string, nominal float64) float64 {
@@ -335,3 +354,12 @@ func (s initialService) ensureBankExists(ctx context.Context, bankId *uint) erro
commonSvc.RelationCheck{Name: "Bank", ID: bankId, Exists: s.Repository.BankExists},
)
}
func normalizeOptionalBankId(bankId **uint) {
if bankId == nil || *bankId == nil {
return
}
if **bankId == 0 {
*bankId = nil
}
}
internal/modules/finance/initials/validations/initial.validation.go
+1 -1
View File
@@ -3,7 +3,7 @@ package validation
type Create struct {
PartyType string `json:"party_type" validate:"required_strict,max=50"`
PartyId uint `json:"party_id" validate:"required_strict,number,gt=0"`
BankId *uint `json:"bank_id" validate:"required_strict,number,gt=0"`
BankId *uint `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"`
ReferenceNumber string `json:"reference_number" validate:"required_strict,max=100"`
InitialBalanceType string `json:"initial_balance_type" validate:"required_strict,oneof=NEGATIVE POSITIVE"`
Nominal float64 `json:"nominal" validate:"required_strict,gt=0"`