fix(BE-273): add object nonstock and supplier in response get one and fix name base to relation in dto

internal/modules/master/nonstocks/dto/nonstock.dto.go

@@ -4,41 +4,39 @@ import (
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	supplierDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/dto"
 	uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
 // === DTO Structs ===
 
-type NonstockBaseDTO struct {
-	Id    uint               `json:"id"`
-	Name  string             `json:"name"`
-	Uom   *uomDTO.UomBaseDTO `json:"uom,omitempty"`
-	Flags []string           `json:"flags"`
+type NonstockRelationDTO struct {
+	Id    uint                   `json:"id"`
+	Name  string                 `json:"name"`
+	Uom   *uomDTO.UomRelationDTO `json:"uom,omitempty"`
+	Flags []string               `json:"flags"`
 }
 
 type NonstockListDTO struct {
-	Id          uint                          `json:"id"`
-	Name        string                        `json:"name"`
-	Uom         *uomDTO.UomBaseDTO            `json:"uom"`
-	Suppliers   []supplierDTO.SupplierBaseDTO `json:"suppliers"`
-	CreatedUser *userDTO.UserBaseDTO          `json:"created_user"`
-	CreatedAt   time.Time                     `json:"created_at"`
-	UpdatedAt   time.Time                     `json:"updated_at"`
+	Id          uint                     `json:"id"`
+	Name        string                   `json:"name"`
+	Flags       []string                 `json:"flags"`
+	Uom         *uomDTO.UomRelationDTO   `json:"uom"`
+	CreatedUser *userDTO.UserRelationDTO `json:"created_user"`
+	CreatedAt   time.Time                `json:"created_at"`
+	UpdatedAt   time.Time                `json:"updated_at"`
 }
 
 type NonstockDetailDTO struct {
 	NonstockListDTO
-	Flags []string `json:"flags"`
 }
 
 // === Mapper Functions ===
 
-func ToNonstockBaseDTO(e entity.Nonstock) NonstockBaseDTO {
-	var uomRef *uomDTO.UomBaseDTO
+func ToNonstockRelationDTO(e entity.Nonstock) NonstockRelationDTO {
+	var uomRef *uomDTO.UomRelationDTO
 	if e.Uom.Id != 0 {
-		mapped := uomDTO.ToUomBaseDTO(e.Uom)
+		mapped := uomDTO.ToUomRelationDTO(e.Uom)
 		uomRef = &mapped
 	}
 
@@ -47,7 +45,7 @@ func ToNonstockBaseDTO(e entity.Nonstock) NonstockBaseDTO {
 		flags[i] = f.Name
 	}
 
-	return NonstockBaseDTO{
+	return NonstockRelationDTO{
 		Id:    e.Id,
 		Name:  e.Name,
 		Uom:   uomRef,
@@ -56,23 +54,18 @@ func ToNonstockBaseDTO(e entity.Nonstock) NonstockBaseDTO {
 }
 
 func ToNonstockListDTO(e entity.Nonstock) NonstockListDTO {
-	var createdUser *userDTO.UserBaseDTO
+	var createdUser *userDTO.UserRelationDTO
 	if e.CreatedUser.Id != 0 {
-		mapped := userDTO.ToUserBaseDTO(e.CreatedUser)
+		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
 		createdUser = &mapped
 	}
 
-	var uomRef *uomDTO.UomBaseDTO
+	var uomRef *uomDTO.UomRelationDTO
 	if e.Uom.Id != 0 {
-		mapped := uomDTO.ToUomBaseDTO(e.Uom)
+		mapped := uomDTO.ToUomRelationDTO(e.Uom)
 		uomRef = &mapped
 	}
 
-	suppliers := make([]supplierDTO.SupplierBaseDTO, len(e.Suppliers))
-	for i, s := range e.Suppliers {
-		suppliers[i] = supplierDTO.ToSupplierBaseDTO(s)
-	}
-
 	flags := make([]string, len(e.Flags))
 	for i, f := range e.Flags {
 		flags[i] = f.Name
@@ -81,11 +74,11 @@ func ToNonstockListDTO(e entity.Nonstock) NonstockListDTO {
 	return NonstockListDTO{
 		Id:          e.Id,
 		Name:        e.Name,
+		Flags:       flags,
 		Uom:         uomRef,
 		CreatedAt:   e.CreatedAt,
 		UpdatedAt:   e.UpdatedAt,
 		CreatedUser: createdUser,
-		Suppliers:   suppliers,
 	}
 }
 
@@ -98,13 +91,7 @@ func ToNonstockListDTOs(e []entity.Nonstock) []NonstockListDTO {
 }
 
 func ToNonstockDetailDTO(e entity.Nonstock) NonstockDetailDTO {
-	flags := make([]string, len(e.Flags))
-	for i, f := range e.Flags {
-		flags[i] = f.Name
-	}
-
 	return NonstockDetailDTO{
 		NonstockListDTO: ToNonstockListDTO(e),
-		Flags:           flags,
 	}
 }

internal/modules/master/nonstocks/repositories/nonstock.repository.go

@@ -57,7 +57,7 @@ func (r *NonstockRepositoryImpl) SyncSuppliersDiff(ctx context.Context, tx *gorm
 
 	existingMap := make(map[uint]struct{}, len(existing))
 	for _, rel := range existing {
-		existingMap[rel.SupplierID] = struct{}{}
+		existingMap[rel.SupplierId] = struct{}{}
 	}
 
 	incomingMap := make(map[uint]struct{}, len(supplierIDs))
@@ -66,16 +66,16 @@ func (r *NonstockRepositoryImpl) SyncSuppliersDiff(ctx context.Context, tx *gorm
 		if _, exists := existingMap[id]; exists {
 			continue
 		}
-		record := entity.NonstockSupplier{NonstockID: nonstockID, SupplierID: id}
+		record := entity.NonstockSupplier{NonstockId: nonstockID, SupplierId: id}
 		if err := db.WithContext(ctx).Create(&record).Error; err != nil {
 			return err
 		}
 	}
 
 	for _, rel := range existing {
-		if _, keep := incomingMap[rel.SupplierID]; !keep {
+		if _, keep := incomingMap[rel.SupplierId]; !keep {
 			if err := db.WithContext(ctx).
-				Where("nonstock_id = ? AND supplier_id = ?", nonstockID, rel.SupplierID).
+				Where("nonstock_id = ? AND supplier_id = ?", nonstockID, rel.SupplierId).
 				Delete(&entity.NonstockSupplier{}).
 				Error; err != nil {
 				if errors.Is(err, gorm.ErrRecordNotFound) {

internal/modules/master/nonstocks/services/nonstock.service.go

@@ -44,7 +44,8 @@ func (s nonstockService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("CreatedUser").
 		Preload("Uom").
 		Preload("Flags").
-		Preload("Suppliers", func(db *gorm.DB) *gorm.DB {
+		Preload("NonstockSuppliers").
+		Preload("NonstockSuppliers.Supplier", func(db *gorm.DB) *gorm.DB {
 			return db.Order("suppliers.name ASC")
 		})
 }