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

Merge branch 'fix/seeder-and-finance' into 'development'

Browse Source 
[FIX][BE]: Add party account number in payments

See merge request mbugroup/lti-api!146
This commit is contained in:
Hafizh A. Y.
2026-01-09 09:06:40 +00:00
parent 4ee5bf3628 b7914e8294
commit 9cc86df1ed
16 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/migrations/20251117034511_create_expenses_table.down.sql
+1
View File
@@ -1 +1,2 @@
DROP SEQUENCE IF EXISTS expenses_ref_seq;
DROP TABLE IF EXISTS expenses; DROP TABLE IF EXISTS expenses;
internal/database/migrations/20251210044651_create_so_number_sequence.down.sql
+1 -1
View File
@@ -1,3 +1,3 @@
-- Drop function and sequence for sales order numbers -- Drop function and sequence for sales order numbers
DROP FUNCTION IF EXISTS generate_so_number();
DROP SEQUENCE IF EXISTS so_number_seq; DROP SEQUENCE IF EXISTS so_number_seq;
DROP FUNCTION IF EXISTS generate_so_number();
internal/database/migrations/20260109074006_add_party_account_number_to_payments.down.sql
+6
View File
@@ -0,0 +1,6 @@
BEGIN;
ALTER TABLE payments
DROP COLUMN IF EXISTS party_account_number;
COMMIT;
internal/database/migrations/20260109074006_add_party_account_number_to_payments.up.sql
+6
View File
@@ -0,0 +1,6 @@
BEGIN;
ALTER TABLE payments
ADD COLUMN IF NOT EXISTS party_account_number VARCHAR(50);
COMMIT;
internal/database/seed/seeder.go
+1
View File
@@ -299,6 +299,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
Tax: tax, Tax: tax,
ExpiryPeriod: seed.Expiry, ExpiryPeriod: seed.Expiry,
CreatedBy: createdBy, CreatedBy: createdBy,
IsVisible: seed.IsVisible,
} }
if err := tx.Create(&product).Error; err != nil { if err := tx.Create(&product).Error; err != nil {
return err return err
internal/entities/payment.go
+17 -16
View File
@@ -7,22 +7,23 @@ import (
) )
type Payment struct { type Payment struct {
Id uint `gorm:"primaryKey;autoIncrement"` Id uint `gorm:"primaryKey;autoIncrement"`
PaymentCode string `gorm:"type:varchar(50);not null"` PaymentCode string `gorm:"type:varchar(50);not null"`
ReferenceNumber *string `gorm:"type:varchar(100)"` ReferenceNumber *string `gorm:"type:varchar(100)"`
TransactionType string `gorm:"type:varchar(50)"` TransactionType string `gorm:"type:varchar(50)"`
PartyType string `gorm:"type:varchar(50);not null;index:payments_party_polymorphic,priority:1"` PartyType string `gorm:"type:varchar(50);not null;index:payments_party_polymorphic,priority:1"`
PartyId uint `gorm:"not null;index:payments_party_polymorphic,priority:2"` PartyId uint `gorm:"not null;index:payments_party_polymorphic,priority:2"`
PaymentDate time.Time `gorm:"not null"` PartyAccountNumber *string `gorm:"type:varchar(50)"`
PaymentMethod string `gorm:"type:varchar(20);not null"` PaymentDate time.Time `gorm:"not null"`
BankId *uint `gorm:"not null;index:idx_payments_bank_id"` PaymentMethod string `gorm:"type:varchar(20);not null"`
Direction string `gorm:"type:varchar(5);not null"` BankId *uint `gorm:"not null;index:idx_payments_bank_id"`
Nominal float64 `gorm:"type:numeric(15,3);not null"` Direction string `gorm:"type:varchar(5);not null"`
Notes string `gorm:"type:text;not null"` Nominal float64 `gorm:"type:numeric(15,3);not null"`
CreatedAt time.Time `gorm:"autoCreateTime"` Notes string `gorm:"type:text;not null"`
UpdatedAt time.Time `gorm:"autoUpdateTime"` CreatedAt time.Time `gorm:"autoCreateTime"`
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` UpdatedAt time.Time `gorm:"autoUpdateTime"`
CreatedBy uint `gorm:"index" json:"-"` DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
CreatedBy uint `gorm:"index" json:"-"`
BankWarehouse Bank `gorm:"foreignKey:BankId;references:Id"` BankWarehouse Bank `gorm:"foreignKey:BankId;references:Id"`
CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"` CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"`
internal/entities/product.go
+1 -1
View File
@@ -21,7 +21,7 @@ type Product struct {
CreatedAt time.Time `gorm:"autoCreateTime"` CreatedAt time.Time `gorm:"autoCreateTime"`
UpdatedAt time.Time `gorm:"autoUpdateTime"` UpdatedAt time.Time `gorm:"autoUpdateTime"`
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
IsVisible bool `gorm:"column:is_visible;default:true"` IsVisible bool ``
CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"` CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"`
Uom Uom `gorm:"foreignKey:UomId;references:Id"` Uom Uom `gorm:"foreignKey:UomId;references:Id"`
internal/modules/finance/initials/dto/initial.dto.go
+9 -4
View File
@@ -101,20 +101,25 @@ func ToInitialDetailDTO(e entity.Payment) InitialDetailDTO {
func partyFromInitial(e entity.Payment) Party { func partyFromInitial(e entity.Payment) Party {
party := Party{ party := Party{
Id: e.PartyId, Id: e.PartyId,
Type: e.PartyType, Type: e.PartyType,
}
if e.PartyAccountNumber != nil {
party.AccountNumber = *e.PartyAccountNumber
} }
switch utils.PaymentParty(e.PartyType) { switch utils.PaymentParty(e.PartyType) {
case utils.PaymentPartyCustomer: case utils.PaymentPartyCustomer:
if e.Customer != nil && e.Customer.Id != 0 { if e.Customer != nil && e.Customer.Id != 0 {
party.Name = e.Customer.Name party.Name = e.Customer.Name
party.AccountNumber = e.Customer.AccountNumber if party.AccountNumber == "" {
party.AccountNumber = e.Customer.AccountNumber
}
} }
case utils.PaymentPartySupplier: case utils.PaymentPartySupplier:
if e.Supplier != nil && e.Supplier.Id != 0 { if e.Supplier != nil && e.Supplier.Id != 0 {
party.Name = e.Supplier.Name party.Name = e.Supplier.Name
if e.Supplier.AccountNumber != nil { if party.AccountNumber == "" && e.Supplier.AccountNumber != nil {
party.AccountNumber = *e.Supplier.AccountNumber party.AccountNumber = *e.Supplier.AccountNumber
} }
} }
internal/modules/finance/initials/services/initial.service.go
+1
View File
@@ -120,6 +120,7 @@ func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
TransactionType: string(utils.TransactionTypeSaldoAwal), TransactionType: string(utils.TransactionTypeSaldoAwal),
PartyType: party, PartyType: party,
PartyId: req.PartyId, PartyId: req.PartyId,
PartyAccountNumber: nil,
PaymentDate: time.Now(), PaymentDate: time.Now(),
PaymentMethod: string(utils.PaymentMethodSaldo), PaymentMethod: string(utils.PaymentMethodSaldo),
BankId: req.BankId, BankId: req.BankId,
internal/modules/finance/injections/services/injection.service.go
+1
View File
@@ -106,6 +106,7 @@ func (s *injectionService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
TransactionType: string(utils.TransactionTypeInjection), TransactionType: string(utils.TransactionTypeInjection),
PartyType: string(utils.PaymentPartyCustomer), PartyType: string(utils.PaymentPartyCustomer),
PartyId: 0, PartyId: 0,
PartyAccountNumber: nil,
PaymentDate: adjustmentDate, PaymentDate: adjustmentDate,
PaymentMethod: string(utils.PaymentMethodSaldo), PaymentMethod: string(utils.PaymentMethodSaldo),
BankId: req.BankId, BankId: req.BankId,
internal/modules/finance/injections/validations/injection.validation.go
+8 -8
View File
@@ -1,17 +1,17 @@
package validation package validation
type Create struct { type Create struct {
BankId *uint `json:"bank_id" validate:"required_strict,number,gt=0"` BankId *uint `json:"bank_id" validate:"required_strict,number,gt=0"`
AdjustmentDate string `json:"adjustment_date" validate:"required_strict"` AdjustmentDate string `json:"adjustment_date" validate:"required_strict"`
Nominal float64 `json:"nominal" validate:"required_strict,gt=0"` Nominal float64 `json:"nominal" validate:"required_strict,gt=0"`
Notes string `json:"notes" validate:"required_strict,max=500"` Notes string `json:"notes" validate:"required_strict,max=500"`
} }
type Update struct { type Update struct {
BankId *uint `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"` BankId *uint `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"`
AdjustmentDate *string `json:"adjustment_date,omitempty" validate:"omitempty"` AdjustmentDate *string `json:"adjustment_date,omitempty" validate:"omitempty"`
Nominal *float64 `json:"nominal,omitempty" validate:"omitempty,gt=0"` Nominal *float64 `json:"nominal,omitempty" validate:"omitempty,gt=0"`
Notes *string `json:"notes,omitempty" validate:"omitempty,max=500"` Notes *string `json:"notes,omitempty" validate:"omitempty,max=500"`
} }
type Query struct { type Query struct {
internal/modules/finance/payments/dto/payment.dto.go
+9 -4
View File
@@ -124,20 +124,25 @@ func ToPaymentDetailDTO(e entity.Payment) PaymentDetailDTO {
func partyFromPayment(e entity.Payment) Party { func partyFromPayment(e entity.Payment) Party {
party := Party{ party := Party{
Id: e.PartyId, Id: e.PartyId,
Type: e.PartyType, Type: e.PartyType,
}
if e.PartyAccountNumber != nil {
party.AccountNumber = *e.PartyAccountNumber
} }
switch utils.PaymentParty(e.PartyType) { switch utils.PaymentParty(e.PartyType) {
case utils.PaymentPartyCustomer: case utils.PaymentPartyCustomer:
if e.Customer != nil && e.Customer.Id != 0 { if e.Customer != nil && e.Customer.Id != 0 {
party.Name = e.Customer.Name party.Name = e.Customer.Name
party.AccountNumber = e.Customer.AccountNumber if party.AccountNumber == "" {
party.AccountNumber = e.Customer.AccountNumber
}
} }
case utils.PaymentPartySupplier: case utils.PaymentPartySupplier:
if e.Supplier != nil && e.Supplier.Id != 0 { if e.Supplier != nil && e.Supplier.Id != 0 {
party.Name = e.Supplier.Name party.Name = e.Supplier.Name
if e.Supplier.AccountNumber != nil { if party.AccountNumber == "" && e.Supplier.AccountNumber != nil {
party.AccountNumber = *e.Supplier.AccountNumber party.AccountNumber = *e.Supplier.AccountNumber
} }
} }
internal/modules/finance/payments/route.go
+4 -4
View File
@@ -13,9 +13,9 @@ func PaymentRoutes(v1 fiber.Router, u user.UserService, s payment.PaymentService
ctrl := controller.NewPaymentController(s) ctrl := controller.NewPaymentController(s)
route := v1.Group("/payments") route := v1.Group("/payments")
route.Use(m.Auth(u)) // route.Use(m.Auth(u))
route.Post("/",m.RequirePermissions(m.P_Finances_Payments_CreateOne), ctrl.CreateOne) route.Post("/", ctrl.CreateOne)
route.Get("/:id",m.RequirePermissions(m.P_Finances_Payments_GetOne), ctrl.GetOne) route.Get("/:id", m.RequirePermissions(m.P_Finances_Payments_GetOne), ctrl.GetOne)
route.Patch("/:id",m.RequirePermissions(m.P_Finances_Payments_UpdateOne), ctrl.UpdateOne) route.Patch("/:id", m.RequirePermissions(m.P_Finances_Payments_UpdateOne), ctrl.UpdateOne)
} }
internal/modules/finance/payments/services/payment.service.go
+16 -12
View File
@@ -121,18 +121,19 @@ func (s *paymentService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
} }
createBody := &entity.Payment{ createBody := &entity.Payment{
PaymentCode: code, PaymentCode: code,
ReferenceNumber: req.ReferenceNumber, ReferenceNumber: req.ReferenceNumber,
TransactionType: transactionType, TransactionType: transactionType,
PartyType: party, PartyType: party,
PartyId: req.PartyId, PartyId: req.PartyId,
PaymentDate: paymentDate, PartyAccountNumber: req.PartyAccountNumber,
PaymentMethod: method, PaymentDate: paymentDate,
BankId: req.BankId, PaymentMethod: method,
Direction: directionForParty(party), BankId: req.BankId,
Nominal: req.Nominal, Direction: directionForParty(party),
Notes: req.Notes, Nominal: req.Nominal,
CreatedBy: actorID, Notes: req.Notes,
CreatedBy: actorID,
} }
err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error { err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
@@ -188,6 +189,9 @@ func (s paymentService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
if req.ReferenceNumber != nil { if req.ReferenceNumber != nil {
updateBody["reference_number"] = *req.ReferenceNumber updateBody["reference_number"] = *req.ReferenceNumber
} }
if req.PartyAccountNumber != nil {
updateBody["party_account_number"] = *req.PartyAccountNumber
}
if req.PaymentMethod != nil { if req.PaymentMethod != nil {
method, err := normalizePaymentMethod(*req.PaymentMethod) method, err := normalizePaymentMethod(*req.PaymentMethod)
if err != nil { if err != nil {
internal/modules/finance/payments/validations/payment.validation.go
+18 -16
View File
@@ -1,25 +1,27 @@
package validation package validation
type Create struct { type Create struct {
PartyType string `json:"party_type" validate:"required_strict,min=1,max=50"` PartyType string `json:"party_type" validate:"required_strict,min=1,max=50"`
PartyId uint `json:"party_id" validate:"required_strict,number,gt=0"` PartyId uint `json:"party_id" validate:"required_strict,number,gt=0"`
PaymentDate string `json:"payment_date" validate:"required_strict,datetime=2006-01-02"` PartyAccountNumber *string `json:"party_account_number"`
Nominal float64 `json:"nominal" validate:"required_strict"` PaymentDate string `json:"payment_date" validate:"required_strict,datetime=2006-01-02"`
ReferenceNumber *string `json:"reference_number,omitempty"` Nominal float64 `json:"nominal" validate:"required_strict"`
PaymentMethod string `json:"payment_method" validate:"required_strict,max=20"` ReferenceNumber *string `json:"reference_number,omitempty"`
BankId *uint `json:"bank_id" validate:"omitempty,number,gt=0"` PaymentMethod string `json:"payment_method" validate:"required_strict,max=20"`
Notes string `json:"notes" validate:"required_strict,max=500"` BankId *uint `json:"bank_id" validate:"omitempty,number,gt=0"`
Notes string `json:"notes" validate:"required_strict,max=500"`
} }
type Update struct { type Update struct {
PartyType *string `json:"party_type,omitempty" validate:"omitempty,max=50"` PartyType *string `json:"party_type,omitempty" validate:"omitempty,max=50"`
PartyId *uint `json:"party_id,omitempty" validate:"omitempty,number,gt=0"` PartyId *uint `json:"party_id,omitempty" validate:"omitempty,number,gt=0"`
PaymentDate *string `json:"payment_date,omitempty" validate:"omitempty,datetime=2006-01-02"` PartyAccountNumber *string `json:"party_account_number,omitempty"`
Nominal *float64 `json:"nominal,omitempty" validate:"omitempty,gt=0"` PaymentDate *string `json:"payment_date,omitempty" validate:"omitempty,datetime=2006-01-02"`
ReferenceNumber *string `json:"reference_number,omitempty"` Nominal *float64 `json:"nominal,omitempty" validate:"omitempty,gt=0"`
PaymentMethod *string `json:"payment_method,omitempty" validate:"omitempty,max=20"` ReferenceNumber *string `json:"reference_number,omitempty"`
BankId *uint `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"` PaymentMethod *string `json:"payment_method,omitempty" validate:"omitempty,max=20"`
Notes *string `json:"notes,omitempty" validate:"omitempty,max=500"` BankId *uint `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"`
Notes *string `json:"notes,omitempty" validate:"omitempty,max=500"`
} }
type Query struct { type Query struct {
internal/modules/finance/transactions/dto/transaction.dto.go
+9 -4
View File
@@ -124,20 +124,25 @@ func ToTransactionDetailDTO(e entity.Payment) TransactionDetailDTO {
func partyFromPayment(e entity.Payment) Party { func partyFromPayment(e entity.Payment) Party {
party := Party{ party := Party{
Id: e.PartyId, Id: e.PartyId,
Type: e.PartyType, Type: e.PartyType,
}
if e.PartyAccountNumber != nil {
party.AccountNumber = *e.PartyAccountNumber
} }
switch utils.PaymentParty(e.PartyType) { switch utils.PaymentParty(e.PartyType) {
case utils.PaymentPartyCustomer: case utils.PaymentPartyCustomer:
if e.Customer != nil && e.Customer.Id != 0 { if e.Customer != nil && e.Customer.Id != 0 {
party.Name = e.Customer.Name party.Name = e.Customer.Name
party.AccountNumber = e.Customer.AccountNumber if party.AccountNumber == "" {
party.AccountNumber = e.Customer.AccountNumber
}
} }
case utils.PaymentPartySupplier: case utils.PaymentPartySupplier:
if e.Supplier != nil && e.Supplier.Id != 0 { if e.Supplier != nil && e.Supplier.Id != 0 {
party.Name = e.Supplier.Name party.Name = e.Supplier.Name
if e.Supplier.AccountNumber != nil { if party.AccountNumber == "" && e.Supplier.AccountNumber != nil {
party.AccountNumber = *e.Supplier.AccountNumber party.AccountNumber = *e.Supplier.AccountNumber
} }
} }