Merge pull request #497 from asanchezr/master

Deploy IS13 to UAT

.github/.trufflehog3.yml

@@ -53,6 +53,13 @@ exclude: # exclude matching issues
     id: high-entropy
     paths:
       - realm-export.json
+  - message: Ignore SSIS .dtsx files (binary content and verifiers)
+    paths:
+      - "*.dtsx"
+  - message: Ignore SSIS .dtproj state
+    pattern: <State>.*?</State>
+    paths:
+      - "*.dtproj"
 # NOTE you can also specify IDs or patterns together or without paths, e.g.
 #
 #   - message: Skip ID everywhere

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-* @devinleighsmith @jdtoombs @asanchezr @rpbcg
+* @devinleighsmith @jdtoombs @asanchezr @rpbcg @FuriousLlama
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only

.github/workflows/app-react.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -72,17 +72,17 @@ jobs:
             -Dsonar.projectKey=${{env.PROJECT_KEY}}
             -Dsonar.projectName=${{env.PROJECT_NAME}}
             -Dsonar.qualitygate.wait=true
-      
+
       - name: Find Comment
         if: failure() && steps.scan.outcome == 'failure' && github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
         uses: peter-evans/find-comment@v1
         id: fc
         with:
           token: ${{secrets.GITHUB_TOKEN}}
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
+          comment-author: "github-actions[bot]"
           body-includes: QUALITY GATE STATUS FOR APP-REACT
-       
+
       - name: Check Quality Gate and Create Comment
         uses: peter-evans/create-or-update-comment@v1
         if: failure() && steps.scan.outcome == 'failure' && github.event_name == 'pull_request' && steps.fc.outputs.comment-id == '' && github.event.pull_request.head.repo.full_name == github.repository
@@ -94,9 +94,9 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             QUALITY GATE STATUS FOR APP-REACT: FAILED.
-            
+
             [View and resolve details on][1]
-            
+
             [1]: ${{env.SONAR_HOST_URL}}/dashboard?id=${{env.PROJECT_KEY}}
           reactions: confused
       - name: Check Quality Gate and Update Comment
@@ -111,9 +111,9 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
             QUALITY GATE STATUS FOR APP-REACT: FAILED.
-            
+
             [View and resolve details on][1]
-            
+
             [1]: ${{env.SONAR_HOST_URL}}/dashboard?id=${{env.PROJECT_KEY}}
           edit-mode: replace
           reactions: eyes

.gitignore

@@ -14,3 +14,4 @@ auth/keycloak/config/hsperfdata_jboss/
 auth/keycloak/config/*.log
 trufflehog_report.*
 datastore.xml
+**/.vscode/

backend/.editorconfig

@@ -11,9 +11,6 @@ trim_trailing_whitespace = true
 [*.ts]
 indent_size = 2
 
-[*.cs]
-indent_size = 4
-
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
@@ -25,3 +22,61 @@ insert_final_newline = false
 # Use tabs for indentation (Makefiles require tabs)
 indent_style = tab
 
+[*.cs]
+indent_size = 4
+
+# IDE0005: Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = warning
+# CA1032: Implement standard exception constructors
+dotnet_diagnostic.CA1032.severity = warning
+# CA1816: Call GC.SuppressFinalize correctly
+dotnet_diagnostic.CA1816.severity = error
+# CA1063: Implement IDisposable correctly
+dotnet_diagnostic.CA1063.severity = error
+# CA2007: Do not directly await a Task
+dotnet_diagnostic.CA2007.severity = none
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = none
+# CA1031: Do not catch general exception types
+dotnet_diagnostic.CA1031.severity = none
+# CA2000: Dispose objects before losing scope
+dotnet_diagnostic.CA2000.severity = error
+# CA1508: Avoid dead conditional code
+dotnet_diagnostic.CA1508.severity = none #TODO: Requires further analysis
+# CA1305: Specify IFormatProvider
+dotnet_diagnostic.CA1305.severity = none # #TODO: Requires further analysis
+# CA1801: Review unused parameters
+dotnet_diagnostic.CA1801.severity = none # #TODO: Requires further analysis
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = warning
+# CS1591: Missing XML comment
+dotnet_diagnostic.CS1591.severity = none
+
+# SonarQube
+# S4487 Unread "private" fields should be removed.
+dotnet_diagnostic.S4487.severity = warning
+# S927 Parameter names should match base declaration and other partial definitions
+dotnet_diagnostic.S927.severity = error
+# S1006 Remove the default parameter value to match the signature of overridden method
+dotnet_diagnostic.S1006.severity = error
+# S3928 The parameter name '{param}' is not declared in the argument list
+dotnet_diagnostic.S3928.severity = error
+# S1481 Remove the unused local variable
+dotnet_diagnostic.S1481.severity = warning
+# S1135 Complete the task associated to this 'TODO' comment
+dotnet_diagnostic.S1135.severity = none
+# S1116 Remove empty statement
+dotnet_diagnostic.S1116.severity = warning
+# S1118 Utility classes should not have public constructors
+dotnet_diagnostic.S1118.severity = error
+# S3925 "ISerializable" should be implemented correctly
+dotnet_diagnostic.S3925.severity = error
+# S4457 Parameter validation in "async"/"await" methods should be wrapped
+dotnet_diagnostic.S4457.severity = error
+# S3442 "abstract" classes should not have "public" constructors
+dotnet_diagnostic.S3442.severity = error
+# S125 Remove commented out code
+dotnet_diagnostic.S125.severity = error
+# S4136 Method overloads should be adjacent
+dotnet_diagnostic.S4136.severity = none
+

