From 174692c99fcf80b9dcf4065a65247b3f0b1a3e24 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Mon, 29 Jan 2024 18:05:53 +0100
Subject: [PATCH 01/14] feat: introduce organic-keyword audit trigger

---
 src/controllers/trigger.js          |  2 ++
 src/controllers/trigger/keywords.js | 49 +++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/controllers/trigger/keywords.js

diff --git a/src/controllers/trigger.js b/src/controllers/trigger.js
index 0d42bc34e..8cdbe6791 100644
--- a/src/controllers/trigger.js
+++ b/src/controllers/trigger.js
@@ -18,6 +18,7 @@ import cwv from './trigger/cwv.js';
 import lhs from './trigger/lhs.js';
 import notfound from './trigger/notfound.js';
 import backlinks from './trigger/backlinks.js';
+import keywords from './trigger/keywords.js';
 
 const AUDITS = {
   apex,
@@ -27,6 +28,7 @@ const AUDITS = {
   lhs, // for all lhs variants
   404: notfound,
   'broken-backlinks': backlinks,
+  'organic-keywords': keywords,
 };
 
 /**
diff --git a/src/controllers/trigger/keywords.js b/src/controllers/trigger/keywords.js
new file mode 100644
index 000000000..9d13574c9
--- /dev/null
+++ b/src/controllers/trigger/keywords.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { DELIVERY_TYPES } from '@adobe/spacecat-shared-data-access/src/models/site.js';
+import { triggerFromData } from './common/trigger.js';
+import { getSlackContext } from '../../utils/slack/base.js';
+
+export const INITIAL_KEYWORDS_SLACK_MESSAGE = '*ORGANIC KEYWORDS REPORT* for the *last month* :thread:';
+
+/**
+ * Triggers audit processes for websites based on the provided URL.
+ *
+ * @param {Object} context - The context object containing dataAccess, sqs, data, and env.
+ * @returns {Response} The response object with the audit initiation message or an error message.
+ */
+export default async function trigger(context) {
+  const { log } = context;
+
+  const { type, url } = context.data;
+  const {
+    AUDIT_REPORT_SLACK_CHANNEL_ID: slackChannelId,
+    SLACK_BOT_TOKEN: token,
+  } = context.env;
+
+  const slackContext = await getSlackContext({
+    slackChannelId, url, message: INITIAL_KEYWORDS_SLACK_MESSAGE, token, log,
+  });
+
+  const auditContext = {
+    slackContext,
+  };
+
+  const config = {
+    url,
+    auditTypes: [type],
+    deliveryType: DELIVERY_TYPES.AEM_EDGE,
+  };
+
+  return triggerFromData(context, config, auditContext);
+}

From aeffc8ed243f48f783b1fa32d4decee8d85c806c Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 10:05:05 +0100
Subject: [PATCH 02/14] feat: adding tests for organic keyword trigger

---
 package-lock.json                         |  8 +-
 package.json                              |  2 +-
 test/controllers/trigger/keywords.test.js | 96 +++++++++++++++++++++++
 3 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 test/controllers/trigger/keywords.test.js

diff --git a/package-lock.json b/package-lock.json
index 4b10a9e7a..587724308 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@adobe/helix-shared-wrap": "2.0.1",
         "@adobe/helix-status": "10.0.11",
         "@adobe/helix-universal-logger": "3.0.13",
-        "@adobe/spacecat-shared-data-access": "1.11.0",
+        "@adobe/spacecat-shared-data-access": "1.13.0",
         "@adobe/spacecat-shared-http-utils": "1.1.3",
         "@adobe/spacecat-shared-rum-api-client": "1.4.1",
         "@adobe/spacecat-shared-utils": "1.7.3",
@@ -285,9 +285,9 @@
       }
     },
     "node_modules/@adobe/spacecat-shared-data-access": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.11.0.tgz",
