address review comments

Author: tkotthakota-adobe

README.md

@@ -27,7 +27,7 @@ SpaceCat Task Processor is a Node.js service that processes messages from the AW
 1. Clone the repository
 2. Install dependencies:
    ```sh
-   npm ci
+   npm install
    ```
 3. Configure AWS credentials and environment variables as needed
 

scripts/watch-and-copy.js

@@ -15,13 +15,37 @@ import { say } from '../../utils/slack-utils.js';
 
 const TASK_TYPE = 'demo-url-processor';
 
+/**
+ * Gets the IMS tenant ID from the organization
+ * @param {object} organization - The organization object
+ * @param {object} context - The context object
+ * @param {object} log - The log object
+ * @returns {string} The IMS tenant ID
+ */
+function getImsTenantId(organization, context, log) {
+  const { name, imsOrgId } = organization;
+  try {
+    const imsOrgToTenantMapping = context.env.IMSORG_TO_TENANT;
+    if (imsOrgToTenantMapping) {
+      const mapping = JSON.parse(imsOrgToTenantMapping);
+      if (mapping[imsOrgId]) {
+        return mapping[imsOrgId];
+      }
+    }
+  } catch (error) {
+    log.error('Error loading IMSORG_TO_TENANT mapping:', error.message);
+  }
+  return name.toLowerCase().replace(/\s+/g, '');
+}
+
 /**
  * Runs the audit status processor
  * @param {object} demoUrlMessage - The demoUrlMessage object
  * @param {object} context - The context object
  */
 export async function runDemoUrlProcessor(message, context) {
-  const { log, env } = context;
+  const { log, env, dataAccess } = context;
+  const { Organization } = dataAccess;
   const { siteId, organizationId, taskContext } = message;
   const {
     siteUrl, slackContext,
@@ -34,7 +58,15 @@ export async function runDemoUrlProcessor(message, context) {
     organizationId,
   });
 
-  const demoUrl = `${siteUrl}?organizationId=${organizationId}#/@aemrefdemoshared/sites-optimizer/sites/${siteId}/home`;
+  const organization = await Organization.findById(organizationId);
+  if (!organization) {
+    log.error(`Organization not found for organizationId: ${organizationId}`);
+    await say(env, log, slackContext, `:x: Organization not found for organizationId: ${organizationId}`);
+    return ok({ message: 'Organization not found' });
+  }
+
+  const imsTenantId = getImsTenantId(organization, context, log);
+  const demoUrl = `${siteUrl}?organizationId=${organizationId}#/@${imsTenantId}/sites-optimizer/sites/${siteId}/home`;
   const slackMessage = `:white_check_mark: Setup complete! Access your demo environment here: ${demoUrl}`;
   await say(env, log, slackContext, slackMessage);
   log.info(`Setup complete! Access your demo environment here: ${demoUrl}`);

src/tasks/demo-url-processor/handler.js

@@ -62,7 +62,7 @@ export async function runOpportunityStatusProcessor(message, context) {
 
   try {
     // Get the site and its opportunities
-    const site = await Site.findByBaseURL(`https://${siteId}.com`);
+    const site = await Site.findById(siteId);
     if (!site) {
       log.error(`Site not found for siteId: ${siteId}`);
       await say(env, log, slackContext, `:x: Site not found for siteId: ${siteId}`);

src/tasks/opportunity-status-processor/handler.js

@@ -83,9 +83,28 @@ describe('Index Tests', () => {
     // Test that the handler can handle broken env gracefully
     messageBodyJson.type = 'demo-url-processor';
     messageBodyJson.siteId = 'test-site';
+    messageBodyJson.organizationId = 'test-org';
+    messageBodyJson.taskContext = {
+      siteUrl: 'https://example.com',
+      slackContext: 'test-slack-context',
+    };
     context.invocation.event.Records[0].body = JSON.stringify(messageBodyJson);
-    // Remove env to test error handling in the handler
-    context.env = null;
+
+    // Provide minimal data access and env
+    context.dataAccess = {
+      Organization: {
+        findById: sandbox.stub().resolves({
+          name: 'Test Organization',
+          imsOrgId: 'TEST_ORG_ID@AdobeOrg',
+        }),
+      },
+    };
+    context.env = {
+      IMSORG_TO_TENANT: JSON.stringify({
+        'TEST_ORG_ID@AdobeOrg': 'test-org',
+      }),
+    };
+
     const resp = await main(request, context);
     expect(resp.status).to.equal(200); // Handler should handle the error gracefully
     // Verify the task handler was found
@@ -99,7 +118,6 @@ describe('Index Tests', () => {
     expect(context.log.info.calledWith('Found task handler for type: dummy')).to.be.true;
     // Print all log.info calls for debugging
     // eslint-disable-next-line no-console
-    console.log('log.info calls:', context.log.info.getCalls().map((call) => call.args[0]));
     // Verify the task completion message (using partial match since timing varies)
     expect(context.log.info.calledWithMatch(sinon.match('dummy task for site-id completed in'))).to.be.true;
   });

test/index.test.js

@@ -37,6 +37,14 @@ describe('Demo URL Processor', () => {
     // Mock context
     context = new MockContextBuilder()
       .withSandbox(sandbox)
+      .withDataAccess({
+        Organization: {
+          findById: sandbox.stub().resolves({
+            name: 'Adobe Sites Engineering',
+            imsOrgId: '8C6043F15F43B6390A49401A@AdobeOrg',
+          }),
+        },
+      })
       .build();
 
     // Mock message
@@ -56,22 +64,92 @@ describe('Demo URL Processor', () => {
 
   describe('runDemoUrlProcessor', () => {
     it('should process demo URL successfully', async () => {
+      // Set up the IMSORG_TO_TENANT secret in context
+      context.env.IMSORG_TO_TENANT = JSON.stringify({
+        '8C6043F15F43B6390A49401A@AdobeOrg': 'aem-sites-engineering',
+      });
+
       await runDemoUrlProcessor(message, context);
       expect(context.log.info.calledWith('Processing demo url for site:', {
         taskType: 'demo-url-processor',
         siteId: 'test-site-id',
         siteUrl: 'https://example.com',
         organizationId: 'test-org-id',
       })).to.be.true;
-      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@aemrefdemoshared/sites-optimizer/sites/test-site-id/home';
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@aem-sites-engineering/sites-optimizer/sites/test-site-id/home';
       expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
     });
 
     it('should handle missing slackContext in taskContext', async () => {
+      // Set up the IMSORG_TO_TENANT secret in context
+      context.env.IMSORG_TO_TENANT = JSON.stringify({
+        '8C6043F15F43B6390A49401A@AdobeOrg': 'aem-sites-engineering',
+      });
+
       delete message.taskContext.slackContext;
       await runDemoUrlProcessor(message, context);
-      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@aemrefdemoshared/sites-optimizer/sites/test-site-id/home';
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@aem-sites-engineering/sites-optimizer/sites/test-site-id/home';
+      expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
+    });
+
+    it('should use IMSORG_TO_TENANT mapping when available', async () => {
+      // Set up the IMSORG_TO_TENANT secret in context
+      context.env.IMSORG_TO_TENANT = JSON.stringify({
+        '8C6043F15F43B6390A49401A@AdobeOrg': 'aem-sites-engineering',
+      });
+
+      await runDemoUrlProcessor(message, context);
+
+      // Should use the mapped tenant name instead of the fallback
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@aem-sites-engineering/sites-optimizer/sites/test-site-id/home';
+      expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
+    });
+
+    it('should fallback to name-based tenant when IMSORG_TO_TENANT mapping is not available', async () => {
+      // Don't set IMSORG_TO_TENANT secret
+      delete context.env.IMSORG_TO_TENANT;
+
+      await runDemoUrlProcessor(message, context);
+
+      // Should use the fallback name-based tenant (lowercase, no spaces)
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@adobesitesengineering/sites-optimizer/sites/test-site-id/home';
       expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
     });
+
+    it('should fallback to name-based tenant when IMSORG_TO_TENANT mapping is invalid JSON', async () => {
+      // Set invalid JSON in IMSORG_TO_TENANT secret
+      context.env.IMSORG_TO_TENANT = 'invalid-json';
+
+      await runDemoUrlProcessor(message, context);
+
+      // Should use the fallback name-based tenant
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@adobesitesengineering/sites-optimizer/sites/test-site-id/home';
+      expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
+    });
+
+    it('should fallback to name-based tenant when IMSORG_TO_TENANT mapping does not contain the imsOrgId', async () => {
+      // Set IMSORG_TO_TENANT secret with different mapping
+      context.env.IMSORG_TO_TENANT = JSON.stringify({
+        'DIFFERENT_ORG_ID@AdobeOrg': 'different-team',
+      });
+
+      await runDemoUrlProcessor(message, context);
+
+      // Should use the fallback name-based tenant since the imsOrgId is not in the mapping
+      const expectedDemoUrl = 'https://example.com?organizationId=test-org-id#/@adobesitesengineering/sites-optimizer/sites/test-site-id/home';
+      expect(context.log.info.calledWith(`Setup complete! Access your demo environment here: ${expectedDemoUrl}`)).to.be.true;
+    });
+
+    it('should handle organization not found error', async () => {
+      // Mock Organization.findById to return null
+      context.dataAccess.Organization.findById.resolves(null);
+
+      await runDemoUrlProcessor(message, context);
+
+      // Should log error and return early
+      expect(context.log.error.calledWith('Organization not found for organizationId: test-org-id')).to.be.true;
+      // Should not log the success message
+      expect(context.log.info.calledWithMatch(sinon.match('Setup complete!'))).to.be.false;
+    });
   });
 });

test/tasks/demo-url-processor/demo-url-processor.test.js

@@ -47,7 +47,7 @@ describe('Opportunity Status Processor', () => {
       .withSandbox(sandbox)
       .withDataAccess({
         Site: {
-          findByBaseURL: sandbox.stub().resolves(mockSite),
+          findById: sandbox.stub().resolves(mockSite),
         },
       })
       .build();
@@ -91,13 +91,13 @@ describe('Opportunity Status Processor', () => {
         auditTypes: ['cwv', 'broken-links'],
       })).to.be.true;
 
-      expect(context.dataAccess.Site.findByBaseURL.calledWith('https://test-site-id.com')).to.be.true;
+      expect(context.dataAccess.Site.findById.calledWith('test-site-id')).to.be.true;
       expect(mockSite.getOpportunities.called).to.be.true;
       expect(context.log.info.calledWith('Found 2 opportunities for site test-site-id')).to.be.true;
     });
 
     it('should handle site not found error', async () => {
-      context.dataAccess.Site.findByBaseURL.resolves(null);
+      context.dataAccess.Site.findById.resolves(null);
 
       await runOpportunityStatusProcessor(message, context);