backend/Directory.Build.props

@@ -0,0 +1,18 @@
+<Project>
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>9.0</LangVersion>
+        <AnalysisMode>Minimum</AnalysisMode>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="8.27.0.35380">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="$(MSBuildThisFileDirectory)\..\.editorconfig" />
+    </ItemGroup>
+</Project>

backend/Dockerfile

@@ -7,6 +7,7 @@ EXPOSE 443 8080
 FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 COPY *.sln .
+COPY Directory.Build.props .
 COPY api/*.csproj api/
 COPY entities/*.csproj entities/
 COPY tests/core/*.csproj tests/core/
@@ -16,7 +17,6 @@ COPY dal/*.csproj dal/
 COPY dal.keycloak/*.csproj dal.keycloak/
 COPY keycloak/*.csproj keycloak/
 COPY geocoder/*.csproj geocoder/
-COPY ches/*.csproj ches/
 COPY core/*.csproj core/
 COPY ltsa/*.csproj ltsa/
 

backend/Dockerfile.3.1

@@ -7,6 +7,7 @@ EXPOSE 443 8080
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
 WORKDIR /src
 COPY *.sln .
+COPY Directory.Build.props .
 COPY api/*.csproj api/
 COPY entities/*.csproj entities/
 COPY tests/core/*.csproj tests/core/
@@ -16,7 +17,6 @@ COPY dal/*.csproj dal/
 COPY dal.keycloak/*.csproj dal.keycloak/
 COPY keycloak/*.csproj keycloak/
 COPY geocoder/*.csproj geocoder/
-COPY ches/*.csproj ches/
 COPY core/*.csproj core/
 
 RUN dotnet restore

backend/Dockerfile.ocp

@@ -7,6 +7,7 @@ EXPOSE 443 8080
 FROM image-registry.apps.silver.devops.gov.bc.ca/3cd915-tools/dotnet-sdk:5.0 AS build
 WORKDIR /src
 COPY *.sln .
+COPY Directory.Build.props .
 COPY api/*.csproj api/
 COPY entities/*.csproj entities/
 COPY tests/core/*.csproj tests/core/
@@ -16,7 +17,6 @@ COPY dal/*.csproj dal/
 COPY dal.keycloak/*.csproj dal.keycloak/
 COPY keycloak/*.csproj keycloak/
 COPY geocoder/*.csproj geocoder/
-COPY ches/*.csproj ches/
 COPY core/*.csproj core/
 COPY ltsa/*.csproj ltsa/
 

backend/Pims.sln

@@ -56,8 +56,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pims.Core.Test", "tests\cor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pims.Geocoder", "geocoder\Pims.Geocoder.csproj", "{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pims.Ches", "ches\Pims.Ches.csproj", "{08A82D74-0854-498F-9C74-E0A7242FE430}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pims.Ltsa", "ltsa\Pims.Ltsa.csproj", "{1ED5DF03-7784-44EC-B02B-516167210CCF}"
 EndProject
 Global
@@ -190,18 +188,6 @@ Global
 		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Release|x64.Build.0 = Release|Any CPU
 		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Release|x86.ActiveCfg = Release|Any CPU
 		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC}.Release|x86.Build.0 = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|x64.Build.0 = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Debug|x86.Build.0 = Debug|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|x64.ActiveCfg = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|x64.Build.0 = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|x86.ActiveCfg = Release|Any CPU
-		{08A82D74-0854-498F-9C74-E0A7242FE430}.Release|x86.Build.0 = Release|Any CPU
 		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1ED5DF03-7784-44EC-B02B-516167210CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -230,7 +216,6 @@ Global
 		{04780892-FC30-4B6B-A10C-5795C657E574} = {F256F2A5-0DBF-4137-A7D6-21F08111BD4A}
 		{5A83C636-741A-4795-8588-70F033E79B5A} = {04780892-FC30-4B6B-A10C-5795C657E574}
 		{BF7450E8-B3C5-46FB-BEC1-C5FC1C5964DC} = {5237F8A4-67F5-4751-B8B2-B93A06791480}
-		{08A82D74-0854-498F-9C74-E0A7242FE430} = {5237F8A4-67F5-4751-B8B2-B93A06791480}
 		{1ED5DF03-7784-44EC-B02B-516167210CCF} = {5237F8A4-67F5-4751-B8B2-B93A06791480}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

backend/api/Areas/Admin/Controllers/RoleController.cs

@@ -1,12 +1,11 @@
+using System;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Pims.Api.Policies;
 using Pims.Dal;
 using Pims.Dal.Entities;
 using Pims.Dal.Security;
 using Swashbuckle.AspNetCore.Annotations;
-using System;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Admin.Models.Role;
 
@@ -24,7 +23,6 @@ namespace Pims.Api.Areas.Admin.Controllers
     public class RoleController : ControllerBase
     {
         #region Variables
-        private readonly ILogger<RoleController> _logger;
         private readonly IPimsService _pimsService;
         private readonly IMapper _mapper;
         #endregion
@@ -33,12 +31,10 @@ public class RoleController : ControllerBase
         /// <summary>
         /// Creates a new instance of a RoleController class, initializes it with the specified arguments.
         /// </summary>
-        /// <param name="logger"></param>
         /// <param name="pimsService"></param>
         /// <param name="mapper"></param>
-        public RoleController(ILogger<RoleController> logger, IPimsService pimsService, IMapper mapper)
+        public RoleController(IPimsService pimsService, IMapper mapper)
         {
-            _logger = logger;
             _pimsService = pimsService;
             _mapper = mapper;
         }

backend/api/Areas/Admin/Models/AccessRequest/AccessRequestModel.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Pims.Api.Areas.Admin.Models.AccessRequest
 {
     public class AccessRequestModel : Api.Models.BaseAppModel

backend/api/Areas/Keycloak/Models/AccessRequest/AccessRequestModel.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Pims.Api.Areas.Keycloak.Models.AccessRequest
 {
     public class AccessRequestModel : Api.Models.BaseAppModel

backend/api/Areas/Leases/Controllers/SearchController.cs

@@ -12,7 +12,6 @@
 using Swashbuckle.AspNetCore.Annotations;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Pims.Api.Areas.Lease.Controllers
 {
@@ -55,7 +54,7 @@ public SearchController(IPimsService pimsService, IMapper mapper)
         [HttpGet]
         [HasPermission(Permissions.PropertyView)]
         [Produces("application/json")]
-        [ProducesResponseType(typeof(IEnumerable< LeaseModel>), 200)]
+        [ProducesResponseType(typeof(IEnumerable<LeaseModel>), 200)]
         [ProducesResponseType(typeof(Api.Models.ErrorResponseModel), 400)]
         [SwaggerOperation(Tags = new[] { "lease" })]
         public IActionResult GetLeases()

backend/api/Areas/Leases/Mapping/Lease/LeaseMap.cs

@@ -1,8 +1,8 @@
 using Mapster;
 using Pims.Dal.Helpers.Extensions;
-using System.Linq;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Lease.Models.Lease;
+using System.Linq;
 
 namespace Pims.Api.Areas.Lease.Mapping.Lease
 {
@@ -30,8 +30,8 @@ public void Register(TypeAdapterConfig config)
                 .Map(dest => dest.Note, src => src.Note)
                 .Map(dest => dest.Description, src => src.Description)
                 .Map(dest => dest.Persons, src => src.Persons)
-                .Map(dest => dest.Organizations, src => src.Organizations);
-
+                .Map(dest => dest.Organizations, src => src.Organizations)
+                .Map(dest => dest.TenantNotes, src => src.TenantsManyToMany.Select(t => t.Note));
         }
     }
 }

backend/api/Areas/Leases/Mapping/Lease/OrganizationMap.cs

@@ -1,7 +1,6 @@
 using Mapster;
 using Pims.Dal.Entities.Helpers;
 using Pims.Dal.Helpers.Extensions;
-using System.Linq;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Lease.Models.Lease;
 
@@ -19,7 +18,7 @@ public void Register(TypeAdapterConfig config)
                 .Map(dest => dest.Landline, src => src.GetLandlinePhoneNumber())
                 .Map(dest => dest.Mobile, src => src.GetMobilePhoneNumber())
                 .Map(dest => dest.Email, src => src.GetEmail());
-                
+
         }
     }
 }

backend/api/Areas/Leases/Mapping/Lease/PersonMap.cs

@@ -1,7 +1,6 @@
 using Mapster;
 using Pims.Dal.Entities;
 using Pims.Dal.Helpers.Extensions;
-using System.Linq;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Lease.Models.Lease;
 

backend/api/Areas/Leases/Mapping/Lease/PropertyMap.cs

@@ -1,6 +1,4 @@
 using Mapster;
-using Pims.Dal.Helpers.Extensions;
-using System.Linq;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Lease.Models.Lease;
 

backend/api/Areas/Leases/Mapping/Search/LeaseMap.cs

@@ -1,6 +1,5 @@
 using Mapster;
 using Pims.Dal.Helpers.Extensions;
-using System.Linq;
 using Entity = Pims.Dal.Entities;
 using Model = Pims.Api.Areas.Lease.Models.Search;
 

backend/api/Areas/Leases/Models/Lease/AddressModel.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 namespace Pims.Api.Areas.Lease.Models.Lease
 {
     public class AddressModel