AMCR-309 - Enable sonar step in other workflows

.github/workflows/publish-hotfix.yml

@@ -39,8 +39,8 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-#      - name: SonarCloud Scan
-#        uses: SonarSource/sonarqube-scan-action@v5.3.1 #  (or check latest version on https://github.com/marketplace/actions/official-sonarqube-scan)
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarqube-scan-action@v5.3.1 #  (or check latest version on https://github.com/marketplace/actions/official-sonarqube-scan)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.WASTE_PACKAGING_SONAR_TOKEN }}

.github/workflows/publish.yml

@@ -38,9 +38,9 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-#      - name: SonarCloud Scan
-#        uses: SonarSource/sonarqube-scan-action@v5.3.1 #  (or check latest version on https://github.com/marketplace/actions/official-sonarqube-scan)
-#        continue-on-error: true
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarqube-scan-action@v5.3.1 #  (or check latest version on https://github.com/marketplace/actions/official-sonarqube-scan)
+        continue-on-error: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.WASTE_PACKAGING_SONAR_TOKEN }}

src/server/routes/certificatesOfCompliance/accept/controller.js

@@ -1,16 +1,18 @@
 import { config } from '#config/config.js'
+import { handleApiError } from '#server/common/helpers/handle-api-error.js'
 import {
   getCertificateOfComplianceDetailViewModel,
   getComplianceDeclarationReviewStatus,
-  canApproveComplianceDeclaration
+  canApproveComplianceDeclaration,
+  approveComplianceDeclaration,
+  certificateActionSessionKeys,
+  getDeclarationSessionKey,
+  setMockDeclarationStatusOverride
 } from '../certificates-of-compliance.service.js'
-import {
-  redirectToSignIn,
-  runApproveAction
-} from '../detail/actions-controller.js'
+import { redirectToSignIn } from '../detail/actions-controller.js'
 
 const ERROR_TEXT = 'Select yes or no'
-
+const TRACING_HEADER = 'tracing.header'
 function buildErrors() {
   return {
     summary: [{ text: ERROR_TEXT, href: '#confirm-accept' }],
@@ -24,7 +26,8 @@ function detailPath(organisationId, id) {
 
 async function renderForm(request, h, { errors = null } = {}) {
   const { organisationId, id } = request.params
-  const traceId = request.headers[config.get('tracing.header')]
+
+  const traceId = request.headers[config.get(TRACING_HEADER)]
   const { companyName, registrationType } =
     await getCertificateOfComplianceDetailViewModel(organisationId, id, {
       traceId,
@@ -46,14 +49,54 @@ async function renderForm(request, h, { errors = null } = {}) {
   })
 }
 
+// Approves the declaration and returns to the detail page with the accepted
+// banner. Idempotent: an already-approved declaration re-shows the banner, and
+// one that can no longer be approved bounces back without it.
+async function approveDeclaration(request, h) {
+  const { organisationId, id } = request.params
+  const traceId = request.headers[config.get(TRACING_HEADER)]
+  const declarationKey = getDeclarationSessionKey(organisationId, id)
+  const reviewStatus = await getComplianceDeclarationReviewStatus(
+    organisationId,
+    id,
+    traceId,
+    request.yar
+  )
+
+  if (reviewStatus === 'Approved') {
+    request.yar.set(certificateActionSessionKeys.justApproved, declarationKey)
+    return h.redirect(detailPath(organisationId, id))
+  }
+
+  if (!canApproveComplianceDeclaration(reviewStatus)) {
+    return h.redirect(detailPath(organisationId, id))
+  }
+
+  try {
+    await approveComplianceDeclaration(
+      organisationId,
+      id,
+      request.yar.get('user'),
+      traceId
+    )
+  } catch (error) {
+    handleApiError(request, error)
+  }
+
+  setMockDeclarationStatusOverride(request.yar, declarationKey, 'Approved')
+  request.yar.set(certificateActionSessionKeys.justApproved, declarationKey)
+
+  return h.redirect(detailPath(organisationId, id))
+}
+
 export const certificatesOfComplianceAcceptGetController = {
   async handler(request, h) {
     if (!request.yar.get('user')) {
       return redirectToSignIn(request, h)
     }
 
     const { organisationId, id } = request.params
-    const traceId = request.headers[config.get('tracing.header')]
+    const traceId = request.headers[config.get(TRACING_HEADER)]
     const reviewStatus = await getComplianceDeclarationReviewStatus(
       organisationId,
       id,
@@ -80,14 +123,13 @@ export const certificatesOfComplianceAcceptPostController = {
     const choice = request.payload?.['confirm-accept']
     const { organisationId, id } = request.params
 
-    if (choice !== 'yes' && choice !== 'no') {
-      return renderForm(request, h, { errors: buildErrors() })
+    switch (choice) {
+      case 'no':
+        return h.redirect(detailPath(organisationId, id))
+      case 'yes':
+        return approveDeclaration(request, h)
+      default:
+        return renderForm(request, h, { errors: buildErrors() })
     }
-
-    if (choice === 'no') {
-      return h.redirect(detailPath(organisationId, id))
-    }
-
-    return runApproveAction(request, h)
   }
 }