fix campaign rules
This commit is contained in:
@@ -68,14 +68,6 @@ func ToCampaignEntity(request *contract.CreateCampaignRequest) *entities.Campaig
|
||||
return nil
|
||||
}
|
||||
|
||||
var rules []entities.CampaignRule
|
||||
if request.Rules != nil {
|
||||
for _, rule := range request.Rules {
|
||||
// For create request, we'll use a temporary UUID that will be set by the repository
|
||||
rules = append(rules, *ToCampaignRuleEntity(&rule, uuid.Nil))
|
||||
}
|
||||
}
|
||||
|
||||
return &entities.Campaign{
|
||||
Name: request.Name,
|
||||
Description: request.Description,
|
||||
@@ -86,7 +78,7 @@ func ToCampaignEntity(request *contract.CreateCampaignRequest) *entities.Campaig
|
||||
ShowOnApp: request.ShowOnApp,
|
||||
Position: request.Position,
|
||||
Metadata: request.Metadata,
|
||||
Rules: rules,
|
||||
Rules: nil, // Rules will be managed separately
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,13 +87,6 @@ func ToCampaignEntityFromUpdate(request *contract.UpdateCampaignRequest) *entiti
|
||||
return nil
|
||||
}
|
||||
|
||||
var rules []entities.CampaignRule
|
||||
if request.Rules != nil {
|
||||
for _, rule := range request.Rules {
|
||||
rules = append(rules, *ToCampaignRuleEntityFromUpdate(&rule, request.ID))
|
||||
}
|
||||
}
|
||||
|
||||
return &entities.Campaign{
|
||||
ID: request.ID,
|
||||
Name: request.Name,
|
||||
@@ -113,7 +98,7 @@ func ToCampaignEntityFromUpdate(request *contract.UpdateCampaignRequest) *entiti
|
||||
ShowOnApp: request.ShowOnApp,
|
||||
Position: request.Position,
|
||||
Metadata: request.Metadata,
|
||||
Rules: rules,
|
||||
Rules: nil, // Rules will be managed separately
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,7 +114,7 @@ func ToCampaignRuleEntity(request *contract.CampaignRuleStruct, campaignID uuid.
|
||||
}
|
||||
|
||||
return &entities.CampaignRule{
|
||||
ID: uuid.New(), // Generate unique UUID for each campaign rule
|
||||
ID: uuid.Nil, // Let GORM's BeforeCreate hook generate the UUID
|
||||
CampaignID: campaignID,
|
||||
RuleType: entities.RuleType(request.RuleType),
|
||||
ConditionValue: request.ConditionValue,
|
||||
@@ -153,7 +138,7 @@ func ToCampaignRuleEntityFromUpdate(request *contract.CampaignRuleStruct, campai
|
||||
}
|
||||
|
||||
return &entities.CampaignRule{
|
||||
ID: uuid.New(), // Generate new UUID for each campaign rule
|
||||
ID: uuid.Nil, // Let GORM's BeforeCreate hook generate the UUID
|
||||
CampaignID: campaignID,
|
||||
RuleType: entities.RuleType(request.RuleType),
|
||||
ConditionValue: request.ConditionValue,
|
||||
|
||||
Reference in New Issue
Block a user