@squiz/job-runner-lib 2.3.0 → 2.5.0

package/src/domains/job/repository/JobContextRepository/JobContextRepository.ts

@@ -3,9 +3,6 @@
  * Copyright Squiz Australia Pty Ltd. All Rights Reserved.
  */
 
-import * as dotenv from 'dotenv';
-dotenv.config();
-
 import {
   AttributeValue,
   DynamoDBClient,
@@ -18,26 +15,37 @@ import {
 import { inject } from 'inversify';
 import { provideTransient } from '../../transientProvider';
 import { Repository } from '../AbstractRepository';
-import { PARTITION_KEYS } from '../../constants/Repository.constants';
+import { ENTITY_TYPES } from '../../constants/Repository.constants';
 import { parsePartitionKey } from '../../ParsePartitionKey';
-import { CreateJobContextRequest, JobContext, JobContextDto } from '../../model/JobContext/JobContext';
-import { PaginationInfo } from '../../core/pagination/model/PaginationInfo';
-import { PaginationQueryResponse } from '../../core/pagination/model/PaginationQueryResponse';
-import { decodeTokenString } from '../../core/pagination/utils/PaginationUtils';
-import { PAGINATION_DIRECTION_TYPE_BEFORE } from '../../core/pagination/model/PaginationTypes';
+import {
+  CreateJobContextRequest,
+  JobContext,
+  JobContextDto,
+  JobContextSk,
+  UpdateJobContextRequest,
+} from '../../model/JobContext';
+import {
+  decodeTokenString,
+  PAGINATION_DIRECTION_TYPE_BEFORE,
+  PaginationInfo,
+  PaginationQueryResponse,
+} from '../../core/pagination';
+import { InjectTokens } from '../../constants/InjectTokens';
 
 @provideTransient(JobContextRepository)
-export class JobContextRepository extends Repository<JobContext, JobContextDto> {
-  public constructor(@inject(DynamoDBClient) protected dynamoDbClient: DynamoDBClient) {
-    super(dynamoDbClient);
-    this.pk = PARTITION_KEYS.context;
-    this.tableName = process.env.DYNAMODB_TABLE as string;
+export class JobContextRepository extends Repository<JobContext, JobContextDto, JobContextSk> {
+  public constructor(
+    @inject(DynamoDBClient) dynamoDbClient: DynamoDBClient,
+    @inject(InjectTokens.DynamoTableName) tableName: string,
+    @inject(InjectTokens.Tenant) tenant: string,
+  ) {
+    super(dynamoDbClient, tableName, `${ENTITY_TYPES.context}~${tenant}`);
   }
 
   public async create(input: CreateJobContextRequest): Promise<JobContext> {
     const newJobContext: JobContext = {
       ...input,
-      type: this.pk,
+      type: ENTITY_TYPES.context,
     };
 
     const dynamoDbRecord = this.convertToDynamoDbItem(newJobContext);
@@ -90,12 +98,12 @@ export class JobContextRepository extends Repository<JobContext, JobContextDto>
     };
   }
 
-  async update(sk: string, input: Partial<JobContext>): Promise<JobContext | null> {
+  async update(sk: JobContextSk, input: UpdateJobContextRequest): Promise<JobContext> {
     // Initialise update command
     const updateParams: UpdateItemCommandInput = {
       Key: {
         pk: { S: this.pk },
-        sk: { S: sk },
+        sk: { S: this.buildSk(sk) },
       },
       ReturnValues: 'ALL_NEW',
       TableName: this.tableName,
@@ -129,7 +137,7 @@ export class JobContextRepository extends Repository<JobContext, JobContextDto>
     const updatedJob = await this.dynamoDbClient.send(updateItemCommand);
 
     /* istanbul ignore next */
-    return updatedJob.Attributes ? this.convertToItem(updatedJob.Attributes as JobContextDto) : null;
+    return this.convertToItem(updatedJob.Attributes as JobContextDto);
   }
 
   convertToDynamoDbItem(item: JobContext): JobContextDto {
@@ -139,8 +147,8 @@ export class JobContextRepository extends Repository<JobContext, JobContextDto>
     }
 
     return {
-      pk: { S: item.type },
-      sk: { S: item.contextName },
+      pk: { S: this.pk },
+      sk: { S: this.buildSk(item) },
       description: { S: item.description },
       environment: { M: environmentMap },
     };
@@ -160,9 +168,13 @@ export class JobContextRepository extends Repository<JobContext, JobContextDto>
 
     return {
       contextName: sk.S as string,
-      type: parsePartitionKey(pk.S as string),
+      type: parsePartitionKey(pk.S as string).entityType,
       description: description.S as string,
       environment: environmentRecord,
     };
   }
+
+  protected buildSk(sk: JobContextSk): string {
+    return sk.contextName;
+  }
 }