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

3
.gitignore vendored
View File

@ -2,4 +2,5 @@ notes.txt
_internal/ _internal/
**/*.json **/*.json
server/* server/*
storage/log/ storage/log/
api

View File

@ -165,22 +165,24 @@ 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")
var city domain.City return db.Transaction(func(tx *gorm.DB) error {
q := db var city domain.City
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&city).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&city).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("city", id, city, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.City{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("city", id, city, merchantID)
return err if err := tx.Delete(&domain.City{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }

View File

@ -190,24 +190,26 @@ 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")
var component domain.CostComponent return db.Transaction(func(tx *gorm.DB) error {
q := db var component domain.CostComponent
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&component).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&component).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("cost_component", id, component, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.CostComponent{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("cost_component", id, component, merchantID)
return err if err := tx.Delete(&domain.CostComponent{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }
func (u *CostComponentUsecase) SortDown(id string) error { func (u *CostComponentUsecase) SortDown(id string) error {

View File

@ -174,22 +174,24 @@ 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")
var district domain.District return db.Transaction(func(tx *gorm.DB) error {
q := db var district domain.District
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&district).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&district).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("district", id, district, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.District{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("district", id, district, merchantID)
return err if err := tx.Delete(&domain.District{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }

View File

@ -154,22 +154,24 @@ 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")
var item domain.Moda return db.Transaction(func(tx *gorm.DB) error {
q := db var item domain.Moda
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&item).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&item).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("moda", id, item, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.Moda{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("moda", id, item, merchantID)
return err if err := tx.Delete(&domain.Moda{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }

View File

@ -154,22 +154,24 @@ 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")
var item domain.PackageType return db.Transaction(func(tx *gorm.DB) error {
q := db var item domain.PackageType
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&item).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&item).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("package_type", id, item, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.PackageType{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("package_type", id, item, merchantID)
return err if err := tx.Delete(&domain.PackageType{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }

View File

@ -196,22 +196,24 @@ 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")
var pc domain.PostalCode return db.Transaction(func(tx *gorm.DB) error {
q := db var pc domain.PostalCode
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&pc).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&pc).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("postal_code", id, pc, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.PostalCode{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("postal_code", id, pc, merchantID)
return err if err := tx.Delete(&domain.PostalCode{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }

View File

@ -159,26 +159,27 @@ 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
q := tx
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
}
if err := q.Where("id = ?", id).First(&province).Error; err != nil {
return err
}
var province domain.Province var merchantID *string
q := db if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { merchantID = u.AuthUser.MerchantID
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) }
} logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := q.Where("id = ?", id).First(&province).Error; err != nil { logUsecase.LogDelete("province", id, province, merchantID)
return err
}
var merchantID *string if err := tx.Delete(&domain.Province{}, "id = ?", id).Error; err != nil {
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { return err
merchantID = u.AuthUser.MerchantID }
}
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
logUsecase.LogDelete("province", id, province, merchantID)
if err := db.Delete(&domain.Province{}, "id = ?", id).Error; err != nil { return nil
return err })
}
return nil
} }

View File

@ -185,22 +185,24 @@ 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")
var subdistrict domain.Subdistrict return db.Transaction(func(tx *gorm.DB) error {
q := db var subdistrict domain.Subdistrict
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { q := tx
q = db.Where("merchant_id=?", u.AuthUser.MerchantID) if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} q = tx.Where("merchant_id=?", u.AuthUser.MerchantID)
if err := q.Where("id = ?", id).First(&subdistrict).Error; err != nil { }
return err if err := q.Where("id = ?", id).First(&subdistrict).Error; err != nil {
} return err
var merchantID *string }
if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" { var merchantID *string
merchantID = u.AuthUser.MerchantID if u.AuthUser.UsersRole_Relation == nil || u.AuthUser.UsersRole_Relation.RoleKey != "SPM" {
} merchantID = u.AuthUser.MerchantID
logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser) }
logUsecase.LogDelete("subdistrict", id, subdistrict, merchantID) logUsecase := NewActivityLogUsecase(u.Helper, u.AuthUser)
if err := db.Delete(&domain.Subdistrict{}, "id = ?", id).Error; err != nil { logUsecase.LogDelete("subdistrict", id, subdistrict, merchantID)
return err if err := tx.Delete(&domain.Subdistrict{}, "id = ?", id).Error; err != nil {
} return err
return nil }
return nil
})
} }