Merge pull request #687 from bcgov/yj

chore: update platform
bcgov · Sep 27, 2024 · 867dc41 · 867dc41
2 parents 2b9beed + ba7ccb3
commit 867dc41
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 10 deletions.
diff --git a/server/StrDss.Api/Controllers/OrganizationsController.cs b/server/StrDss.Api/Controllers/OrganizationsController.cs
@@ -103,7 +103,7 @@ public async Task<ActionResult<PlatformViewDto>> GetPlatform(long id)
 
         [ApiAuthorize(Permissions.UserWrite)] //todo: use platform_write permission when it's ready in the database
         [HttpPost("platforms", Name = "CreatePlatform")]
-        public async Task<ActionResult> CreatePlatform(PlatformUpdateDto dto)
+        public async Task<ActionResult> CreatePlatform(PlatformCreateDto dto)
         {
             var (errors, id) = await _orgService.CreatePlatformAsync(dto);
 
@@ -114,5 +114,21 @@ public async Task<ActionResult> CreatePlatform(PlatformUpdateDto dto)
 
             return Ok(id);
         }
+
+        [ApiAuthorize(Permissions.UserWrite)] //todo: use platform_write permission when it's ready in the database
+        [HttpPut("platforms/{id}", Name = "UpdatePlatform")]
+        public async Task<ActionResult> UpdatePlatform(PlatformUpdateDto dto, long id)
+        {
+            dto.OrganizationId = id;
+
+            var errors = await _orgService.UpdatePlatformAsync(dto);
+
+            if (errors.Any())
+            {
+                return ValidationUtils.GetValidationErrorResult(errors, ControllerContext);
+            }
+
+            return Ok();
+        }
     }
 }
diff --git a/server/StrDss.Data/Mappings/EntityToModelProfile.cs b/server/StrDss.Data/Mappings/EntityToModelProfile.cs
@@ -51,7 +51,7 @@ public EntityToModelProfile()
                 .ForMember(o => o.UpdDtm, opt => opt.MapFrom(i => DateUtils.ConvertUtcToPacificTime(i.UpdDtm)));
 
             CreateMap<DssBusinessLicence, BizLicenceSearchDto>();
-            CreateMap<DssOrganization, PlatformUpdateDto>();
+            CreateMap<DssOrganization, PlatformCreateDto>();
             CreateMap<DssPlatformVw, PlatformViewDto>();
         }
     }

diff --git a/server/StrDss.Data/Mappings/ModelToEntityProfile.cs b/server/StrDss.Data/Mappings/ModelToEntityProfile.cs
@@ -30,6 +30,7 @@ public ModelToEntityProfile()
                 .ForMember(dest => dest.SeparateReservationsQty, opt => opt.MapFrom(src => CommonUtils.StringToShort(src.ReservationsQty)));
 
             CreateMap<RoleUpdateDto, DssUserRole>();
+            CreateMap<PlatformCreateDto, DssOrganization>();
             CreateMap<PlatformUpdateDto, DssOrganization>();
         }
     }

diff --git a/server/StrDss.Data/Repositories/OrganizationRepository.cs b/server/StrDss.Data/Repositories/OrganizationRepository.cs
@@ -26,8 +26,9 @@ public interface IOrganizationRepository
         Task<StrRequirementsDto?> GetStrRequirements(double longitude, double latitude);
         Task<PagedDto<PlatformViewDto>> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction);
         Task<PlatformViewDto?> GetPlatform(long id);
-        Task<DssOrganization> CreatePlatformAsync(PlatformUpdateDto dto);
+        Task<DssOrganization> CreatePlatformAsync(PlatformCreateDto dto);
         Task<bool> DoesOrgCdExist(string orgCd);
