mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-24 07:15:43 +00:00
fix: flag master data product and fix chickin approve
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto"
|
||||
uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
|
||||
userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
|
||||
utils "gitlab.com/mbugroup/lti-api.git/internal/utils"
|
||||
)
|
||||
|
||||
// === DTO Structs ===
|
||||
@@ -17,6 +18,9 @@ type ProductRelationDTO struct {
|
||||
ProductPrice float64 `gorm:"type:numeric(15,3);not null"`
|
||||
SellingPrice *float64 `gorm:"type:numeric(15,3)"`
|
||||
Uom *uomDTO.UomRelationDTO `json:"uom,omitempty"`
|
||||
Flag *string `json:"flag,omitempty"`
|
||||
SubFlag *string `json:"sub_flag,omitempty"`
|
||||
SubFlags *[]string `json:"sub_flags,omitempty"`
|
||||
Flags *[]string `json:"flags,omitempty"`
|
||||
ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
|
||||
Suppliers []ProductSupplierDTO `json:"suppliers"`
|
||||
@@ -31,6 +35,9 @@ type ProductListDTO struct {
|
||||
SellingPrice *float64 `json:"selling_price,omitempty"`
|
||||
Tax *float64 `json:"tax,omitempty"`
|
||||
ExpiryPeriod *int `json:"expiry_period,omitempty"`
|
||||
Flag *string `json:"flag,omitempty"`
|
||||
SubFlag *string `json:"sub_flag,omitempty"`
|
||||
SubFlags []string `json:"sub_flags,omitempty"`
|
||||
Flags []string `json:"flags"`
|
||||
Uom *uomDTO.UomRelationDTO `json:"uom,omitempty"`
|
||||
ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
|
||||
@@ -59,6 +66,13 @@ func ToProductRelationDTO(e entity.Product) ProductRelationDTO {
|
||||
for i, f := range e.Flags {
|
||||
flags[i] = f.Name
|
||||
}
|
||||
flag, subFlag, subFlags := resolveProductFlagAndSubFlags(flags)
|
||||
var subFlagsRef *[]string
|
||||
if len(subFlags) > 0 {
|
||||
values := make([]string, len(subFlags))
|
||||
copy(values, subFlags)
|
||||
subFlagsRef = &values
|
||||
}
|
||||
|
||||
var uomRef *uomDTO.UomRelationDTO
|
||||
if e.Uom.Id != 0 {
|
||||
@@ -77,6 +91,9 @@ func ToProductRelationDTO(e entity.Product) ProductRelationDTO {
|
||||
Name: e.Name,
|
||||
ProductPrice: e.ProductPrice,
|
||||
SellingPrice: e.SellingPrice,
|
||||
Flag: flag,
|
||||
SubFlag: subFlag,
|
||||
SubFlags: subFlagsRef,
|
||||
Flags: &flags,
|
||||
Uom: uomRef,
|
||||
ProductCategory: categoryRef,
|
||||
@@ -101,6 +118,7 @@ func ToProductListDTO(e entity.Product) ProductListDTO {
|
||||
for i, f := range e.Flags {
|
||||
flags[i] = f.Name
|
||||
}
|
||||
flag, subFlag, subFlags := resolveProductFlagAndSubFlags(flags)
|
||||
|
||||
var uomRef *uomDTO.UomRelationDTO
|
||||
if e.Uom.Id != 0 {
|
||||
@@ -111,6 +129,9 @@ func ToProductListDTO(e entity.Product) ProductListDTO {
|
||||
return ProductListDTO{
|
||||
Id: e.Id,
|
||||
Name: e.Name,
|
||||
Flag: flag,
|
||||
SubFlag: subFlag,
|
||||
SubFlags: subFlags,
|
||||
Flags: flags,
|
||||
Uom: uomRef,
|
||||
Brand: e.Brand,
|
||||
@@ -141,6 +162,58 @@ func ToProductDetailDTO(e entity.Product) ProductDetailDTO {
|
||||
}
|
||||
}
|
||||
|
||||
func resolveProductFlagAndSubFlags(flags []string) (*string, *string, []string) {
|
||||
normalized := utils.NormalizeFlagTypes(flags)
|
||||
if len(normalized) == 0 {
|
||||
return nil, nil, nil
|
||||
}
|
||||
|
||||
available := make(map[utils.FlagType]struct{}, len(normalized))
|
||||
for _, flag := range normalized {
|
||||
available[flag] = struct{}{}
|
||||
}
|
||||
|
||||
var selectedFlag utils.FlagType
|
||||
for _, mainFlag := range utils.ProductMainFlags() {
|
||||
if _, ok := available[mainFlag]; ok {
|
||||
selectedFlag = mainFlag
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if selectedFlag == "" {
|
||||
subToMain := utils.ProductSubFlagToFlag()
|
||||
for _, flag := range normalized {
|
||||
if parent, ok := subToMain[flag]; ok {
|
||||
selectedFlag = parent
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if selectedFlag == "" {
|
||||
return nil, nil, nil
|
||||
}
|
||||
|
||||
flag := string(selectedFlag)
|
||||
|
||||
var subFlag *string
|
||||
subFlagValues := make([]string, 0)
|
||||
subFlagsByMain := utils.ProductSubFlagsByFlag()
|
||||
for _, sub := range subFlagsByMain[selectedFlag] {
|
||||
if _, ok := available[sub]; ok {
|
||||
subFlagValues = append(subFlagValues, string(sub))
|
||||
}
|
||||
}
|
||||
|
||||
if len(subFlagValues) > 0 {
|
||||
first := subFlagValues[0]
|
||||
subFlag = &first
|
||||
}
|
||||
|
||||
return &flag, subFlag, subFlagValues
|
||||
}
|
||||
|
||||
func toProductSupplierDTOs(relations []entity.ProductSupplier) []ProductSupplierDTO {
|
||||
if len(relations) == 0 {
|
||||
return make([]ProductSupplierDTO, 0)
|
||||
|
||||
Reference in New Issue
Block a user