update
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
teguh nugroho 2026-09-05 14:48:44 +07:00
parent 39265bfcb1
commit 280d951d3c
9 changed files with 162 additions and 146 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ _internal/
**/*.json **/*.json
server/* server/*
storage/log/ storage/log/
api

View File

@ -165,10 +165,11 @@ func (u *CityUsecase) Update(id string, name string, provinceID string, port str
func (u *CityUsecase) Delete(id string) error { func (u *CityUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var city domain.City var city domain.City
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&city).Error; err != nil { if err := q.Where("id = ?", id).First(&city).Error; err != nil {
return err return err
@ -179,8 +180,9 @@ func (u *CityUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("city", id, city, merchantID) logUsecase.LogDelete("city", id, city, merchantID)
if err := db.Delete(&domain.City{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.City{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -190,10 +190,11 @@ func (u *CostComponentUsecase) Update(id string, name string, code string, value
func (u *CostComponentUsecase) Delete(id string) error { func (u *CostComponentUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var component domain.CostComponent var component domain.CostComponent
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&component).Error; err != nil { if err := q.Where("id = ?", id).First(&component).Error; err != nil {
return err return err
@ -204,10 +205,11 @@ func (u *CostComponentUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("cost_component", id, component, merchantID) logUsecase.LogDelete("cost_component", id, component, merchantID)
if err := db.Delete(&domain.CostComponent{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.CostComponent{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }
func (u *CostComponentUsecase) SortDown(id string) error { func (u *CostComponentUsecase) SortDown(id string) error {

View File

@ -174,10 +174,11 @@ func (u *DistrictUsecase) Update(id string, name string, provinceID string, city
func (u *DistrictUsecase) Delete(id string) error { func (u *DistrictUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var district domain.District var district domain.District
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&district).Error; err != nil { if err := q.Where("id = ?", id).First(&district).Error; err != nil {
return err return err
@ -188,8 +189,9 @@ func (u *DistrictUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("district", id, district, merchantID) logUsecase.LogDelete("district", id, district, merchantID)
if err := db.Delete(&domain.District{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.District{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -154,10 +154,11 @@ func (u *ModaUsecase) Update(id string, name string, updatedBy string) (domain.M
func (u *ModaUsecase) Delete(id string) error { func (u *ModaUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var item domain.Moda var item domain.Moda
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&item).Error; err != nil { if err := q.Where("id = ?", id).First(&item).Error; err != nil {
return err return err
@ -168,8 +169,9 @@ func (u *ModaUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("moda", id, item, merchantID) logUsecase.LogDelete("moda", id, item, merchantID)
if err := db.Delete(&domain.Moda{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.Moda{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -154,10 +154,11 @@ func (u *PackageTypeUsecase) Update(id string, name string, updatedBy string) (d
func (u *PackageTypeUsecase) Delete(id string) error { func (u *PackageTypeUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var item domain.PackageType var item domain.PackageType
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&item).Error; err != nil { if err := q.Where("id = ?", id).First(&item).Error; err != nil {
return err return err
@ -168,8 +169,9 @@ func (u *PackageTypeUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("package_type", id, item, merchantID) logUsecase.LogDelete("package_type", id, item, merchantID)
if err := db.Delete(&domain.PackageType{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.PackageType{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -196,10 +196,11 @@ func (u *PostalCodeUsecase) Update(id string, postalCode string, provinceID stri
func (u *PostalCodeUsecase) Delete(id string) error { func (u *PostalCodeUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var pc domain.PostalCode var pc domain.PostalCode
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&pc).Error; err != nil { if err := q.Where("id = ?", id).First(&pc).Error; err != nil {
return err return err
@ -210,8 +211,9 @@ func (u *PostalCodeUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("postal_code", id, pc, merchantID) logUsecase.LogDelete("postal_code", id, pc, merchantID)
if err := db.Delete(&domain.PostalCode{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.PostalCode{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -159,11 +159,11 @@ func (u *ProvinceUsecase) Update(id string, name string, updatedBy string) (doma
func (u *ProvinceUsecase) Delete(id string) error { func (u *ProvinceUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var province domain.Province var province domain.Province
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&province).Error; err != nil { if err := q.Where("id = ?", id).First(&province).Error; err != nil {
return err return err
@ -176,9 +176,10 @@ func (u *ProvinceUsecase) Delete(id string) error {
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("province", id, province, merchantID) logUsecase.LogDelete("province", id, province, merchantID)
if err := db.Delete(&domain.Province{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.Province{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }

View File

@ -185,10 +185,11 @@ func (u *SubdistrictUsecase) Update(id string, name string, provinceID string, c
func (u *SubdistrictUsecase) Delete(id string) error { func (u *SubdistrictUsecase) Delete(id string) error {
db := u.Helper.GetDB("master") db := u.Helper.GetDB("master")
return db.Transaction(func(tx *gorm.DB) error {
var subdistrict domain.Subdistrict var subdistrict domain.Subdistrict
q := db q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
} }
if err := q.Where("id = ?", id).First(&subdistrict).Error; err != nil { if err := q.Where("id = ?", id).First(&subdistrict).Error; err != nil {
return err return err
@ -199,8 +200,9 @@ func (u *SubdistrictUsecase) Delete(id string) error {
} }
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("subdistrict", id, subdistrict, merchantID) logUsecase.LogDelete("subdistrict", id, subdistrict, merchantID)
if err := db.Delete(&domain.Subdistrict{}, "id = ?", id).Error; err != nil { if err := tx.Delete(&domain.Subdistrict{}, "id = ?", id).Error; err != nil {
return err return err
} }
return nil return nil
})
} }