Push dev branch to test - v4.0.0-59.33

.github/workflows/integration-test.yml

@@ -0,0 +1,54 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: smoke test (.NET)
+env:
+  baseUrl: ${{ vars.BASE_URL }}
+  CloseBrowserAfterEachTest: false
+  RunHeadless: true
+  Users__0__User: ${{ secrets.USER_1_USERNAME }}
+  Users__0__Password: ${{ secrets.USER_1_PASSWORD }}
+  Users__1__User: ${{ secrets.USER_2_USERNAME }}
+  Users__1__Password: ${{ secrets.USER_2_PASSWORD }}
+on:
+  workflow_dispatch
+  #push:
+  #  branches: [master, dev, test]
+  #pull_request:
+  #  branches: [master, dev, test]
+
+jobs:
+  smoke-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 6.0.x
+
+      #- name: Installing Edge Browser (alternative step)
+      #  run: |
+      #    wget -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | sudo tee /usr/share/keyrings/microsoft.gpg
+      #    sudo sh -c 'echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/edge stable main" > /etc/apt/sources.list.d/microsoft-edge.list'
+      #    sudo apt update
+      #    sudo apt install -y microsoft-edge-stable
+
+      - name: Install Chrome Browser
+        run: |
+          sudo apt update
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          sudo apt install -y ./google-chrome-stable_current_amd64.deb
+
+      # Edge Browser setup - missing dependencies
+      #- uses: browser-actions/setup-edge@v1
+      #- name: Print Edge version
+      #  run: (Get-Item (Get-Command msedge).Source).VersionInfo.ProductVersion
+
+      - name: Restore dependencies
+        run: dotnet restore ./testing/PIMS.Tests.Automation/PIMS.Tests.Automation.sln
+      - name: Build
+        run: dotnet build ./testing/PIMS.Tests.Automation/PIMS.Tests.Automation.sln --no-restore
+      - name: Test
+        run: dotnet test ./testing/PIMS.Tests.Automation/PIMS.Tests.Automation.csproj --no-build --verbosity normal --filter Category=Smoke-Test

.github/workflows/retag-dev-to-test.yml

@@ -0,0 +1,78 @@
+name: CI-CD Release Dev to Test
+env:
+  OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
+  # service account: gitaction
+  OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
+  OPENSHIFT_TOOLS_NAMESPACE: "3cd915-tools"
+  MS_TEAMS_WEBHOOK_BUILD_CHANNEL: ${{ secrets.MS_TEAMS_WEBHOOK_URI_BUILD_CHANNEL }}
+
+  ## variables for scripts under git\openshift\4.0\scripts\oc-*.sh
+  APP_PORT: 8080
+  DESTINATION: "test"
+  OC_JOB_NAME: "test"
+  GIT_URL: "${{github.server_url}}/${{github.repository}}"
+  GIT_BRANCH: "${{github.ref}}"
+  APP_NAME: "pims"
+  PROJ_PREFIX: "3cd915"
+  PROJ_TOOLS: "3cd915-tools"
+  PROJ_DEV: "dev"
+  PROJ_TEST: "test"
+  PROJ_PROD: "prod"
+  TAG_DEV: "dev"
+  TAG_TEST: "test"
+  TAG_PROD: "prod"
+  INSTANCE: "-test"
+  NAMESPACE_OVERRIDE: "3cd915-dev"
+  RELEASE_TAG: "dev"
+
+on: workflow_dispatch
+
+jobs:
+  ci-cd-start-notification:
+    name: CI-CD Start Notification to Teams Channel
+    runs-on: ubuntu-latest
+    steps:
+      - name: Start notification to Teams Channel
+        uses: dragos-cojocari/ms-teams-notification@v1.0.2
+        with:
+          github-token: ${{ github.token }}
+          ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
+          notification-summary: PIMS Release DEV to TST Started
+          notification-color: 17a2b8
+          timezone: America/Los_Angeles
+
+  deploy:
+    name: Retag/Deploy frontend and api to OpenShift
+    needs: ci-cd-start-notification
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v3
+      - name: Login to OpenShift
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ env.OPENSHIFT_SERVER }}
+          openshift_token: ${{ env.OPENSHIFT_TOKEN }}
+          insecure_skip_tls_verify: true
+          namespace: ${{ env.OPENSHIFT_TOOLS_NAMESPACE }}
+      - name: call scripts to deploy api and frontend
+        run: |
+          ./openshift/4.0/player.sh deploy api $DESTINATION -apply
+          ./openshift/4.0/player.sh deploy app $DESTINATION -apply
+
+  ci-cd-end-notification:
+    name: CI-CD End Notification to Teams Channel
+    runs-on: ubuntu-latest
+    needs: deploy
+    steps:
+      - name: check workflow status
+        uses: martialonline/workflow-status@v4
+        id: check
+      - name: End notification to Teams Channel
+        uses: dragos-cojocari/ms-teams-notification@v1.0.2
+        with:
+          github-token: ${{ github.token }}
+          ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
+          notification-summary: PIMS Release DEV to TEST COMPLETED with status ${{ steps.check.outputs.status }}
+          notification-color: 17a2b8
+          timezone: America/Los_Angeles

