Merge pull request #411 from leoslopez/NO-TICKET-add_prefix_field_in_promocode

No ticket add prefix field in promocode

Author: leoslopez

Doppler.HtmlEditorApi.Test/http/accounts/_/campaings/_/content/promo-code/_/PutPromoCodeTest.cs

@@ -91,7 +91,7 @@ public async Task PUT_promo_code_should_not_accept_a_expired_token(string url, s
     [Theory]
     [InlineData($"/accounts/{TestUsersData.EMAIL_TEST1}/campaigns/111/content/promo-code/222", TestUsersData.TOKEN_TEST1_EXPIRE_20330518, 222)]
     [InlineData($"/accounts/{TestUsersData.EMAIL_TEST1}/campaigns/111/content/promo-code/222", TestUsersData.TOKEN_SUPERUSER_EXPIRE_20330518, 222)]
-    public async Task PUT_campaign_should_accept_right_tokens_and_return_Ok(string url, string token, int promoCodeId)
+    public async Task PUT_promo_code_should_accept_right_tokens_and_return_Ok(string url, string token, int promoCodeId)
     {
         // Arrange
         var dbContextMock = new Mock<IDbContext>();
@@ -114,4 +114,38 @@ public async Task PUT_campaign_should_accept_right_tokens_and_return_Ok(string u
         // Assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
     }
+
+    [Fact]
+    public async Task PUT_promo_code_should_return_NotFound_when_campaign_promocode_relation_does_not_exist()
+    {
+        // Arrange
+        var dbContextMock = new Mock<IDbContext>();
+
+        var campaignId = 111;
+        var promoCodeId = 222;
+        var endpointPath = $"/accounts/{TestUsersData.EMAIL_TEST1}/campaigns/{campaignId}/content/promo-code/{promoCodeId}";
+        var token = TestUsersData.TOKEN_SUPERUSER_EXPIRE_20330518;
+
+        // Return 0, it does not found CampaignId/PromoCodeId relation to update
+        dbContextMock
+            .Setup(x => x.ExecuteAsync(It.Is<UpdatePromoCodeDbQuery>(q => q.Id == promoCodeId && q.IdCampaign == campaignId)))
+            .ReturnsAsync(0);
+
+        var client = _factory.CreateSutClient(serviceToOverride1: dbContextMock.Object, token);
+
+        // Act
+        var response = await client.PutAsync(endpointPath, JsonContent.Create(new
+        {
+            type = "type",
+            value = 10,
+            includeShipping = true,
+            firstPurchase = true,
+        }));
+
+        // Assert
+        Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+
+        var responseContent = await response.Content.ReadAsStringAsync();
+        Assert.Equal("The Campaign/PromoCode relation doesn't exist.", responseContent);
+    }
 }

Doppler.HtmlEditorApi/ApiModels/PromoCode.cs

@@ -16,9 +16,9 @@ public record PromoCode(
     int expireDays,
     decimal minPrice,
     int maxUses,
-    string categories
+    string categories,
+    string prefix
 ) : IValidatableObject
 {
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext) { yield break; }
 }
-

Doppler.HtmlEditorApi/Controllers/CampaignsController.cs

@@ -206,7 +206,9 @@ public async Task<Results<NotFound<ProblemDetails>, CreatedAtRoute<ResourceCreat
                 MinPrice: promoCode.minPrice,
                 MaxUses: promoCode.maxUses,
                 Categories: promoCode.categories,
-                CampaignId: campaignId);
+                CampaignId: campaignId,
+                Prefix: promoCode.prefix
+            );
 
             var result = await _promoCodeRepository.CreatePromoCode(promoCodeModel);
 
@@ -227,9 +229,16 @@ public async Task<IActionResult> UpdatePromoCode(string accountName, int campaig
                 ExpireDays: promoCode.expireDays,
                 MaxUses: promoCode.maxUses,
                 Categories: promoCode.categories,
-                CampaignId: campaignId);
+                CampaignId: campaignId,
+                Prefix: promoCode.prefix
+            );
 
-            await _promoCodeRepository.UpdatePromoCode(promoCodeModel);
+            var updateResult = await _promoCodeRepository.UpdatePromoCode(promoCodeModel);
+
+            if (!updateResult)
+            {
+                return new NotFoundObjectResult("The Campaign/PromoCode relation doesn't exist.");
+            }
 
             return new OkObjectResult($"Promo code {promoCodeId} was successfully updated.");
         }

Doppler.HtmlEditorApi/Domain/PromoCodeModel.cs

@@ -11,5 +11,6 @@ public record PromoCodeModel(
     decimal MinPrice,
     int MaxUses,
     string Categories,
-    int CampaignId
+    int CampaignId,
+    string Prefix
     );

