@squiz/db-lib 1.66.2 → 1.67.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/db-lib",
-  "version": "1.66.2",
+  "version": "1.67.0",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -20,6 +20,8 @@
     "@types/jest": "28.1.8",
     "@types/node": "20.12.4",
     "@types/pg": "8.6.6",
+    "aws-sdk-client-mock": "^4.0.0",
+    "aws-sdk-client-mock-jest": "4.0.0",
     "eslint": "8.33.0",
     "fs-extra": "11.1.0",
     "jest": "29.4.1",
@@ -27,13 +29,13 @@
     "ts-jest": "29.0.5",
     "ts-loader": "9.3.1",
     "ts-node": "10.9.2",
-    "typescript": "4.9.4",
-    "aws-sdk-client-mock": "^4.0.0",
-    "aws-sdk-client-mock-jest": "4.0.0"
+    "typescript": "4.9.4"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.632.0",
     "@aws-sdk/client-secrets-manager": "3.614.0",
-    "@squiz/dx-common-lib": "^1.66.3",
+    "@aws-sdk/lib-dynamodb": "^3.632.0",
+    "@squiz/dx-common-lib": "^1.66.4",
     "@squiz/dx-logger-lib": "^1.64.0",
     "dotenv": "16.0.3",
     "pg": "8.9.0"

package/src/dynamodb/AbstractDynamoDbRepository.spec.ts

@@ -22,7 +22,6 @@ import { MissingKeyValuesError, InvalidDbSchemaError } from '..';
 import { mockClient } from 'aws-sdk-client-mock';
 import 'aws-sdk-client-mock-jest';
 import { DynamoDB } from '@aws-sdk/client-dynamodb';
-import { DuplicateItemError } from '../error/DuplicateItemError';
 import crypto from 'crypto';
 
 const ddbClientMock = mockClient(DynamoDBDocumentClient);
@@ -167,23 +166,6 @@ describe('AbstractRepository', () => {
       await expect(repository.createItem(item)).rejects.toEqual(new Error('Invalid "data"'));
     });
 
-    it('should throw error if item already exists input', async () => {
-      ddbClientMock.on(PutCommand).rejects(
-        new ConditionalCheckFailedException({
-          $metadata: {},
-          message: 'already exists',
-        }),
-      );
-
-      const item = {
-        name: 'foo',
-        age: 99,
-        country: 'au',
-        data: {},
-      };
-      await expect(repository.createItem(item)).rejects.toEqual(new DuplicateItemError('Item already exists'));
-    });
-
     it('should throw error if excess column in input', async () => {
       const item = {
         name: 'foo',

package/src/dynamodb/AbstractDynamoDbRepository.ts

@@ -1,5 +1,3 @@
-import { ConditionalCheckFailedException } from '@aws-sdk/client-dynamodb';
-
 import {
   DynamoDBDocument,
   QueryCommandInput,
@@ -8,7 +6,7 @@ import {
   DeleteCommandInput,
 } from '@aws-sdk/lib-dynamodb';
 
-import { Transaction, DynamoDbManager, MissingKeyValuesError, DuplicateItemError, InvalidDbSchemaError } from '..';
+import { Transaction, DynamoDbManager, MissingKeyValuesError, InvalidDbSchemaError } from '..';
 
 interface Reader<T> {
   queryItems(partialItem: Partial<T>, useSortKey?: boolean, index?: keyof TableIndexes): Promise<T[]>;
@@ -214,8 +212,8 @@ export abstract class AbstractDynamoDbRepository<SHAPE extends object, DATA_CLAS
         ...updateCommandInput,
         ReturnValues: 'ALL_NEW',
       });
-    } catch (e) {
-      if (e instanceof ConditionalCheckFailedException) {
+    } catch (e: any) {
+      if (e && e.name === 'ConditionalCheckFailedException') {
         return undefined;
       }
       throw e;
@@ -275,14 +273,8 @@ export abstract class AbstractDynamoDbRepository<SHAPE extends object, DATA_CLAS
       return value;
     }
 
-    try {
-      await this.client.put(putCommandInput);
-    } catch (e) {
-      if (e instanceof ConditionalCheckFailedException) {
-        throw new DuplicateItemError(`Item already exists`);
-      }
-      throw e;
-    }
+    await this.client.put(putCommandInput);
+
     return value;
   }
 
@@ -315,8 +307,8 @@ export abstract class AbstractDynamoDbRepository<SHAPE extends object, DATA_CLAS
 
     try {
       await this.client.delete(deleteCommandInput);
-    } catch (e) {
-      if (e instanceof ConditionalCheckFailedException) {
+    } catch (e: any) {
+      if (e && e.name === 'ConditionalCheckFailedException') {
         return 0;
       }
       throw e;