source/backend/api/Areas/Acquisition/Controllers/AcquisitionFileController.cs

@@ -135,6 +135,8 @@ public IActionResult UpdateAcquisitionFile(long id, [FromBody] AcquisitionFileMo
             return new JsonResult(_mapper.Map<AcquisitionFileModel>(acquisitionFile));
         }
 
+
+
         /// <summary>
         /// Update the acquisition file properties.
         /// </summary>
@@ -183,38 +185,6 @@ public IActionResult GetAcquisitionFileOwners([FromRoute] long id)
             return new JsonResult(_mapper.Map<IEnumerable<AcquisitionFileOwnerModel>>(owners));
         }
 
-        /*/// <summary>
-        /// Get the acquisition file Owner representatives.
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("{id:long}/owner-representatives")]
-        [HasPermission(Permissions.AcquisitionFileView)]
-        [Produces("application/json")]
-        [ProducesResponseType(typeof(IEnumerable<AcquisitionFileOwnerRepresentativeModel>), 200)]
-        [SwaggerOperation(Tags = new[] { "acquisitionfile" })]
-        public IActionResult GetAcquisitionFileOwnerRepresentatives([FromRoute] long id)
-        {
-            var owners = _acquisitionService.GetOwnerRepresentatives(id);
-
-            return new JsonResult(_mapper.Map<IEnumerable<AcquisitionFileOwnerRepresentativeModel>>(owners));
-        }
-
-        /// <summary>
-        /// Get the acquisition file Owner solicitors.
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet("{id:long}/owner-solicitors")]
-        [HasPermission(Permissions.AcquisitionFileView)]
-        [Produces("application/json")]
-        [ProducesResponseType(typeof(IEnumerable<AcquisitionFileOwnerSolicitorModel>), 200)]
-        [SwaggerOperation(Tags = new[] { "acquisitionfile" })]
-        public IActionResult GetAcquisitionFileOwnerSolicitors([FromRoute] long id)
-        {
-            var owners = _acquisitionService.GetOwnerSolicitors(id);
-
-            return new JsonResult(_mapper.Map<IEnumerable<AcquisitionFileOwnerSolicitorModel>>(owners));
-        }*/
-
         /// <summary>
         /// Get all the compensations corresponding to the passed file id.
         /// </summary>

source/backend/api/Areas/Contacts/Controllers/ContactController.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Pims.Api.Policies;
+using Pims.Api.Services.Interfaces;
 using Pims.Dal.Repositories;
 using Pims.Dal.Security;
 using Swashbuckle.AspNetCore.Annotations;
@@ -21,7 +22,7 @@
     public class ContactController : ControllerBase
     {
         #region Variables
-        private readonly IContactRepository _contactRepository;
+        private readonly IContactService _contactService;
         private readonly IPersonRepository _personRepository;
         private readonly IOrganizationRepository _organizationRepository;
         private readonly IMapper _mapper;
@@ -32,18 +33,18 @@
         /// <summary>
         /// Creates a new instance of a ContactController class, initializes it with the specified arguments.
         /// </summary>
-        /// <param name="contactRepository"></param>
+        /// <param name="contactService"></param>
         /// <param name="personRepository"></param>
         /// <param name="organizationRepository"></param>
         /// <param name="mapper"></param>
         ///
         public ContactController(
-            IContactRepository contactRepository,
+            IContactService contactService,
             IPersonRepository personRepository,
             IOrganizationRepository organizationRepository,
             IMapper mapper)
         {
-            _contactRepository = contactRepository;
+            _contactService = contactService;
             _personRepository = personRepository;
             _organizationRepository = organizationRepository;
             _mapper = mapper;
@@ -63,7 +64,7 @@
         [SwaggerOperation(Tags = new[] { "contact" })]
         public IActionResult GetContact(string id)
         {
-            var contactView = _contactRepository.GetById(id);
+            var contactView = _contactService.GetById(id);
 
             if (id.StartsWith("P"))
             {