From ac900418c07669b4352f4748765f4f72b9a86d18 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 14 Oct 2024 22:37:49 -0700 Subject: [PATCH 1/9] Added @dss-226. Added OrganizationCd per dss-266 --- server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs | 1 + server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs | 1 + server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs index ad378b24..f500abf7 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs @@ -2,6 +2,7 @@ { public class PlatformSubUpdateDto : IPlatformUpdateDto { + public string OrganizationCd { get; set; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public long ManagingOrganizationId { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs index 368c06d7..3626eb0b 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs @@ -2,6 +2,7 @@ { public class PlatformUpdateDto : IPlatformUpdateDto { + public string OrganizationCd { get; set; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs index cc8ab92f..a963a1e1 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs @@ -13,8 +13,11 @@ public PlatformViewDto() public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } public Guid? UpdUserGuid { get; set; } - //TODO: remove default values after Leif Updates the view to include "Full Name" + //TODO: Add FullName to Platformvw. Remove default value below after Leif Updates the view to include "Full Name". public string UpdUserNm { get; } = "Richard Anderson"; + + //TODO: Add ManagingOrganizationID to PlatFormvw. Comment in line below when completed + //public long ManagingOrganizationId { get; set; } public long? PrimaryNoticeOfTakedownContactId { get; set; } public string? PrimaryNoticeOfTakedownContactEmail { get; set; } public long? PrimaryTakedownRequestContactId { get; set; } From 1201940f67cb51bcca2067976111217d0425d029 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Tue, 15 Oct 2024 13:12:05 -0700 Subject: [PATCH 2/9] Make OrganizationCD readonly for PlatformSubUpdate.dto and PlatformUpdate.dto --- server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs | 2 +- server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs index f500abf7..8320baa3 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs @@ -2,7 +2,7 @@ { public class PlatformSubUpdateDto : IPlatformUpdateDto { - public string OrganizationCd { get; set; } + public string OrganizationCd { get; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public long ManagingOrganizationId { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs index 3626eb0b..9e706bfc 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs @@ -2,7 +2,7 @@ { public class PlatformUpdateDto : IPlatformUpdateDto { - public string OrganizationCd { get; set; } + public string OrganizationCd { get; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } From 5beccd434b570121c38d2ade97855b5cf8bfb9a3 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Wed, 16 Oct 2024 13:03:01 -0700 Subject: [PATCH 3/9] @DSS-883 Created API endpoint /api/organizations/platformTypeDropdown --- server/StrDss.Data/Mappings/EntityToModelProfile.cs | 1 + .../Repositories/OrganizationRepository.cs | 13 +++++++++++++ .../OrganizationDtos/PlatformTypeDto.cs | 12 ++++++++++++ server/StrDss.Service/OrganizationService.cs | 6 ++++++ 4 files changed, 32 insertions(+) create mode 100644 server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs diff --git a/server/StrDss.Data/Mappings/EntityToModelProfile.cs b/server/StrDss.Data/Mappings/EntityToModelProfile.cs index e0480a73..aeb7f9ea 100644 --- a/server/StrDss.Data/Mappings/EntityToModelProfile.cs +++ b/server/StrDss.Data/Mappings/EntityToModelProfile.cs @@ -53,6 +53,7 @@ public EntityToModelProfile() CreateMap(); CreateMap(); CreateMap(); + CreateMap(); } } } diff --git a/server/StrDss.Data/Repositories/OrganizationRepository.cs b/server/StrDss.Data/Repositories/OrganizationRepository.cs index 38155778..8aeb950a 100644 --- a/server/StrDss.Data/Repositories/OrganizationRepository.cs +++ b/server/StrDss.Data/Repositories/OrganizationRepository.cs @@ -26,11 +26,13 @@ public interface IOrganizationRepository Task GetStrRequirements(double longitude, double latitude); Task> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction); Task GetPlatform(long id); + Task> GetPlatformTypesAsync(); Task CreatePlatformAsync(PlatformCreateDto dto); Task DoesOrgCdExist(string orgCd); Task UpdatePlatformAsync(PlatformUpdateDto dto); Task CreatePlatformSubAsync(PlatformSubCreateDto dto); Task UpdatePlatformSubAsync(PlatformSubUpdateDto dto); + } public class OrganizationRepository : RepositoryBase, IOrganizationRepository { @@ -53,6 +55,17 @@ await _dbContext.DssOrganizationTypes.AsNoTracking() return types; } + public async Task> GetPlatformTypesAsync() + { + var platformTypes = _mapper.Map>( + await _dbContext.DssPlatformTypes.AsNoTracking().ToListAsync()); + + + //await _dbContext.DssPlatformTypes.ToListAsync(); + + return platformTypes; + } + public async Task> GetOrganizationsAsync(string? type) { var query = _dbSet.AsNoTracking(); diff --git a/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs new file mode 100644 index 00000000..a3b40b71 --- /dev/null +++ b/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace StrDss.Model.OrganizationDtos +{ + public class PlatformTypeDto + { + [JsonPropertyName("value")] + public string PlatformType { get; set; } + [JsonPropertyName("label")] + public string PlatformTypeNm { get; set; } + } +} diff --git a/server/StrDss.Service/OrganizationService.cs b/server/StrDss.Service/OrganizationService.cs index d4f96664..32a93c9c 100644 --- a/server/StrDss.Service/OrganizationService.cs +++ b/server/StrDss.Service/OrganizationService.cs @@ -22,6 +22,7 @@ public interface IOrganizationService Task GetStrRequirements(double longitude, double latitude); Task> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction); Task GetPlatform(long id); + Task> GetPlatformTypesAsync(); Task<(Dictionary>, long)> CreatePlatformAsync(PlatformCreateDto dto); Task>> UpdatePlatformAsync(PlatformUpdateDto dto); Task<(Dictionary>, long)> CreatePlatformSubAsync(PlatformSubCreateDto dto); @@ -78,6 +79,11 @@ public async Task> GetPlatforms(int pageSize, int page return await _orgRepo.GetPlatform(id); } + public async Task> GetPlatformTypesAsync() + { + return await _orgRepo.GetPlatformTypesAsync(); + } + public async Task<(Dictionary>, long)> CreatePlatformAsync(PlatformCreateDto dto) { var errors = new Dictionary>(); From 4ede995766faf492e74131687ea6de58febd3f15 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Wed, 16 Oct 2024 13:03:32 -0700 Subject: [PATCH 4/9] DSS-883 - adding controller updates --- server/StrDss.Api/Controllers/OrganizationsController.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/StrDss.Api/Controllers/OrganizationsController.cs b/server/StrDss.Api/Controllers/OrganizationsController.cs index b2f27d40..a5e9f84c 100644 --- a/server/StrDss.Api/Controllers/OrganizationsController.cs +++ b/server/StrDss.Api/Controllers/OrganizationsController.cs @@ -101,6 +101,15 @@ public async Task> GetPlatform(long id) return Ok(platform); } + [ApiAuthorize] + [HttpGet("platformTypeDropdown", Name = "GetPlatformTypesDropdown")] + public async Task>> GetPlatformTypesDropDown() + { + var platformTypes = await _orgService.GetPlatformTypesAsync(); + + return Ok(platformTypes); + } + [ApiAuthorize(Permissions.PlatformWrite)] //todo: use platform_write permission when it's ready in the database [HttpPost("platforms", Name = "CreatePlatform")] public async Task CreatePlatform(PlatformCreateDto dto) From 1949599c180be57bde7344950ee8c07a253c3d0b Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Mon, 14 Oct 2024 22:37:49 -0700 Subject: [PATCH 5/9] Added @dss-226. Added OrganizationCd per dss-266 --- server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs | 1 + server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs | 1 + server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs index ad378b24..f500abf7 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs @@ -2,6 +2,7 @@ { public class PlatformSubUpdateDto : IPlatformUpdateDto { + public string OrganizationCd { get; set; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public long ManagingOrganizationId { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs index 368c06d7..3626eb0b 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs @@ -2,6 +2,7 @@ { public class PlatformUpdateDto : IPlatformUpdateDto { + public string OrganizationCd { get; set; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs index cc8ab92f..a963a1e1 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformViewDto.cs @@ -13,8 +13,11 @@ public PlatformViewDto() public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } public Guid? UpdUserGuid { get; set; } - //TODO: remove default values after Leif Updates the view to include "Full Name" + //TODO: Add FullName to Platformvw. Remove default value below after Leif Updates the view to include "Full Name". public string UpdUserNm { get; } = "Richard Anderson"; + + //TODO: Add ManagingOrganizationID to PlatFormvw. Comment in line below when completed + //public long ManagingOrganizationId { get; set; } public long? PrimaryNoticeOfTakedownContactId { get; set; } public string? PrimaryNoticeOfTakedownContactEmail { get; set; } public long? PrimaryTakedownRequestContactId { get; set; } From b5787094268ce0c9b8c5fa212b1c3de3a252f42f Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Tue, 15 Oct 2024 13:12:05 -0700 Subject: [PATCH 6/9] Make OrganizationCD readonly for PlatformSubUpdate.dto and PlatformUpdate.dto --- server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs | 2 +- server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs index f500abf7..8320baa3 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs @@ -2,7 +2,7 @@ { public class PlatformSubUpdateDto : IPlatformUpdateDto { - public string OrganizationCd { get; set; } + public string OrganizationCd { get; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public long ManagingOrganizationId { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs index 3626eb0b..9e706bfc 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs @@ -2,7 +2,7 @@ { public class PlatformUpdateDto : IPlatformUpdateDto { - public string OrganizationCd { get; set; } + public string OrganizationCd { get; } public long OrganizationId { get; set; } public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } From a654c93f412fe274726807436642cfc5cf7bafe1 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Wed, 16 Oct 2024 13:03:01 -0700 Subject: [PATCH 7/9] @DSS-883 Created API endpoint /api/organizations/platformTypeDropdown --- server/StrDss.Data/Mappings/EntityToModelProfile.cs | 1 + .../Repositories/OrganizationRepository.cs | 13 +++++++++++++ .../OrganizationDtos/PlatformTypeDto.cs | 12 ++++++++++++ server/StrDss.Service/OrganizationService.cs | 6 ++++++ 4 files changed, 32 insertions(+) create mode 100644 server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs diff --git a/server/StrDss.Data/Mappings/EntityToModelProfile.cs b/server/StrDss.Data/Mappings/EntityToModelProfile.cs index e0480a73..aeb7f9ea 100644 --- a/server/StrDss.Data/Mappings/EntityToModelProfile.cs +++ b/server/StrDss.Data/Mappings/EntityToModelProfile.cs @@ -53,6 +53,7 @@ public EntityToModelProfile() CreateMap(); CreateMap(); CreateMap(); + CreateMap(); } } } diff --git a/server/StrDss.Data/Repositories/OrganizationRepository.cs b/server/StrDss.Data/Repositories/OrganizationRepository.cs index 38155778..8aeb950a 100644 --- a/server/StrDss.Data/Repositories/OrganizationRepository.cs +++ b/server/StrDss.Data/Repositories/OrganizationRepository.cs @@ -26,11 +26,13 @@ public interface IOrganizationRepository Task GetStrRequirements(double longitude, double latitude); Task> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction); Task GetPlatform(long id); + Task> GetPlatformTypesAsync(); Task CreatePlatformAsync(PlatformCreateDto dto); Task DoesOrgCdExist(string orgCd); Task UpdatePlatformAsync(PlatformUpdateDto dto); Task CreatePlatformSubAsync(PlatformSubCreateDto dto); Task UpdatePlatformSubAsync(PlatformSubUpdateDto dto); + } public class OrganizationRepository : RepositoryBase, IOrganizationRepository { @@ -53,6 +55,17 @@ await _dbContext.DssOrganizationTypes.AsNoTracking() return types; } + public async Task> GetPlatformTypesAsync() + { + var platformTypes = _mapper.Map>( + await _dbContext.DssPlatformTypes.AsNoTracking().ToListAsync()); + + + //await _dbContext.DssPlatformTypes.ToListAsync(); + + return platformTypes; + } + public async Task> GetOrganizationsAsync(string? type) { var query = _dbSet.AsNoTracking(); diff --git a/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs new file mode 100644 index 00000000..a3b40b71 --- /dev/null +++ b/server/StrDss.Model/OrganizationDtos/PlatformTypeDto.cs @@ -0,0 +1,12 @@ +using System.Text.Json.Serialization; + +namespace StrDss.Model.OrganizationDtos +{ + public class PlatformTypeDto + { + [JsonPropertyName("value")] + public string PlatformType { get; set; } + [JsonPropertyName("label")] + public string PlatformTypeNm { get; set; } + } +} diff --git a/server/StrDss.Service/OrganizationService.cs b/server/StrDss.Service/OrganizationService.cs index a797d12e..a0f0dbba 100644 --- a/server/StrDss.Service/OrganizationService.cs +++ b/server/StrDss.Service/OrganizationService.cs @@ -22,6 +22,7 @@ public interface IOrganizationService Task GetStrRequirements(double longitude, double latitude); Task> GetPlatforms(int pageSize, int pageNumber, string orderBy, string direction); Task GetPlatform(long id); + Task> GetPlatformTypesAsync(); Task<(Dictionary>, long)> CreatePlatformAsync(PlatformCreateDto dto); Task>> UpdatePlatformAsync(PlatformUpdateDto dto); Task<(Dictionary>, long)> CreatePlatformSubAsync(PlatformSubCreateDto dto); @@ -80,6 +81,11 @@ public async Task> GetPlatforms(int pageSize, int page return await _orgRepo.GetPlatform(id); } + public async Task> GetPlatformTypesAsync() + { + return await _orgRepo.GetPlatformTypesAsync(); + } + public async Task<(Dictionary>, long)> CreatePlatformAsync(PlatformCreateDto dto) { var errors = new Dictionary>(); From 9ae2a88d62055d6731ad06e66e431b81fdd30bd7 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Wed, 16 Oct 2024 13:03:32 -0700 Subject: [PATCH 8/9] DSS-883 - adding controller updates --- .../StrDss.Api/Controllers/OrganizationsController.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/server/StrDss.Api/Controllers/OrganizationsController.cs b/server/StrDss.Api/Controllers/OrganizationsController.cs index 1983831c..7be8adcb 100644 --- a/server/StrDss.Api/Controllers/OrganizationsController.cs +++ b/server/StrDss.Api/Controllers/OrganizationsController.cs @@ -101,7 +101,16 @@ public async Task> GetPlatform(long id) return Ok(platform); } - [ApiAuthorize(Permissions.PlatformWrite)] + [ApiAuthorize] + [HttpGet("platformTypeDropdown", Name = "GetPlatformTypesDropdown")] + public async Task>> GetPlatformTypesDropDown() + { + var platformTypes = await _orgService.GetPlatformTypesAsync(); + + return Ok(platformTypes); + } + + [ApiAuthorize(Permissions.PlatformWrite)] //todo: use platform_write permission when it's ready in the database [HttpPost("platforms", Name = "CreatePlatform")] public async Task CreatePlatform(PlatformCreateDto dto) { From 69f539e31b66ea7d10e56e81bba7a72391d606f2 Mon Sep 17 00:00:00 2001 From: ychung-mot Date: Thu, 17 Oct 2024 10:43:26 -0700 Subject: [PATCH 9/9] chore: fix compile errors --- server/StrDss.Api/Controllers/OrganizationsController.cs | 4 ---- server/StrDss.Data/Repositories/OrganizationRepository.cs | 2 -- server/StrDss.Model/OrganizationDtos/IPlatformUpdateDto.cs | 1 - server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs | 1 - server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs | 2 -- 5 files changed, 10 deletions(-) diff --git a/server/StrDss.Api/Controllers/OrganizationsController.cs b/server/StrDss.Api/Controllers/OrganizationsController.cs index 8ba6de52..6c52cdb8 100644 --- a/server/StrDss.Api/Controllers/OrganizationsController.cs +++ b/server/StrDss.Api/Controllers/OrganizationsController.cs @@ -110,11 +110,7 @@ public async Task>> GetPlatformTypesDropDown( return Ok(platformTypes); } -<<<<<<< HEAD - [ApiAuthorize(Permissions.PlatformWrite)] //todo: use platform_write permission when it's ready in the database -======= [ApiAuthorize(Permissions.PlatformWrite)] ->>>>>>> 890efbdf2d84b20041a749cb999aaeda1c091937 [HttpPost("platforms", Name = "CreatePlatform")] public async Task CreatePlatform(PlatformCreateDto dto) { diff --git a/server/StrDss.Data/Repositories/OrganizationRepository.cs b/server/StrDss.Data/Repositories/OrganizationRepository.cs index 8aeb950a..42ff46e7 100644 --- a/server/StrDss.Data/Repositories/OrganizationRepository.cs +++ b/server/StrDss.Data/Repositories/OrganizationRepository.cs @@ -1,5 +1,4 @@ using AutoMapper; -using AutoMapper.Features; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -9,7 +8,6 @@ using StrDss.Data.Entities; using StrDss.Model; using StrDss.Model.OrganizationDtos; -using StrDss.Model.RentalReportDtos; using System.Data; namespace StrDss.Data.Repositories diff --git a/server/StrDss.Model/OrganizationDtos/IPlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/IPlatformUpdateDto.cs index 6e77141a..1448d378 100644 --- a/server/StrDss.Model/OrganizationDtos/IPlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/IPlatformUpdateDto.cs @@ -3,7 +3,6 @@ public interface IPlatformUpdateDto { public long OrganizationId { get; set; } - public string OrganizationCd { get; set; } public string OrganizationNm { get; set; } } } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs index 386a5080..8320baa3 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformSubUpdateDto.cs @@ -4,7 +4,6 @@ public class PlatformSubUpdateDto : IPlatformUpdateDto { public string OrganizationCd { get; } public long OrganizationId { get; set; } - public string OrganizationCd { get; set; } = null; public string OrganizationNm { get; set; } = null!; public long ManagingOrganizationId { get; set; } public bool? IsActive { get; set; } diff --git a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs index 1e360f91..368c06d7 100644 --- a/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs +++ b/server/StrDss.Model/OrganizationDtos/PlatformUpdateDto.cs @@ -2,9 +2,7 @@ { public class PlatformUpdateDto : IPlatformUpdateDto { - public string OrganizationCd { get; } public long OrganizationId { get; set; } - public string OrganizationCd { get; set; } = null; public string OrganizationNm { get; set; } = null!; public DateTime UpdDtm { get; set; } public string? PrimaryNoticeOfTakedownContactEmail { get; set; }