From 1c4e10ce3e4ee5f9c73e8e995efa084cd9f29b96 Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 21 Feb 2021 14:54:18 -0500 Subject: [PATCH 1/3] Added post handler for new notes --- takeNotes-src/postNotes/.prettierignore | 106 +++++++++++++++++++++ takeNotes-src/postNotes/app.js | 80 ++++++++++++++++ takeNotes-src/postNotes/package-lock.json | 109 ++++++++++++++++++++++ takeNotes-src/postNotes/package.json | 16 ++++ template.yaml | 25 +++++ 5 files changed, 336 insertions(+) create mode 100644 takeNotes-src/postNotes/.prettierignore create mode 100644 takeNotes-src/postNotes/app.js create mode 100644 takeNotes-src/postNotes/package-lock.json create mode 100644 takeNotes-src/postNotes/package.json diff --git a/takeNotes-src/postNotes/.prettierignore b/takeNotes-src/postNotes/.prettierignore new file mode 100644 index 0000000..195a343 --- /dev/null +++ b/takeNotes-src/postNotes/.prettierignore @@ -0,0 +1,106 @@ +*.DS_Store +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +*.json + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and *not* Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port \ No newline at end of file diff --git a/takeNotes-src/postNotes/app.js b/takeNotes-src/postNotes/app.js new file mode 100644 index 0000000..2130fd9 --- /dev/null +++ b/takeNotes-src/postNotes/app.js @@ -0,0 +1,80 @@ +// 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; + + let body = event.body; + let isBodyValid = body !== null && body.notes !== null; + + return isIdValid && isBodyValid; +} + +function updateRecord(recordId, eventBody, id) { + let d = new Date(); + console.log("record id: " + recordId + " eventBody: " + eventBody.notes); + const params = { + TableName: TABLE_NAME, + Key: { + id: recordId, + }, + UpdateExpression: `set updated = :u, docBody.notes.#noteId = :n`, + ExpressionAttributeNames: { "#noteId": id }, + ExpressionAttributeValues: { + ":u": d.toISOString(), + ":n": eventBody.notes, + }, + ConditionExpression: "attribute_not_exists(docBody.notes.#noteId)", + ReturnValues: "ALL_NEW", + }; + console.log("params: " + params); + return docClient.update(params); +} + +// Lambda Handler +exports.postNotes = 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 { + const id = uuidv4(); + let data = await updateRecord( + event.pathParameters.id, + JSON.parse(event.body), + id + ).promise(); + return response(200, { data: data, id: id }); + } catch (err) { + return response(400, { message: err.message }); + } +}; diff --git a/takeNotes-src/postNotes/package-lock.json b/takeNotes-src/postNotes/package-lock.json new file mode 100644 index 0000000..3151d88 --- /dev/null +++ b/takeNotes-src/postNotes/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/postNotes/package.json b/takeNotes-src/postNotes/package.json new file mode 100644 index 0000000..9202874 --- /dev/null +++ b/takeNotes-src/postNotes/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 b24f792..150d2d0 100644 --- a/template.yaml +++ b/template.yaml @@ -124,6 +124,31 @@ Resources: RestApiId: !Ref TakeNotesApi Auth: Authorizer: CognitoAuthorizer + PostTakeNotesUserNotes: + Type: AWS::Serverless::Function + Properties: + CodeUri: takeNotes-src/postNotes/ + Handler: app.postNotes + 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: + PostUser: + Type: Api + Properties: + Path: /users/{id}/notes/ + Method: POST + RestApiId: !Ref TakeNotesApi + Auth: + Authorizer: CognitoAuthorizer PutTakeNotesUser: Type: AWS::Serverless::Function Properties: From 83d06679c34777e68f7f77969eefc4dcb95c0e9b Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 21 Feb 2021 19:32:34 -0500 Subject: [PATCH 2/3] Added id, created and updated field to note object --- takeNotes-src/postNotes/app.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/takeNotes-src/postNotes/app.js b/takeNotes-src/postNotes/app.js index 2130fd9..36c031d 100644 --- a/takeNotes-src/postNotes/app.js +++ b/takeNotes-src/postNotes/app.js @@ -40,6 +40,15 @@ function isValidRequest(context, event) { function updateRecord(recordId, eventBody, id) { let d = new Date(); console.log("record id: " + recordId + " eventBody: " + eventBody.notes); + let noteBody = eventBody.notes; + + const metaFields = { + id: id, + created: d.toISOString(), + updated: d.toISOString(), + }; + + const note = { ...metaFields, ...noteBody }; const params = { TableName: TABLE_NAME, Key: { @@ -49,7 +58,7 @@ function updateRecord(recordId, eventBody, id) { ExpressionAttributeNames: { "#noteId": id }, ExpressionAttributeValues: { ":u": d.toISOString(), - ":n": eventBody.notes, + ":n": note, }, ConditionExpression: "attribute_not_exists(docBody.notes.#noteId)", ReturnValues: "ALL_NEW", From 77ea1694740e2b7ff1efc259d5ee3bd825f6f311 Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Tue, 23 Feb 2021 11:29:50 -0500 Subject: [PATCH 3/3] fixed nits and updated naming to be singular --- takeNotes-src/{postNotes => postNote}/.prettierignore | 0 takeNotes-src/{postNotes => postNote}/app.js | 6 +++--- takeNotes-src/{postNotes => postNote}/package-lock.json | 0 takeNotes-src/{postNotes => postNote}/package.json | 0 template.yaml | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) rename takeNotes-src/{postNotes => postNote}/.prettierignore (100%) rename takeNotes-src/{postNotes => postNote}/app.js (93%) rename takeNotes-src/{postNotes => postNote}/package-lock.json (100%) rename takeNotes-src/{postNotes => postNote}/package.json (100%) diff --git a/takeNotes-src/postNotes/.prettierignore b/takeNotes-src/postNote/.prettierignore similarity index 100% rename from takeNotes-src/postNotes/.prettierignore rename to takeNotes-src/postNote/.prettierignore diff --git a/takeNotes-src/postNotes/app.js b/takeNotes-src/postNote/app.js similarity index 93% rename from takeNotes-src/postNotes/app.js rename to takeNotes-src/postNote/app.js index 36c031d..a0ad370 100644 --- a/takeNotes-src/postNotes/app.js +++ b/takeNotes-src/postNote/app.js @@ -40,7 +40,7 @@ function isValidRequest(context, event) { function updateRecord(recordId, eventBody, id) { let d = new Date(); console.log("record id: " + recordId + " eventBody: " + eventBody.notes); - let noteBody = eventBody.notes; + let noteBody = eventBody.note; const metaFields = { id: id, @@ -68,7 +68,7 @@ function updateRecord(recordId, eventBody, id) { } // Lambda Handler -exports.postNotes = async (event, context, callback) => { +exports.postNote = async (event, context, callback) => { console.log("event: " + event); console.log("body: " + event.body); if (!isValidRequest(context, event)) { @@ -84,6 +84,6 @@ exports.postNotes = async (event, context, callback) => { ).promise(); return response(200, { data: data, id: id }); } catch (err) { - return response(400, { message: err.message }); + return response(500, { message: err.message }); } }; diff --git a/takeNotes-src/postNotes/package-lock.json b/takeNotes-src/postNote/package-lock.json similarity index 100% rename from takeNotes-src/postNotes/package-lock.json rename to takeNotes-src/postNote/package-lock.json diff --git a/takeNotes-src/postNotes/package.json b/takeNotes-src/postNote/package.json similarity index 100% rename from takeNotes-src/postNotes/package.json rename to takeNotes-src/postNote/package.json diff --git a/template.yaml b/template.yaml index 150d2d0..5ccbb89 100644 --- a/template.yaml +++ b/template.yaml @@ -127,8 +127,8 @@ Resources: PostTakeNotesUserNotes: Type: AWS::Serverless::Function Properties: - CodeUri: takeNotes-src/postNotes/ - Handler: app.postNotes + CodeUri: takeNotes-src/postNote/ + Handler: app.postNote Tracing: Active Policies: - DynamoDBCrudPolicy: @@ -141,7 +141,7 @@ Resources: ENDPOINT_OVERRIDE: "" REGION: !Ref AWS::Region Events: - PostUser: + PostNote: Type: Api Properties: Path: /users/{id}/notes/