OC-1103: PDF generation not happening automatically

api/docker-compose.yml

@@ -107,7 +107,7 @@ services:
             - VALIDATION_CODE_EXPIRY=10
             - VALIDATION_CODE_ATTEMPTS=3
             - DATABASE_URL=postgresql://mydbuser:mydbpwd@api-test-db:5432/postgres?schema=public
-            - QUEUE_URL=http://localhost:4566/000000000000/science-octopus-pdf-queue-local
+            - QUEUE_URL=http://localhost:4566/000000000000/pdf-generation-queue-local-octopus
             - SQS_ENDPOINT=http://localstack:4566
             - LIST_USERS_API_KEY=123456789
             - TRIGGER_SCRIPT_API_KEY=123456789

api/prisma/seed.ts

@@ -119,7 +119,7 @@ export const initialDevSeed = async (): Promise<void> => {
 
         // Create local PDF generation queue
         try {
-            await sqs.getQueue(`science-octopus-pdf-queue-${process.env.STAGE}`);
+            await sqs.getQueue(`pdf-generation-queue-${process.env.STAGE}-octopus`);
             console.log('PDF queue already exists');
         } catch (err) {
             await sqs.createQueue();

api/serverless-config-deploy.yml

@@ -3,4 +3,4 @@ functions:
     generatePDFsFromQueue:
         handler: dist/src/components/sqs/handler.generatePDFs
         events:
-            - sqs: 'arn:aws:sqs:${aws:region}:${aws:accountId}:science-octopus-pdf-queue-${self:provider.stage}'
+            - sqs: 'arn:aws:sqs:${aws:region}:${aws:accountId}:pdf-generation-queue-${self:provider.stage}-octopus'

api/serverless.yml

@@ -81,7 +81,7 @@ provider:
           Resource: 'arn:aws:s3:::science-octopus-publishing-sitemaps-${self:provider.stage}'
           Action: 's3:ListBucket'
         - Effect: 'Allow'
-          Resource: 'arn:aws:sqs:${aws:region}:${aws:accountId}:science-octopus-pdf-queue-${self:provider.stage}'
+          Resource: 'arn:aws:sqs:${aws:region}:${aws:accountId}:pdf-generation-queue-${self:provider.stage}-octopus'
           Action:
               - 'lambda:CreateEventSourceMapping'
               - 'lambda:ListEventSourceMappings'

api/src/lib/sqs.ts

@@ -22,7 +22,7 @@ const sqs = new SQS(config);
 export const createQueue = async (): Promise<AWS_SQS.CreateQueueResult> => {
     // create SQS locally for PDF message queue
     return sqs.createQueue({
-        QueueName: `science-octopus-pdf-queue-${process.env.STAGE}`,
+        QueueName: `pdf-generation-queue-${process.env.STAGE}-octopus`,
         Attributes: {
             DelaySeconds: '60',
             MessageRetentionPeriod: '86400'