From bde2573ba68d59b90d2c35ba0cae6bb48135017d Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sat, 27 Feb 2021 12:18:09 -0500 Subject: [PATCH 1/2] Added endpoint to allow deletes for note --- takeNotes-src/deleteNote/app.js | 74 ++++++++++++++ takeNotes-src/deleteNote/package-lock.json | 109 +++++++++++++++++++++ takeNotes-src/deleteNote/package.json | 16 +++ template.yaml | 25 +++++ 4 files changed, 224 insertions(+) create mode 100644 takeNotes-src/deleteNote/app.js create mode 100644 takeNotes-src/deleteNote/package-lock.json create mode 100644 takeNotes-src/deleteNote/package.json diff --git a/takeNotes-src/deleteNote/app.js b/takeNotes-src/deleteNote/app.js new file mode 100644 index 0000000..0c0679c --- /dev/null +++ b/takeNotes-src/deleteNote/app.js @@ -0,0 +1,74 @@ +// default imports +const AWS = require("aws-sdk"); +const DDB = new AWS.DynamoDB({ apiVersion: "2012-10-08" }); +const { v4: uuidv4 } = require("uuid"); + +// environment variables +const { TABLE_NAME, ENDPOINT_OVERRIDE, REGION } = process.env; +const options = { region: REGION }; +AWS.config.update({ region: REGION }); + +if (ENDPOINT_OVERRIDE !== "") { + options.endpoint = ENDPOINT_OVERRIDE; +} + +const docClient = new AWS.DynamoDB.DocumentClient(options); + +// response helper +const response = (statusCode, body, additionalHeaders) => ({ + statusCode, + body: JSON.stringify(body), + headers: { + "Content-Type": "application/json", + "Access-Control-Allow-Origin": "*", + ...additionalHeaders, + }, +}); + +function isValidRequest(context, event) { + let isIdValid = + event !== null && + event.pathParameters !== null && + event.pathParameters.id !== null; + + return isIdValid; +} + +function updateRecord(recordId, noteIdx) { + let d = new Date(); + console.log("record id: " + recordId + " noteIdx: " + noteIdx); + const params = { + TableName: TABLE_NAME, + Key: { + id: recordId, + }, + UpdateExpression: `SET updated = :u REMOVE docBody.notes.#noteId`, + ExpressionAttributeNames: { "#noteId": noteIdx }, + ExpressionAttributeValues: { + ":u": d.toISOString(), + }, + ConditionExpression: "attribute_exists(docBody.notes.#noteId)", + ReturnValues: "ALL_NEW", + }; + console.log("params: " + params); + return docClient.update(params); +} + +// Lambda Handler +exports.deleteNote = async (event, context, callback) => { + console.log("event: " + event); + console.log("body: " + event.body); + if (!isValidRequest(context, event)) { + return response(400, { message: "Error: Invalid request" }); + } + + try { + let data = await updateRecord( + event.pathParameters.id, + event.pathParameters.noteIdx + ).promise(); + return response(200, data); + } catch (err) { + return response(400, { message: err.message }); + } +}; diff --git a/takeNotes-src/deleteNote/package-lock.json b/takeNotes-src/deleteNote/package-lock.json new file mode 100644 index 0000000..3151d88 --- /dev/null +++ b/takeNotes-src/deleteNote/package-lock.json @@ -0,0 +1,109 @@ +{ + "name": "post", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "aws-sdk": { + "version": "2.834.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.834.0.tgz", + "integrity": "sha512-9WRULrn4qAmgXI+tEW/IG5s/6ixJGZqjPOrmJsFZQev7/WRkxAZmJAjcwd4Ifm/jsJbXx2FSwO76gOPEvu2LqA==", + "requires": { + "buffer": "4.9.2", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.15.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "uuid": "3.3.2", + "xml2js": "0.4.19" + }, + "dependencies": { + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" + } + } + }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, + "buffer": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "jmespath": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", + "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=" + }, + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" + }, + "sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" + }, + "url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + }, + "xml2js": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", + "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + } + }, + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + } + } +} diff --git a/takeNotes-src/deleteNote/package.json b/takeNotes-src/deleteNote/package.json new file mode 100644 index 0000000..9202874 --- /dev/null +++ b/takeNotes-src/deleteNote/package.json @@ -0,0 +1,16 @@ +{ + "name": "post", + "version": "1.0.0", + "description": "POST handler for TakeNotes users API", + "main": "src/app.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "style": "npx prettier --write ." + }, + "author": "", + "license": "ISC", + "dependencies": { + "aws-sdk": "^2.834.0", + "uuid": "^8.3.2" + } +} diff --git a/template.yaml b/template.yaml index 709c9ac..ef7c970 100644 --- a/template.yaml +++ b/template.yaml @@ -276,6 +276,31 @@ Resources: RestApiId: !Ref TakeNotesApi Auth: Authorizer: CognitoAuthorizer + DeleteTakeNotesUserNotes: + Type: AWS::Serverless::Function + Properties: + CodeUri: takeNotes-src/deleteNote/ + Handler: app.deleteNote + Tracing: Active + Policies: + - DynamoDBCrudPolicy: + TableName: !Ref TakeNotesTable + - CloudWatchPutMetricPolicy: {} + Environment: + Variables: + TABLE_NAME: !Ref TakeNotesTable + AWS_NODEJS_CONNECTION_REUSE_ENABLED: "1" + ENDPOINT_OVERRIDE: "" + REGION: !Ref AWS::Region + Events: + DeleteNote: + Type: Api + Properties: + Path: /users/{id}/notes/{noteIdx} + Method: DELETE + RestApiId: !Ref TakeNotesApi + Auth: + Authorizer: CognitoAuthorizer PutTakeNotesUserJournal: Type: AWS::Serverless::Function Properties: From 05dbee637d4f365180de60df0ea4dae8fa623141 Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 11 Apr 2021 13:53:24 -0400 Subject: [PATCH 2/2] added check for note id in path param for delete notes endpoint --- takeNotes-src/deleteNote/app.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/takeNotes-src/deleteNote/app.js b/takeNotes-src/deleteNote/app.js index 0c0679c..b9ab0f1 100644 --- a/takeNotes-src/deleteNote/app.js +++ b/takeNotes-src/deleteNote/app.js @@ -29,7 +29,8 @@ function isValidRequest(context, event) { let isIdValid = event !== null && event.pathParameters !== null && - event.pathParameters.id !== null; + event.pathParameters.id !== null && + event.pathParameters.noteIdx !== null; return isIdValid; }