+        Task UpdatePlatformAsync(PlatformUpdateDto dto);
     }
     public class OrganizationRepository : RepositoryBase<DssOrganization>, IOrganizationRepository
     {
@@ -178,10 +179,11 @@ public async Task<PagedDto<PlatformViewDto>> GetPlatforms(int pageSize, int page
             return platform;
         }
 
-        public async Task<DssOrganization> CreatePlatformAsync(PlatformUpdateDto dto)
+        public async Task<DssOrganization> CreatePlatformAsync(PlatformCreateDto dto)
         {
             var entity = _mapper.Map<DssOrganization>(dto);
 
+            entity.OrganizationCd = dto.OrganizationCd.ToUpperInvariant();
             entity.OrganizationType = OrganizationTypes.Platform;
 
             await _dbSet.AddAsync(entity);
@@ -209,7 +211,44 @@ private void CreateContact(DssOrganization entity, string messageType, string? e
 
         public async Task<bool> DoesOrgCdExist(string orgCd)
         {
-            return await _dbSet.AnyAsync(x => x.OrganizationCd == orgCd);
+            return await _dbSet.AnyAsync(x => x.OrganizationCd == orgCd.ToUpperInvariant());
+        }
+
+        public async Task UpdatePlatformAsync(PlatformUpdateDto dto)
+        {
+            var entity = await _dbSet
+                .Include(x => x.DssOrganizationContactPeople)
+                .FirstAsync(x => x.OrganizationId == dto.OrganizationId);
+
+            _mapper.Map(dto, entity);
+
+            UpdateContact(entity, EmailMessageTypes.NoticeOfTakedown, dto.NoticeOfTakedownContactEmail1, true);
+            UpdateContact(entity, EmailMessageTypes.NoticeOfTakedown, dto.NoticeOfTakedownContactEmail2, false);
+            UpdateContact(entity, EmailMessageTypes.TakedownRequest, dto.TakedownRequestContactEmail1, true);
+            UpdateContact(entity, EmailMessageTypes.TakedownRequest, dto.TakedownRequestContactEmail2, false);
+        }
+
+        private void UpdateContact(DssOrganization entity, string messageType, string? emailAddress, bool isPrimary)
+        {
+            var contact = entity.DssOrganizationContactPeople
+                .FirstOrDefault(x => x.EmailMessageType == messageType
+                    && (isPrimary ? x.IsPrimary == isPrimary : x.IsPrimary == false || x.IsPrimary == null));
+
+            if (contact == null)
+            {
+                CreateContact(entity, messageType, emailAddress, isPrimary);
+            }
+            else
+            {
+                if (string.IsNullOrEmpty(emailAddress))
+                {
+                    _dbContext.DssOrganizationContactPeople.Remove(contact);
+                }
+                else
+                {
+                    contact.EmailAddressDsc = emailAddress;
+                }                    
+            }
         }
     }
 }
diff --git a/server/StrDss.Model/OrganizationDtos/PlatformCreateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformCreateDto.cs
@@ -0,0 +1,13 @@
+namespace StrDss.Model.OrganizationDtos
+{
+    public class PlatformCreateDto
+    {
+        public string OrganizationCd { get; set; } = null!;
+        public string OrganizationNm { get; set; } = null!;
+        public DateTime UpdDtm { get; set; }
+        public string? NoticeOfTakedownContactEmail1 { get; set; }
+        public string? TakedownRequestContactEmail1 { get; set; }
+        public string? NoticeOfTakedownContactEmail2 { get; set; }
+        public string? TakedownRequestContactEmail2 { get; set; }
+    }
+}
diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs
@@ -3,7 +3,6 @@
     public class PlatformUpdateDto
     {
         public long OrganizationId { get; set; }
-        public string OrganizationCd { get; set; } = null!;
         public string OrganizationNm { get; set; } = null!;
         public DateTime UpdDtm { get; set; }
         public string? NoticeOfTakedownContactEmail1 { get; set; }

diff --git a/server/StrDss.Service/OrganizationService.cs b/server/StrDss.Service/OrganizationService.cs
@@ -22,7 +22,8 @@ public interface IOrganizationService
         Task<StrRequirementsDto?> GetStrRequirements(double longitude, double latitude);
         Task<PagedDto<PlatformViewDto>> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction);
         Task<PlatformViewDto?> GetPlatform(long id);
-        Task<(Dictionary<string, List<string>>, long)> CreatePlatformAsync(PlatformUpdateDto dto);
+        Task<(Dictionary<string, List<string>>, long)> CreatePlatformAsync(PlatformCreateDto dto);
+        Task<Dictionary<string, List<string>>> UpdatePlatformAsync(PlatformUpdateDto dto);
     }
     public class OrganizationService : ServiceBase, IOrganizationService
     {
@@ -75,11 +76,11 @@ public async Task<PagedDto<PlatformViewDto>> GetPlatforms(int pageSize, int page
             return await _orgRepo.GetPlatform(id);
         }
 
-        public async Task<(Dictionary<string, List<string>>, long)> CreatePlatformAsync(PlatformUpdateDto dto)
+        public async Task<(Dictionary<string, List<string>>, long)> CreatePlatformAsync(PlatformCreateDto dto)
         {
             var errors = new Dictionary<string, List<string>>();
 
-            await ValidatePlatformUpdateDto(dto, errors);
+            await ValidatePlatformCreateDto(dto, errors);
 
             if (errors.Any())
             {
@@ -93,7 +94,7 @@ public async Task<PagedDto<PlatformViewDto>> GetPlatforms(int pageSize, int page
             return (errors, entity.OrganizationId);            
         }
 
-        private async Task<Dictionary<string, List<string>>> ValidatePlatformUpdateDto(PlatformUpdateDto dto, Dictionary<string, List<string>> errors)
+        private async Task<Dictionary<string, List<string>>> ValidatePlatformCreateDto(PlatformCreateDto dto, Dictionary<string, List<string>> errors)
         {
             _validator.Validate(Entities.Platform, dto, errors);
 
@@ -109,5 +110,40 @@ private async Task<Dictionary<string, List<string>>> ValidatePlatformUpdateDto(P
 
             return errors;
         }
+
+        public async Task<Dictionary<string, List<string>>> UpdatePlatformAsync(PlatformUpdateDto dto)
+        {
+            var errors = new Dictionary<string, List<string>>();
+
+            var platformDto = await _orgRepo.GetPlatform(dto.OrganizationId);
+
+            if (platformDto == null)
+            {
+                errors.AddItem("OrganizationId", $"Platform with ID {dto.OrganizationId} does not exist");
+                return errors;
+            }
+
+            await ValidatePlatformUpdateDto(dto, errors);
+
+            if (errors.Any())
+            {
+                return errors;
+            }
+
+            await _orgRepo.UpdatePlatformAsync(dto);
+
+            _unitOfWork.Commit();
+
+            return errors;
+        }
+
+        private async Task<Dictionary<string, List<string>>> ValidatePlatformUpdateDto(PlatformUpdateDto dto, Dictionary<string, List<string>> errors)
+        {
+            await Task.CompletedTask;
+
+            _validator.Validate(Entities.Platform, dto, errors);
+
+            return errors;
+        }
     }
 }