Doppler.HtmlEditorApi/Repositories.DopplerDb/DopplerPromoCodeRepository.cs

@@ -25,17 +25,20 @@ public async Task<int> CreatePromoCode(PromoCodeModel promoCodeModel)
             ExpireDays: promoCodeModel.ExpireDays,
             MaxUses: promoCodeModel.MaxUses,
             Categories: promoCodeModel.Categories,
-            IdCampaign: promoCodeModel.CampaignId);
+            IdCampaign: promoCodeModel.CampaignId,
+            Prefix: promoCodeModel.Prefix
+        );
 
         var result = await _dbContext.ExecuteAsync(insertPromoCodeDbQuery);
 
         return result.IdDynamicContentPromoCode;
     }
 
-    public async Task UpdatePromoCode(PromoCodeModel promoCodeModel)
+    public async Task<bool> UpdatePromoCode(PromoCodeModel promoCodeModel)
     {
         var updatePromoCodeDbQuery = new UpdatePromoCodeDbQuery(
             Id: promoCodeModel.Id,
+            IdCampaign: promoCodeModel.CampaignId,
             Type: promoCodeModel.Type,
             Value: promoCodeModel.Value,
             IncludeShipping: promoCodeModel.IncludeShipping,
@@ -44,9 +47,12 @@ public async Task UpdatePromoCode(PromoCodeModel promoCodeModel)
             MinPrice: promoCodeModel.MinPrice,
             ExpireDays: promoCodeModel.ExpireDays,
             MaxUses: promoCodeModel.MaxUses,
-            Categories: promoCodeModel.Categories);
+            Categories: promoCodeModel.Categories,
+            Prefix: promoCodeModel.Prefix
+        );
 
-        await _dbContext.ExecuteAsync(updatePromoCodeDbQuery);
+        var result = await _dbContext.ExecuteAsync(updatePromoCodeDbQuery);
+        return result > 0;
     }
 }
 

Doppler.HtmlEditorApi/Repositories.DopplerDb/Queries/InsertPromoCodeDbQuery.cs

@@ -12,7 +12,8 @@ public record InsertPromoCodeDbQuery(
     int ExpireDays,
     int MaxUses,
     string? Categories,
-    int IdCampaign
+    int IdCampaign,
+    string Prefix
 ) : ISingleItemDbQuery<InsertPromoCodeDbQuery.Result>
 {
     public string GenerateSqlQuery() => @"
@@ -26,7 +27,8 @@ INSERT INTO DynamicContentPromoCode (
     ExpireDays,
     MaxUses,
     Categories,
-    IdCampaign
+    IdCampaign,
+    Prefix
 ) VALUES (
     @Type,
     @Value,
@@ -37,7 +39,8 @@ INSERT INTO DynamicContentPromoCode (
     @ExpireDays,
     @MaxUses,
     @Categories,
-    @IdCampaign
+    @IdCampaign,
+    @Prefix
 )
 
 SELECT @@Identity AS IdDynamicContentPromoCode";

Doppler.HtmlEditorApi/Repositories.DopplerDb/Queries/UpdatePromoCodeDbQuery.cs

@@ -4,6 +4,7 @@ namespace Doppler.HtmlEditorApi.Repositories.DopplerDb.Queries;
 
 public record UpdatePromoCodeDbQuery(
     int Id,
+    int IdCampaign,
     string Type,
     decimal Value,
     bool IncludeShipping,
@@ -12,7 +13,8 @@ public record UpdatePromoCodeDbQuery(
     decimal MinPrice,
     int ExpireDays,
     int MaxUses,
-    string? Categories
+    string? Categories,
+    string Prefix
 ) : IExecutableDbQuery
 {
     public string GenerateSqlQuery() => @"
@@ -25,6 +27,7 @@ UPDATE DynamicContentPromoCode
     MinPrice = @MinPrice,
     ExpireDays = @ExpireDays,
     MaxUses = @MaxUses,
-    Categories = @Categories
-WHERE IdDynamicContentPromoCode = @Id";
+    Categories = @Categories,
+    Prefix = @Prefix
+WHERE IdDynamicContentPromoCode = @Id AND IdCampaign = @IdCampaign";
 }

Doppler.HtmlEditorApi/Repositories/IPromoCodeRepository.cs

@@ -6,6 +6,6 @@ namespace Doppler.HtmlEditorApi.Repositories;
 public interface IPromoCodeRepository
 {
     Task<int> CreatePromoCode(PromoCodeModel promoCodeModel);
-    Task UpdatePromoCode(PromoCodeModel promoCodeModel);
+    Task<bool> UpdatePromoCode(PromoCodeModel promoCodeModel);
 }
 

cspell-project-words.txt

@@ -56,3 +56,6 @@ unlayer
 whatsapp
 xunit
 jenkins
+
+# Business words
+promocode