From 3293541df124e0d3853f3939c1372546706e643c Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 21 Feb 2021 18:53:05 -0500 Subject: [PATCH 1/4] added handler to create a new entry --- takeNotes-src/postEntries/.prettierignore | 106 +++++++++++++++++++ takeNotes-src/postEntries/app.js | 92 +++++++++++++++++ takeNotes-src/postEntries/package-lock.json | 109 ++++++++++++++++++++ takeNotes-src/postEntries/package.json | 16 +++ takeNotes-src/postUser/app.js | 2 +- template.yaml | 25 +++++ 6 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 takeNotes-src/postEntries/.prettierignore create mode 100644 takeNotes-src/postEntries/app.js create mode 100644 takeNotes-src/postEntries/package-lock.json create mode 100644 takeNotes-src/postEntries/package.json diff --git a/takeNotes-src/postEntries/.prettierignore b/takeNotes-src/postEntries/.prettierignore new file mode 100644 index 0000000..195a343 --- /dev/null +++ b/takeNotes-src/postEntries/.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/postEntries/app.js b/takeNotes-src/postEntries/app.js new file mode 100644 index 0000000..a1f88aa --- /dev/null +++ b/takeNotes-src/postEntries/app.js @@ -0,0 +1,92 @@ +// 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.weekIdx !== null && + event.pathParameters.id !== null; + + let body = event.body; + let isBodyValid = body !== null && body.entry !== null; + + return isIdValid && isBodyValid; +} + +function updateRecord(recordId, weekIdx, eventBody, id) { + let d = new Date(); + console.log("record id: " + recordId + " eventBody: " + eventBody.entry); + let entryBody = eventBody.entry; + + const metaFields = { + id: id, + created: d, + updated: d, + }; + + const entry = { ...metaFields, entryBody }; + + const params = { + TableName: TABLE_NAME, + Key: { + id: recordId, + }, + UpdateExpression: `set updated = :u, docBody.journal.weeks[${weekIdx}].#entryId = :e`, + ExpressionAttributeNames: { "#entryId": id }, + ExpressionAttributeValues: { + ":u": d.toISOString(), + ":e": entry, + }, + ConditionExpression: `attribute_not_exists(docBody.journal.weeks[${weekIdx}].#entryId)`, + ReturnValues: "ALL_NEW", + }; + console.log("params: " + params); + return docClient.update(params); +} + +// Lambda Handler +exports.postEntries = 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, + event.pathParameters.weekIdx, + 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/postEntries/package-lock.json b/takeNotes-src/postEntries/package-lock.json new file mode 100644 index 0000000..f8e0d21 --- /dev/null +++ b/takeNotes-src/postEntries/package-lock.json @@ -0,0 +1,109 @@ +{ + "name": "get", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "aws-sdk": { + "version": "2.848.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz", + "integrity": "sha512-c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg==", + "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/postEntries/package.json b/takeNotes-src/postEntries/package.json new file mode 100644 index 0000000..9202874 --- /dev/null +++ b/takeNotes-src/postEntries/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/takeNotes-src/postUser/app.js b/takeNotes-src/postUser/app.js index 4529d45..d9531fd 100644 --- a/takeNotes-src/postUser/app.js +++ b/takeNotes-src/postUser/app.js @@ -60,7 +60,7 @@ let getWeeks = (start, end) => { weeks[i] = { created: dateString, updated: dateString, - entries: [], + entries: {}, }; } return weeks; diff --git a/template.yaml b/template.yaml index 49ebde1..478c6a4 100644 --- a/template.yaml +++ b/template.yaml @@ -176,6 +176,31 @@ Resources: RestApiId: !Ref TakeNotesApi Auth: Authorizer: CognitoAuthorizer + PostTakeNotesUserEntry: + Type: AWS::Serverless::Function + Properties: + CodeUri: takeNotes-src/postEntries/ + Handler: app.postEntries + 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}/journal/weeks/{weekIdx}/entries + Method: POST + RestApiId: !Ref TakeNotesApi + Auth: + Authorizer: CognitoAuthorizer PutTakeNotesUser: Type: AWS::Serverless::Function Properties: From ca1193f31ad2334b02e7fa1c6f8421c59d085774 Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 21 Feb 2021 19:11:08 -0500 Subject: [PATCH 2/4] added entries to field path and udpate date to use isoString --- takeNotes-src/postEntries/app.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/takeNotes-src/postEntries/app.js b/takeNotes-src/postEntries/app.js index a1f88aa..182ddaa 100644 --- a/takeNotes-src/postEntries/app.js +++ b/takeNotes-src/postEntries/app.js @@ -45,24 +45,24 @@ function updateRecord(recordId, weekIdx, eventBody, id) { const metaFields = { id: id, - created: d, - updated: d, + created: d.toISOString(), + updated: d.toISOString(), }; - const entry = { ...metaFields, entryBody }; + const entry = { ...metaFields, ...entryBody }; const params = { TableName: TABLE_NAME, Key: { id: recordId, }, - UpdateExpression: `set updated = :u, docBody.journal.weeks[${weekIdx}].#entryId = :e`, + UpdateExpression: `set updated = :u, docBody.journal.weeks[${weekIdx}].entries.#entryId = :e`, ExpressionAttributeNames: { "#entryId": id }, ExpressionAttributeValues: { ":u": d.toISOString(), ":e": entry, }, - ConditionExpression: `attribute_not_exists(docBody.journal.weeks[${weekIdx}].#entryId)`, + ConditionExpression: `attribute_not_exists(docBody.journal.weeks[${weekIdx}].entries.#entryId)`, ReturnValues: "ALL_NEW", }; console.log("params: " + params); From 37c7b67e7b6dd961e9c00aa39bfbcc4e7109e15a Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Sun, 21 Feb 2021 19:28:14 -0500 Subject: [PATCH 3/4] added updated field --- takeNotes-src/postEntries/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/takeNotes-src/postEntries/app.js b/takeNotes-src/postEntries/app.js index 182ddaa..0e2d352 100644 --- a/takeNotes-src/postEntries/app.js +++ b/takeNotes-src/postEntries/app.js @@ -56,7 +56,7 @@ function updateRecord(recordId, weekIdx, eventBody, id) { Key: { id: recordId, }, - UpdateExpression: `set updated = :u, docBody.journal.weeks[${weekIdx}].entries.#entryId = :e`, + UpdateExpression: `set updated = :u, docBody.journal.weeks[${weekIdx}].updated = :u, docBody.journal.weeks[${weekIdx}].entries.#entryId = :e`, ExpressionAttributeNames: { "#entryId": id }, ExpressionAttributeValues: { ":u": d.toISOString(), From b022e2414180fb73a8a0d010c9d343e428f6be01 Mon Sep 17 00:00:00 2001 From: KrishnaSolo Date: Tue, 23 Feb 2021 11:34:07 -0500 Subject: [PATCH 4/4] updated name to be singular and updated error code --- takeNotes-src/{postEntries => postEntry}/.prettierignore | 0 takeNotes-src/{postEntries => postEntry}/app.js | 4 ++-- takeNotes-src/{postEntries => postEntry}/package-lock.json | 0 takeNotes-src/{postEntries => postEntry}/package.json | 0 template.yaml | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) rename takeNotes-src/{postEntries => postEntry}/.prettierignore (100%) rename takeNotes-src/{postEntries => postEntry}/app.js (95%) rename takeNotes-src/{postEntries => postEntry}/package-lock.json (100%) rename takeNotes-src/{postEntries => postEntry}/package.json (100%) diff --git a/takeNotes-src/postEntries/.prettierignore b/takeNotes-src/postEntry/.prettierignore similarity index 100% rename from takeNotes-src/postEntries/.prettierignore rename to takeNotes-src/postEntry/.prettierignore diff --git a/takeNotes-src/postEntries/app.js b/takeNotes-src/postEntry/app.js similarity index 95% rename from takeNotes-src/postEntries/app.js rename to takeNotes-src/postEntry/app.js index 0e2d352..3d4fa6a 100644 --- a/takeNotes-src/postEntries/app.js +++ b/takeNotes-src/postEntry/app.js @@ -70,7 +70,7 @@ function updateRecord(recordId, weekIdx, eventBody, id) { } // Lambda Handler -exports.postEntries = async (event, context, callback) => { +exports.postEntry = async (event, context, callback) => { console.log("event: " + event); console.log("body: " + event.body); if (!isValidRequest(context, event)) { @@ -87,6 +87,6 @@ exports.postEntries = 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/postEntries/package-lock.json b/takeNotes-src/postEntry/package-lock.json similarity index 100% rename from takeNotes-src/postEntries/package-lock.json rename to takeNotes-src/postEntry/package-lock.json diff --git a/takeNotes-src/postEntries/package.json b/takeNotes-src/postEntry/package.json similarity index 100% rename from takeNotes-src/postEntries/package.json rename to takeNotes-src/postEntry/package.json diff --git a/template.yaml b/template.yaml index 478c6a4..6aa5ff3 100644 --- a/template.yaml +++ b/template.yaml @@ -179,8 +179,8 @@ Resources: PostTakeNotesUserEntry: Type: AWS::Serverless::Function Properties: - CodeUri: takeNotes-src/postEntries/ - Handler: app.postEntries + CodeUri: takeNotes-src/postEntry/ + Handler: app.postEntry Tracing: Active Policies: - DynamoDBCrudPolicy: @@ -193,7 +193,7 @@ Resources: ENDPOINT_OVERRIDE: "" REGION: !Ref AWS::Region Events: - PostUser: + PostEntry: Type: Api Properties: Path: /users/{id}/journal/weeks/{weekIdx}/entries