diff --git a/src/Fengling.Activity.Domain/Services/CampaignExecutionService.cs b/src/Fengling.Activity.Domain/Services/CampaignExecutionService.cs index bde4fe2..bdbe338 100644 --- a/src/Fengling.Activity.Domain/Services/CampaignExecutionService.cs +++ b/src/Fengling.Activity.Domain/Services/CampaignExecutionService.cs @@ -64,7 +64,7 @@ public class CampaignExecutionService var context = new CampaignContext { - CampaignId = campaignId.Value, + CampaignId = campaignId.Id, TenantId = tenantId.Value, MemberId = memberId, MemberLevel = memberLevel, diff --git a/src/Fengling.Activity.Domain/ValueObjects/CampaignId.cs b/src/Fengling.Activity.Domain/ValueObjects/CampaignId.cs index 51c8648..3e70663 100644 --- a/src/Fengling.Activity.Domain/ValueObjects/CampaignId.cs +++ b/src/Fengling.Activity.Domain/ValueObjects/CampaignId.cs @@ -2,8 +2,6 @@ namespace Fengling.Activity.Domain.ValueObjects; public partial record CampaignId : IGuidStronglyTypedId { - public static CampaignId New() => new CampaignId(Guid.NewGuid()); - public Guid Value => this; - public static implicit operator Guid(CampaignId id) => id.Value; + public static implicit operator Guid(CampaignId id) => id.Id; public static implicit operator CampaignId(Guid value) => new CampaignId(value); } diff --git a/src/Fengling.Activity.Web/Controllers/CampaignsController.cs b/src/Fengling.Activity.Web/Controllers/CampaignsController.cs index 57153a9..8cbec66 100644 --- a/src/Fengling.Activity.Web/Controllers/CampaignsController.cs +++ b/src/Fengling.Activity.Web/Controllers/CampaignsController.cs @@ -41,9 +41,9 @@ public class CampaignsController : ControllerBase await _campaignRepository.AddAsync(campaign, cancellationToken); - return CreatedAtAction(nameof(GetCampaign), new { campaignId = campaign.Id.Value }, new CreateCampaignResponse + return CreatedAtAction(nameof(GetCampaign), new { campaignId = campaign.Id }, new CreateCampaignResponse { - CampaignId = campaign.Id.Value, + CampaignId = campaign.Id, Name = campaign.Name.Value, Status = campaign.Status.ToString(), CreatedAt = campaign.CreatedAt @@ -61,7 +61,7 @@ public class CampaignsController : ControllerBase return Ok(new GetCampaignResponse { - CampaignId = campaign.Id.Value, + CampaignId = campaign.Id, TenantId = campaign.TenantId.Value, Name = campaign.Name.Value, Type = campaign.Type.ToString(), @@ -92,7 +92,7 @@ public class CampaignsController : ControllerBase return Ok(new PublishCampaignResponse { - CampaignId = campaign.Id.Value, + CampaignId = campaign.Id, Status = campaign.Status.ToString(), UpdatedAt = campaign.UpdatedAt }); @@ -118,7 +118,7 @@ public class CreateCampaignRequest public class CreateCampaignResponse { - public Guid CampaignId { get; set; } + public CampaignId CampaignId { get; set; } = default!; public string Name { get; set; } = ""; public string Status { get; set; } = ""; public DateTime CreatedAt { get; set; }