-      "integrity": "sha512-wMFJvxpfU0Nlv1vHH0Y5qnSZ2Oc3jBGY/hgqN5WMGeiY6i7lTofVy2zUX+EKxeNZiJK80TyADI3HJjeeawXy3A==",
+      "version": "1.13.0",
+      "resolved": "https://artifactory.corp.adobe.com/artifactory/api/npm/npm-adobe-release/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.13.0.tgz",
+      "integrity": "sha512-qgQv6Alz5d2NkpL4cDmSGk88vUC/4UhvyZCXfRp+jblATww21nYjhAzq8IqwDNNJR+lSwiekh/+ifXFSbB8AhQ==",
       "dependencies": {
         "@adobe/spacecat-shared-dynamo": "1.2.5",
         "@adobe/spacecat-shared-utils": "1.2.0",
diff --git a/package.json b/package.json
index 3cd84093b..9666a38a6 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@adobe/helix-shared-wrap": "2.0.1",
     "@adobe/helix-status": "10.0.11",
     "@adobe/helix-universal-logger": "3.0.13",
-    "@adobe/spacecat-shared-data-access": "1.11.0",
+    "@adobe/spacecat-shared-data-access": "1.13.0",
     "@adobe/spacecat-shared-http-utils": "1.1.3",
     "@adobe/spacecat-shared-rum-api-client": "1.4.1",
     "@adobe/spacecat-shared-utils": "1.7.3",
diff --git a/test/controllers/trigger/keywords.test.js b/test/controllers/trigger/keywords.test.js
new file mode 100644
index 000000000..a4026d588
--- /dev/null
+++ b/test/controllers/trigger/keywords.test.js
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/* eslint-env mocha */
+
+import { createSite } from '@adobe/spacecat-shared-data-access/src/models/site.js';
+
+import { expect } from 'chai';
+import sinon from 'sinon';
+
+import nock from 'nock';
+import { getQueryParams } from '../../../src/utils/slack/base.js';
+import trigger, { INITIAL_KEYWORDS_SLACK_MESSAGE } from '../../../src/controllers/trigger/keywords.js';
+
+describe('Keywords trigger', () => {
+  let context;
+  let dataAccessMock;
+  let sqsMock;
+  let sandbox;
+  let sites;
+
+  beforeEach(() => {
+    sandbox = sinon.createSandbox();
+
+    sites = [
+      createSite({
+        id: 'id1',
+        baseURL: 'https://foo.com',
+        auditConfig: {
+          auditTypeConfigs: {
+            'organic-keywords': {
+              disabled: false,
+            },
+          },
+        },
+      }),
+      createSite({
+        id: 'id2',
+        baseURL: 'https://bar.com',
+      }),
+    ];
+
+    dataAccessMock = {
+      getSitesByDeliveryType: sandbox.stub(),
+    };
+
+    sqsMock = {
+      sendMessage: sandbox.stub().resolves(),
+    };
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  it('triggers a keyword audit', async () => {
+    context = {
+      log: console,
+      dataAccess: dataAccessMock,
+      sqs: sqsMock,
+      data: { type: 'organic-keywords', url: 'ALL' },
+      env: {
+        AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com',
+        SLACK_BOT_TOKEN: 'token',
+        AUDIT_REPORT_SLACK_CHANNEL_ID: 'channelId',
+      },
+    };
+
+    dataAccessMock.getSitesByDeliveryType.resolves(sites);
+
+    nock('https://slack.com')
+      .get('/api/chat.postMessage')
+      .query(getQueryParams('channelId', INITIAL_KEYWORDS_SLACK_MESSAGE))
+      .reply(200, {
+        ok: true,
+        channel: 'channelId',
+        ts: 'threadId',
+      });
+
+    const response = await trigger(context);
+    const result = await response.json();
+
+    expect(dataAccessMock.getSitesByDeliveryType.calledOnce).to.be.true;
+    expect(sqsMock.sendMessage.callCount).to.equal(1);
+    expect(result.message[0]).to.equal('Triggered organic-keywords audit for id1');
+  });
+});

From 3f939dfa6d7b1c623e0a40fcd5de83fd2a2c834a Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 10:11:13 +0100
Subject: [PATCH 03/14] fix: package-lock

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 78b1dac44..3ad83e656 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -286,7 +286,7 @@
     },
     "node_modules/@adobe/spacecat-shared-data-access": {
       "version": "1.13.0",
-      "resolved": "https://artifactory.corp.adobe.com/artifactory/api/npm/npm-adobe-release/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.13.0.tgz",
       "integrity": "sha512-qgQv6Alz5d2NkpL4cDmSGk88vUC/4UhvyZCXfRp+jblATww21nYjhAzq8IqwDNNJR+lSwiekh/+ifXFSbB8AhQ==",
       "dependencies": {
         "@adobe/spacecat-shared-dynamo": "1.2.5",

From bb3828d48d0cfe3d5eecc55b4b9e335fdd700535 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 14:52:30 +0100
Subject: [PATCH 04/14] test: loggin audit status

---
 src/controllers/trigger/common/trigger.js | 1 +
 src/controllers/trigger/keywords.js       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index c090fb0d0..27816bf70 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -62,6 +62,7 @@ export async function triggerFromData(context, config, auditContext = {}) {
     for (const auditType of auditTypes) {
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
+        config.log?.info(`AUTID is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
         return !auditConfig.getAuditTypeConfig(auditType)?.disabled();
       });
 
diff --git a/src/controllers/trigger/keywords.js b/src/controllers/trigger/keywords.js
index 9d13574c9..3a32367da 100644
--- a/src/controllers/trigger/keywords.js
+++ b/src/controllers/trigger/keywords.js
@@ -41,6 +41,7 @@ export default async function trigger(context) {
 
   const config = {
     url,
+    log,
     auditTypes: [type],
     deliveryType: DELIVERY_TYPES.AEM_EDGE,
   };

From 9bdd03360efb59631950bce21c7252d8b30662ea Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 14:59:00 +0100
Subject: [PATCH 05/14] test: adding logs

---
 src/controllers/trigger/common/trigger.js | 5 ++++-
 src/support/utils.js                      | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index 27816bf70..cf23bb1bf 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -62,10 +62,12 @@ export async function triggerFromData(context, config, auditContext = {}) {
     for (const auditType of auditTypes) {
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
-        config.log?.info(`AUTID is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
+        config.log?.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
         return !auditConfig.getAuditTypeConfig(auditType)?.disabled();
       });
 
+      config.log?.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
+
       if (!sitesToAuditForType.length) {
         message.push(`No site is enabled for ${auditType} audit type`);
       } else {
@@ -77,6 +79,7 @@ export async function triggerFromData(context, config, auditContext = {}) {
             auditType,
             auditContext,
             sitesToAuditForType.map((site) => site.getId()),
+            config.log,
           ),
         );
       }
diff --git a/src/support/utils.js b/src/support/utils.js
index 7986cb0ce..9fcd3e235 100644
--- a/src/support/utils.js
+++ b/src/support/utils.js
@@ -64,8 +64,10 @@ export const sendAuditMessages = async (
   type,
   auditContext,
   siteIDsToAudit,
+  log,
 ) => {
   for (const siteId of siteIDsToAudit) {
+    log?.info(`Triggered ${type} audit for ${siteIDsToAudit.length > 1 ? `all ${siteIDsToAudit.length} sites` : siteIDsToAudit[0]}`);
     // eslint-disable-next-line no-await-in-loop
     await sendAuditMessage(sqs, queueUrl, type, auditContext, siteId);
   }

From da45903aff56e32e1417bd7869910e4b81eee367 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:00:35 +0100
Subject: [PATCH 06/14] test: tmp reduce coverage

---
 .nycrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nycrc.json b/.nycrc.json
index f6bb44c26..6fdc389ba 100644
--- a/.nycrc.json
+++ b/.nycrc.json
@@ -5,6 +5,6 @@
   ],
   "check-coverage": true,
   "lines": 100,
-  "branches": 100,
+  "branches": 90,
   "statements": 100
 }

From b43f945da14def4ff130dcf25f9ded8e2fbe9379 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:13:12 +0100
Subject: [PATCH 07/14] test: adding logs

---
 src/controllers/trigger/common/trigger.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index cf23bb1bf..299b5fd7d 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -59,7 +59,9 @@ export async function triggerFromData(context, config, auditContext = {}) {
 
     const message = [];
 
+    config.log?.info(`AUDIT is ${!auditTypes.length} for ${url}`);
     for (const auditType of auditTypes) {
+      config.log?.info(`AUDIT is ${!auditType} for ${url}`);
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
         config.log?.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);

From 43c47e685e06d4ca15cf9226653300522b0c4705 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:20:42 +0100
Subject: [PATCH 08/14] test: addig log

---
 src/controllers/trigger.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/controllers/trigger.js b/src/controllers/trigger.js
index 8cdbe6791..8a5300e65 100644
--- a/src/controllers/trigger.js
+++ b/src/controllers/trigger.js
@@ -40,6 +40,8 @@ export default async function triggerHandler(context) {
   const { log, data } = context;
   const { type, url } = data;
 
+  log.info(`AUDIT TRIGGERED ${type} ${url}}`);
+
   if (!hasText(type) || !hasText(url)) {
     return badRequest('required query params missing');
   }

From 7cf7434ef3a5ceec941bc119664f6e6417be6a31 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:32:08 +0100
Subject: [PATCH 09/14] fix: adding catch statement for slack post

---
 src/controllers/trigger/keywords.js       | 38 +++++++++++++----------
 test/controllers/trigger/keywords.test.js | 11 +++++++
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/controllers/trigger/keywords.js b/src/controllers/trigger/keywords.js
index 3a32367da..14a0e0b88 100644
--- a/src/controllers/trigger/keywords.js
+++ b/src/controllers/trigger/keywords.js
@@ -11,6 +11,7 @@
  */
 
 import { DELIVERY_TYPES } from '@adobe/spacecat-shared-data-access/src/models/site.js';
+import { internalServerError } from '@adobe/spacecat-shared-http-utils';
 import { triggerFromData } from './common/trigger.js';
 import { getSlackContext } from '../../utils/slack/base.js';
 
@@ -31,20 +32,25 @@ export default async function trigger(context) {
     SLACK_BOT_TOKEN: token,
   } = context.env;
 
-  const slackContext = await getSlackContext({
-    slackChannelId, url, message: INITIAL_KEYWORDS_SLACK_MESSAGE, token, log,
-  });
-
-  const auditContext = {
-    slackContext,
-  };
-
-  const config = {
-    url,
-    log,
-    auditTypes: [type],
-    deliveryType: DELIVERY_TYPES.AEM_EDGE,
-  };
-
-  return triggerFromData(context, config, auditContext);
+  try {
+    const slackContext = await getSlackContext({
+      slackChannelId, url, message: INITIAL_KEYWORDS_SLACK_MESSAGE, token, log,
+    });
+
+    const auditContext = {
+      slackContext,
+    };
+
+    const config = {
+      url,
+      log,
+      auditTypes: [type],
+      deliveryType: DELIVERY_TYPES.AEM_EDGE,
+    };
+
+    return triggerFromData(context, config, auditContext);
+  } catch (e) {
+    log.error(`Failed to trigger ${type} audit for ${url}`, e);
+    return internalServerError();
+  }
 }
diff --git a/test/controllers/trigger/keywords.test.js b/test/controllers/trigger/keywords.test.js
index a4026d588..3a3a09035 100644
--- a/test/controllers/trigger/keywords.test.js
+++ b/test/controllers/trigger/keywords.test.js
@@ -93,4 +93,15 @@ describe('Keywords trigger', () => {
     expect(sqsMock.sendMessage.callCount).to.equal(1);
     expect(result.message[0]).to.equal('Triggered organic-keywords audit for id1');
   });
+
+  it('throws an error if slack post message fails', async () => {
+    nock('https://slack.com')
+      .get('/api/chat.postMessage')
+      .query(getQueryParams('channelId', INITIAL_KEYWORDS_SLACK_MESSAGE))
+      .replyWithError('Slack post message API request failed');
+
+    const response = await trigger(context);
+
+    expect(response.status).to.equal(500);
+  });
 });

From 84e11a47f132471a20b20b8db18401c65f8fcb8c Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:38:29 +0100
Subject: [PATCH 10/14] fix: move log

---
 src/controllers/trigger/common/trigger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index 299b5fd7d..b86648867 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -53,13 +53,13 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const { url, auditTypes, deliveryType } = config;
 
     const sitesToAudit = await getSitesToAudit(dataAccess, url, deliveryType);
+    config.log?.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
     if (!sitesToAudit.length) {
       return notFound('Site not found');
     }
 
     const message = [];
 
-    config.log?.info(`AUDIT is ${!auditTypes.length} for ${url}`);
     for (const auditType of auditTypes) {
       config.log?.info(`AUDIT is ${!auditType} for ${url}`);
       const sitesToAuditForType = sitesToAudit.filter((site) => {

From 5863bdf24d536c0a8797ca13d547017bd07a9709 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:42:16 +0100
Subject: [PATCH 11/14] fix: log from context

---
 src/controllers/trigger/common/trigger.js | 10 +++++-----
 src/controllers/trigger/keywords.js       |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index b86648867..3802297cd 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -48,12 +48,12 @@ async function getSitesToAudit(dataAccess, url, deliveryType) {
  */
 export async function triggerFromData(context, config, auditContext = {}) {
   try {
-    const { dataAccess, sqs } = context;
+    const { dataAccess, sqs, log } = context;
     const { AUDIT_JOBS_QUEUE_URL: queueUrl } = context.env;
     const { url, auditTypes, deliveryType } = config;
 
     const sitesToAudit = await getSitesToAudit(dataAccess, url, deliveryType);
-    config.log?.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
+    log.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
     if (!sitesToAudit.length) {
       return notFound('Site not found');
     }
@@ -61,14 +61,14 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const message = [];
 
     for (const auditType of auditTypes) {
-      config.log?.info(`AUDIT is ${!auditType} for ${url}`);
+      log.info(`AUDIT is ${!auditType} for ${url}`);
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
-        config.log?.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
+        log.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
         return !auditConfig.getAuditTypeConfig(auditType)?.disabled();
       });
 
-      config.log?.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
+      log.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
 
       if (!sitesToAuditForType.length) {
         message.push(`No site is enabled for ${auditType} audit type`);
diff --git a/src/controllers/trigger/keywords.js b/src/controllers/trigger/keywords.js
index 14a0e0b88..0c2d1889c 100644
--- a/src/controllers/trigger/keywords.js
+++ b/src/controllers/trigger/keywords.js
@@ -43,7 +43,6 @@ export default async function trigger(context) {
 
     const config = {
       url,
-      log,
       auditTypes: [type],
       deliveryType: DELIVERY_TYPES.AEM_EDGE,
     };

From 057a7b309ccb6315ac8b0e1407c937452da1202c Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:44:02 +0100
Subject: [PATCH 12/14] fix: log tests

---
 .nycrc.json                               | 2 +-
 src/controllers/trigger/common/trigger.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.nycrc.json b/.nycrc.json
index 6fdc389ba..e20afdda0 100644
--- a/.nycrc.json
+++ b/.nycrc.json
@@ -5,6 +5,6 @@
   ],
   "check-coverage": true,
   "lines": 100,
-  "branches": 90,
+  "branches": 70,
   "statements": 100
 }
diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index 3802297cd..f88070869 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -53,7 +53,7 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const { url, auditTypes, deliveryType } = config;
 
     const sitesToAudit = await getSitesToAudit(dataAccess, url, deliveryType);
-    log.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
+    log?.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
     if (!sitesToAudit.length) {
       return notFound('Site not found');
     }
@@ -61,14 +61,14 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const message = [];
 
     for (const auditType of auditTypes) {
-      log.info(`AUDIT is ${!auditType} for ${url}`);
+      log?.info(`AUDIT is ${!auditType} for ${url}`);
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
-        log.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
+        log?.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
         return !auditConfig.getAuditTypeConfig(auditType)?.disabled();
       });
 
-      log.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
+      log?.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
 
       if (!sitesToAuditForType.length) {
         message.push(`No site is enabled for ${auditType} audit type`);

From f5f31e80be8ffc4f702ec519b17f3f7a5eadb130 Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 15:48:45 +0100
Subject: [PATCH 13/14] fix: log tests

---
 src/controllers/trigger/common/trigger.js     |  8 ++--
 .../trigger/common/trigger.test.js            | 40 +++++++++++++++++++
 test/controllers/trigger/lhs.test.js          | 10 +++++
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/controllers/trigger/common/trigger.js b/src/controllers/trigger/common/trigger.js
index f88070869..3802297cd 100644
--- a/src/controllers/trigger/common/trigger.js
+++ b/src/controllers/trigger/common/trigger.js
@@ -53,7 +53,7 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const { url, auditTypes, deliveryType } = config;
 
     const sitesToAudit = await getSitesToAudit(dataAccess, url, deliveryType);
-    log?.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
+    log.info(`AUDIT is ${!sitesToAudit.length} for ${url}`);
     if (!sitesToAudit.length) {
       return notFound('Site not found');
     }
@@ -61,14 +61,14 @@ export async function triggerFromData(context, config, auditContext = {}) {
     const message = [];
 
     for (const auditType of auditTypes) {
-      log?.info(`AUDIT is ${!auditType} for ${url}`);
+      log.info(`AUDIT is ${!auditType} for ${url}`);
       const sitesToAuditForType = sitesToAudit.filter((site) => {
         const auditConfig = site.getAuditConfig();
-        log?.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
+        log.info(`AUDIT is ${!auditConfig.getAuditTypeConfig(auditType)?.disabled()} for ${site.getId()}`);
         return !auditConfig.getAuditTypeConfig(auditType)?.disabled();
       });
 
-      log?.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
+      log.info(`AUDIT is ${!sitesToAuditForType.length} for ${auditType}`);
 
       if (!sitesToAuditForType.length) {
         message.push(`No site is enabled for ${auditType} audit type`);
diff --git a/test/controllers/trigger/common/trigger.test.js b/test/controllers/trigger/common/trigger.test.js
index ebe2260a6..cc93f13cb 100644
--- a/test/controllers/trigger/common/trigger.test.js
+++ b/test/controllers/trigger/common/trigger.test.js
@@ -64,6 +64,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'ALL' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -88,6 +93,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'ALL' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -112,6 +122,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'lhs', url: 'ALL' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -138,6 +153,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'http://site1.com' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -162,6 +182,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'https://example.com' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -185,6 +210,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'all' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -220,6 +250,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'all' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
@@ -251,6 +286,11 @@ describe('Trigger from data access', () => {
       sqs: sqsMock,
       data: { type: 'auditType', url: 'all' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     const config = {
diff --git a/test/controllers/trigger/lhs.test.js b/test/controllers/trigger/lhs.test.js
index b49c900ed..3d3503581 100644
--- a/test/controllers/trigger/lhs.test.js
+++ b/test/controllers/trigger/lhs.test.js
@@ -63,6 +63,11 @@ describe('LHS Trigger', () => {
       sqs: sqsMock,
       data: { type: 'lhs-mobile', url: 'ALL' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     dataAccessMock.getSites.resolves(sites);
@@ -81,6 +86,11 @@ describe('LHS Trigger', () => {
       sqs: sqsMock,
       data: { type: 'lhs', url: 'ALL' },
       env: { AUDIT_JOBS_QUEUE_URL: 'http://sqs-queue-url.com' },
+      log: {
+        info: sandbox.spy(),
+        warn: sandbox.spy(),
+        error: sandbox.spy(),
+      },
     };
 
     dataAccessMock.getSites.resolves(sites);

From db955edc0f928eb72b8e36292c29d162c3424a2b Mon Sep 17 00:00:00 2001
From: Damian Zehnder <zehnder@adobe.com>
Date: Tue, 30 Jan 2024 17:08:32 +0100
Subject: [PATCH 14/14] chore: update spacecat shared

---
 package-lock.json          | 8 ++++----
 package.json               | 2 +-
 src/controllers/trigger.js | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a9a35c554..863ae8c1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@adobe/helix-shared-wrap": "2.0.1",
         "@adobe/helix-status": "10.0.11",
         "@adobe/helix-universal-logger": "3.0.13",
-        "@adobe/spacecat-shared-data-access": "1.13.1",
+        "@adobe/spacecat-shared-data-access": "1.13.2",
         "@adobe/spacecat-shared-http-utils": "1.1.3",
         "@adobe/spacecat-shared-rum-api-client": "1.4.3",
         "@adobe/spacecat-shared-utils": "1.7.3",
@@ -285,9 +285,9 @@
       }
     },
     "node_modules/@adobe/spacecat-shared-data-access": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.13.1.tgz",
-      "integrity": "sha512-3hmnwCWaYirID3Z1Fw67CER/WVRCuv5y7QyIu3PxWtPCtAXA+YxmWqqyfcTmeh5dlzHQGCuPKEk3L9d3JYbTOQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@adobe/spacecat-shared-data-access/-/spacecat-shared-data-access-1.13.2.tgz",
+      "integrity": "sha512-rf1cRgQDQdL6tV2NAq39GdHw1nuKvCNcYg59RpNrY3jOKyV+xcWDj3gojBcAMoclqvouIfDdLlNUIAPwXxTg9w==",
       "dependencies": {
         "@adobe/spacecat-shared-dynamo": "1.2.5",
         "@adobe/spacecat-shared-utils": "1.2.0",
diff --git a/package.json b/package.json
index a187537d6..8ed4972c4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@adobe/helix-shared-wrap": "2.0.1",
     "@adobe/helix-status": "10.0.11",
     "@adobe/helix-universal-logger": "3.0.13",
-    "@adobe/spacecat-shared-data-access": "1.13.1",
+    "@adobe/spacecat-shared-data-access": "1.13.2",
     "@adobe/spacecat-shared-http-utils": "1.1.3",
     "@adobe/spacecat-shared-rum-api-client": "1.4.3",
     "@adobe/spacecat-shared-utils": "1.7.3",
diff --git a/src/controllers/trigger.js b/src/controllers/trigger.js
index 8a5300e65..3b35ffda4 100644
--- a/src/controllers/trigger.js
+++ b/src/controllers/trigger.js
@@ -40,7 +40,7 @@ export default async function triggerHandler(context) {
   const { log, data } = context;
   const { type, url } = data;
 
-  log.info(`AUDIT TRIGGERED ${type} ${url}}`);
+  log.info(`AUDIT TRIGGERED ${type} ${url}`);
 
   if (!hasText(type) || !hasText(url)) {
     return badRequest('required query params missing');