Skip to content

Commit 9a64894

Browse files
author
Michael Wittwer
committed
refactor(make-request): remove non-existent method
This method now executes PartiQL requests. No Replacement available. BREAKING CHANGE: Methods DynamoStore.makeRequest and DynamoDBWrapper.makeRequest are no longer available.
1 parent 01a0be7 commit 9a64894

File tree

4 files changed

+0
-62
lines changed

4 files changed

+0
-62
lines changed

src/dynamo/dynamo-db-wrapper.spec.ts

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -98,31 +98,6 @@ describe('dynamo rx', () => {
9898
})
9999
})
100100

101-
// TODO v3: remove when decision is made if DynamoDbWrapper.makeRequest comes back or not
102-
// describe('makeRequest', () => {
103-
// let dynamoDBWrapper: DynamoDbWrapper
104-
// let sessionValidityEnsurerMock: jest.Mock
105-
// let dynamoDBMock: jest.SpyInstance
106-
// let pseudoParams: any
107-
//
108-
// beforeEach(() => {
109-
// pseudoParams = { TableName: 'tableName', KeyConditionExpression: 'blub' }
110-
// sessionValidityEnsurerMock = jest.fn().mockReturnValueOnce(Promise.resolve(true))
111-
// updateDynamoEasyConfig({ sessionValidityEnsurer: sessionValidityEnsurerMock })
112-
// dynamoDBWrapper = new DynamoDbWrapper(new DynamoDB.DynamoDB({}))
113-
// })
114-
//
115-
// it('should call the validity ensurer before each call and call the correct dynamoDB method', async () => {
116-
// dynamoDBMock = jest
117-
// .spyOn(dynamoDBWrapper.dynamoDB, 'makeRequest')
118-
// .mockReturnValueOnce(<any>{ promise: () => Promise.resolve() })
119-
// await dynamoDBWrapper.makeRequest('pseudoOperation', pseudoParams)
120-
// expect(sessionValidityEnsurerMock).toHaveBeenCalled()
121-
// expect(dynamoDBMock).toHaveBeenCalledTimes(1)
122-
// expect(dynamoDBMock).toHaveBeenCalledWith('pseudoOperation', pseudoParams)
123-
// })
124-
// })
125-
126101
describe('query', () => {
127102
beforeEach(() => {})
128103
it('should throw when no KeyConditionExpression was given', () => {
@@ -131,15 +106,4 @@ describe('dynamo rx', () => {
131106
expect(() => dynamoDBWrapper.query({ TableName: 'tableName' })).toThrow()
132107
})
133108
})
134-
135-
// TODO v3: remove when decision is made if DynamoDbWrapper.makeRequest comes back or not
136-
// it('should call makeRequest with the given params', async () => {
137-
// const dynamoDBWrapper = new DynamoDbWrapper(new DynamoDB.DynamoDB({}))
138-
// const makeRequestMock = jest.fn().mockReturnValue({ promise: (args: any) => Promise.resolve(args) })
139-
// Object.assign(dynamoDBWrapper, { dynamoDB: { makeRequest: makeRequestMock } })
140-
//
141-
// await dynamoDBWrapper.makeRequest(<any>{ ok: true })
142-
// expect(makeRequestMock).toHaveBeenCalled()
143-
// expect(makeRequestMock.mock.calls.slice(-1)[0][0]).toEqual({ ok: true })
144-
// })
145109
})

src/dynamo/dynamo-db-wrapper.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,4 @@ export class DynamoDbWrapper {
5858

5959
return dynamoEasyConfig.sessionValidityEnsurer().then(() => this.dynamoDB.query(params))
6060
}
61-
62-
/*
63-
* TODO v3: check for replacement. DynamoDB.executeStatement is now used to execute statements using PartiQL
64-
*/
65-
// makeRequest(operation: string, params?: Record<string, any>): Promise<any> {
66-
// return dynamoEasyConfig.sessionValidityEnsurer().then(() => this.dynamoDB.executeStatement(operation as any, params))
67-
// }
6861
}

src/dynamo/dynamo-store.spec.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ describe('dynamo store', () => {
9090
expect(store.transactGet([{ id: 'myId' }]) instanceof TransactGetSingleTableRequest).toBeTruthy())
9191
})
9292

93-
// TODO v3: possibly remove when we decided on how to proceed with DynamoDbWrapper.makeRequest
94-
// xdescribe('should enable custom requests', () => {
95-
// const makeRequestSpy = jest.fn().mockReturnValue(Promise.resolve())
96-
// const store = new DynamoStore(SimpleWithPartitionKeyModel, dynamoDB)
97-
// Object.assign(store, { dynamoDBWrapper: { makeRequest: makeRequestSpy } })
98-
// store.makeRequest('updateTimeToLive', {})
99-
// expect(makeRequestSpy).toBeCalled()
100-
// })
101-
10293
describe('allow to get dynamoDB instance', () => {
10394
const store = new DynamoStore(SimpleWithPartitionKeyModel, new DynamoDB.DynamoDB({}))
10495
expect(store.dynamoDB).toBeDefined()

src/dynamo/dynamo-store.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,4 @@ export class DynamoStore<T> {
8080
transactGet(keys: Array<Partial<T>>): TransactGetSingleTableRequest<T> {
8181
return new TransactGetSingleTableRequest(this.dynamoDBWrapper, this.modelClazz, keys)
8282
}
83-
84-
/**
85-
* TODO v3: check for potential replacement
86-
*/
87-
// makeRequest<Z>(operation: DynamoApiOperations, params?: Record<string, any>): Promise<Z> {
88-
// this.logger.debug('request', params)
89-
// return this.dynamoDBWrapper
90-
// .makeRequest(operation, params)
91-
// .then(promiseTap((r: Z) => this.logger.debug('response', r)))
92-
// }
9383
}

0 commit comments

Comments
 (0)