Merge pull request #153 from bcgov/yj

feat(dss-305): remove organization id from takedown request dto
bcgov · Apr 16, 2024 · 5abadfc · 5abadfc
2 parents df10bbe + 324fa4b
commit 5abadfc
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -12,6 +12,10 @@ on:
       - CHANGELOG.md
       - .conventional-changelog.mjs
       - .release-it.json
+      - postman/**
+      - localdb/**
+      - postgres/**
+      - crunchydb/**
 
 jobs:
   build-backend:

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Our CI/CD process is facilitated through GitHub Actions, ensuring seamless integ
    - Facilitates deployment of selected tag's images into the `Production` environment.
    - Triggered through the GitHub UI upon publishing a new release from a tag.
 
-1. [Create Version Tag with Changelog PR](./.github/workflows/create-tag-changelog-pr.yml):
+1. [Create Version Tag](./.github/workflows/create-tag.yml):
 
    - Supports for generating version tags.
    - Triggered through the GitHub UI, allowing specification of tag versions excluding prefixes.

diff --git a/postman/str-dss.postman_collection.json b/postman/str-dss.postman_collection.json
@@ -70,7 +70,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": 1,\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"hostEmail\": \"[email protected]\",\r\n  \"hostEmailSent\": false,  \r\n  \"reasonId\": 1,\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ],\r\n  \"lgContactEmail\": \"[email protected]\",\r\n  \"lgContactPhone\": \"123-456-7890\",\r\n  \"strBylawUrl\": \"https://bylaw.ca\",\r\n  \"comment\": \"Test comment\"\r\n}",
+					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": \"1\",\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"hostEmail\": \"[email protected]\",\r\n  \"hostEmailSent\": false,  \r\n  \"reasonId\": 1,\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ],\r\n  \"lgContactEmail\": \"[email protected]\",\r\n  \"lgContactPhone\": \"123-456-7890\",\r\n  \"strBylawUrl\": \"https://bylaw.ca\",\r\n  \"comment\": \"Test comment\"\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -98,7 +98,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": 1,\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"hostEmail\": \"[email protected]\",\r\n  \"hostEmailSent\": false,  \r\n  \"reasonId\": 5,\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ],\r\n  \"lgContactEmail\": \"[email protected]\",\r\n  \"lgContactPhone\": \"123-456-7890\",\r\n  \"strBylawUrl\": \"https://bylaw.ca\",\r\n  \"comment\": \"Test comment\"\r\n}",
+					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": \"1\",\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"hostEmail\": \"\",\r\n  \"hostEmailSent\": true,  \r\n  \"reasonId\": 5,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ],\r\n  \"lgContactEmail\": \"[email protected]\",\r\n  \"lgContactPhone\": \"123-456-7890\",\r\n  \"strBylawUrl\": \"https://bylaw.ca\",\r\n  \"comment\": \"Test comment\"\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -127,7 +127,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"lgId\": 1,\r\n  \"platformId\": 2,\r\n  \"listingId\": 1,\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ]\r\n}",
+					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": \"1\",\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ]\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -155,7 +155,7 @@
 				"header": [],
 				"body": {
 					"mode": "raw",
-					"raw": "{\r\n  \"lgId\": 1,\r\n  \"platformId\": 2,\r\n  \"listingId\": 1,\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ]\r\n}",
+					"raw": "{\r\n  \"platformId\": 2,\r\n  \"listingId\": \"1\",\r\n  \"listingUrl\": \"https://www.airbnb.com/rooms/16120388?check_in=2024-04-25&amp;check_out=2024-04-27&amp;guests=1&amp;adults=1&amp;s=67&amp;unique_share_id=fa107d24-b0df-49bd-91e4-576dd7d368ab\",\r\n  \"sendCopy\": true,\r\n  \"ccList\": [\r\n    \"[email protected]\"\r\n  ]\r\n}",
 					"options": {
 						"raw": {
 							"language": "json"
@@ -559,7 +559,7 @@
 					"formdata": [
 						{
 							"key": "ReportPeriod",
-							"value": "2024-05",
+							"value": "2024-03",
 							"type": "text"
 						},
 						{
@@ -570,7 +570,7 @@
 						{
 							"key": "File",
 							"type": "file",
-							"src": "postman-cloud:///1eef47cf-0716-4770-88ff-15d6dd59453f"
+							"src": "/C:/Users/chungy/OneDrive - Advanced Solutions, a DXC Technology Company/Documents/STR/listing-valid2.csv"
 						}
 					]
 				},

diff --git a/server/StrDss.Api/Authentication/KcJwtBearerEvents.cs b/server/StrDss.Api/Authentication/KcJwtBearerEvents.cs
@@ -62,6 +62,7 @@ public override async Task TokenValidated(TokenValidatedContext context)
                 _currentUser.AccessRequestStatus = user.AccessRequestStatusCd;
                 _currentUser.AccessRequestRequired = _currentUser.AccessRequestStatus == AccessRequestStatuses.Denied;
                 _currentUser.OrganizationType = user.RepresentedByOrganization?.OrganizationType ?? "";
+                _currentUser.OrganizationId = user.RepresentedByOrganizationId ?? 0;
                 _currentUser.TermsAcceptanceDtm = user.TermsAcceptanceDtm;
 
                 if (user.IsEnabled)

diff --git a/server/StrDss.Model/CurrentUser.cs b/server/StrDss.Model/CurrentUser.cs
@@ -22,6 +22,7 @@ public interface ICurrentUser
         public bool AccessRequestRequired { get; set; }
         public List<string> Permissions { get; set; }
         public string OrganizationType { get; set; }
+        public long OrganizationId { get; set; }
         public DateTime? TermsAcceptanceDtm { get; set; }
         void LoadUserSession(ClaimsPrincipal user);
         void AddClaim(ClaimsPrincipal user, string claimType, string value);
@@ -44,7 +45,8 @@ public class CurrentUser : ICurrentUser
         public string AccessRequestStatus { get; set; } = "";
         public bool AccessRequestRequired { get; set; }
         public List<string> Permissions { get; set; } = new List<string>();
-        public string OrganizationType { get; set; }
+        public string OrganizationType { get; set; } = "";
+        public long OrganizationId { get; set; }
         public DateTime? TermsAcceptanceDtm { get; set; }
 
         public void LoadUserSession(ClaimsPrincipal user)

diff --git a/server/StrDss.Model/DelistingDtos/TakedownRequestCreateDto.cs b/server/StrDss.Model/DelistingDtos/TakedownRequestCreateDto.cs
@@ -4,7 +4,6 @@ namespace StrDss.Model.DelistingDtos
 {
     public class TakedownRequestCreateDto
     {
-        public long LgId { get; set; }
         public long PlatformId { get; set; }
         public string? ListingId { get; set; }
         public string ListingUrl { get; set; } = "";

diff --git a/server/StrDss.Service/DelistingService.cs b/server/StrDss.Service/DelistingService.cs
@@ -234,7 +234,7 @@ private TakedownNotice GetTakedownNoticeTemplate(TakedownNoticeCreateDto dto, Or
         public async Task<Dictionary<string, List<string>>> CreateTakedownRequestAsync(TakedownRequestCreateDto dto)
         {
             var platform = await _orgService.GetOrganizationByIdAsync(dto.PlatformId);
-            var lg = await _orgService.GetOrganizationByIdAsync(dto.LgId);
+            var lg = await _orgService.GetOrganizationByIdAsync(_currentUser.OrganizationId);
 
             var errors = await ValidateTakedownRequestAsync(dto, platform, lg);
             if (errors.Count > 0)
@@ -280,7 +280,7 @@ private async Task<Dictionary<string, List<string>>> ValidateTakedownRequestAsyn
 
             if (lg == null)
             {
-                errors.AddItem("lgId", $"Local Government ID ({dto.LgId}) does not exist.");
+                errors.AddItem("lgId", $"Local Government ID ({_currentUser.OrganizationId}) does not exist.");
             }
             else
             {
@@ -366,7 +366,7 @@ private TakedownRequest GetTakedownRequestTemplate(TakedownRequestCreateDto dto,
         public async Task<(Dictionary<string, List<string>> errors, EmailPreview preview)> GetTakedownRequestPreviewAsync(TakedownRequestCreateDto dto)
         {
             var platform = await _orgService.GetOrganizationByIdAsync(dto.PlatformId);
-            var lg = await _orgService.GetOrganizationByIdAsync(dto.LgId);
+            var lg = await _orgService.GetOrganizationByIdAsync(_currentUser.OrganizationId);
 
             var errors = await ValidateTakedownRequestAsync(dto, platform, lg);
             if (errors.Count > 0)

diff --git a/server/StrDss.Test/AutoDomainDataBuilder/DelistingRequestCreateDtoBuilder.cs b/server/StrDss.Test/AutoDomainDataBuilder/DelistingRequestCreateDtoBuilder.cs
@@ -28,9 +28,6 @@ public object Create(object request, ISpecimenContext context)
                     return 1;
                 case nameof(TakedownRequestCreateDto.ListingId):
                     return 1;
-                case nameof(TakedownRequestCreateDto.LgId):
-                    return 2;
-
                 case nameof(TakedownRequestCreateDto.ListingUrl):
                     return "https://example.com/listing";
 

diff --git a/server/StrDss.Test/AutoDomainDataBuilder/OrganizationDtoBuilder.cs b/server/StrDss.Test/AutoDomainDataBuilder/OrganizationDtoBuilder.cs
@@ -25,7 +25,7 @@ public object Create(object request, ISpecimenContext context)
             switch (pi.Name)
             {
                 case nameof(OrganizationDto.OrganizationId):
-                    return 1;
+                    return 2;
                 case nameof(OrganizationDto.OrganizationType):
                     return OrganizationTypes.Platform;
                 case nameof(OrganizationDto.OrganizationCd):

diff --git a/server/StrDss.Test/DelistingServiceShould.cs b/server/StrDss.Test/DelistingServiceShould.cs
@@ -3,8 +3,6 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using StrDss.Common;
-using StrDss.Data.Entities;
-using StrDss.Data.Repositories;
 using StrDss.Model;
 using StrDss.Model.DelistingDtos;
 using StrDss.Model.OrganizationDtos;
@@ -323,18 +321,19 @@ public async Task ValidateDelistingRequest_NullLocalGovernment_ReturnsLocalGover
             [Frozen] Mock<IConfiguration> configMock,
             [Frozen] Mock<IChesTokenApi> chesTokenApiMock,
             [Frozen] Mock<ILogger<StrDssLogger>> loggerMock,
+            [Frozen] Mock<ICurrentUser> currentUserMock,
             DelistingService sut)
         {
             // Arrange
-            dto.LgId = 0;
+            currentUserMock.Setup(m => m.OrganizationId).Returns(0);
 
             // Act
             var result = await sut.CreateTakedownRequestAsync(dto);
 
             // Assert
             Assert.Contains("lgId", result.Keys);
             Assert.Single(result["lgId"]);
-            Assert.Equal($"Local Government ID ({dto.LgId}) does not exist.", result["lgId"].First());
+            Assert.Equal($"Local Government ID (0) does not exist.", result["lgId"].First());
         }
 
         [Theory]
@@ -506,12 +505,14 @@ public async Task SendDelistingRequestAsync_WhenCalled_ShouldSendEmail(
             DelistingService sut)
         {
             // Arrange
+            dto.PlatformId = 2;
             currentUserMock.Setup(m => m.EmailAddress).Returns("[email protected]");
+            currentUserMock.Setup(m => m.OrganizationId).Returns(1);
             orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(dto.PlatformId)).ReturnsAsync(platform);
 
             var lg = CommonUtils.CloneObject(platform);
             lg.OrganizationType = OrganizationTypes.LG;
-            orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(dto.LgId)).ReturnsAsync(lg);
+            orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(1)).ReturnsAsync(lg);
 
             platform.ContactPeople.First().EmailMessageType = EmailMessageTypes.TakedownRequest;
 
@@ -534,13 +535,15 @@ public async Task SendDelistingRequestAsync_WhenSendCopyIsTrue_AddsCurrentUserEm
         {
             // Arrange
             dto.SendCopy = true;
+            dto.PlatformId = 2;
             var currentUserEmail = "[email protected]";
             currentUserMock.Setup(m => m.EmailAddress).Returns(currentUserEmail);
+            currentUserMock.Setup(m => m.OrganizationId).Returns(1);
             orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(dto.PlatformId)).ReturnsAsync(platform);
 
             var lg = CommonUtils.CloneObject(platform);
             lg.OrganizationType = OrganizationTypes.LG;
-            orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(dto.LgId)).ReturnsAsync(lg);
+            orgServiceMock.Setup(x => x.GetOrganizationByIdAsync(1)).ReturnsAsync(lg);
 
             platform.ContactPeople.First().EmailMessageType = EmailMessageTypes.TakedownRequest;