diff --git a/package-lock.json b/package-lock.json index b3f8428e..715d0a5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3596,25 +3596,25 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "optional": true }, "ansi-regex": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "optional": true }, "aproba": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "optional": true, "requires": { @@ -3624,13 +3624,13 @@ }, "balanced-match": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "optional": true }, "brace-expansion": { "version": "1.1.11", - "resolved": false, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "optional": true, "requires": { @@ -3640,37 +3640,37 @@ }, "chownr": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "optional": true }, "code-point-at": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "optional": true }, "concat-map": { "version": "0.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "optional": true }, "console-control-strings": { "version": "1.1.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "optional": true }, "core-util-is": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "optional": true }, "debug": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "optional": true, "requires": { @@ -3679,25 +3679,25 @@ }, "deep-extend": { "version": "0.6.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "optional": true }, "delegates": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "optional": true }, "detect-libc": { "version": "1.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "optional": true }, "fs-minipass": { "version": "1.2.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "optional": true, "requires": { @@ -3706,13 +3706,13 @@ }, "fs.realpath": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "optional": true }, "gauge": { "version": "2.7.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "optional": true, "requires": { @@ -3728,7 +3728,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "optional": true, "requires": { @@ -3742,13 +3742,13 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "optional": true }, "iconv-lite": { "version": "0.4.24", - "resolved": false, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "optional": true, "requires": { @@ -3757,7 +3757,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "optional": true, "requires": { @@ -3766,7 +3766,7 @@ }, "inflight": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "optional": true, "requires": { @@ -3776,19 +3776,19 @@ }, "inherits": { "version": "2.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "optional": true }, "ini": { "version": "1.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "optional": true, "requires": { @@ -3797,13 +3797,13 @@ }, "isarray": { "version": "1.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "optional": true }, "minimatch": { "version": "3.0.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "optional": true, "requires": { @@ -3812,13 +3812,13 @@ }, "minimist": { "version": "0.0.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "optional": true }, "minipass": { "version": "2.3.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "optional": true, "requires": { @@ -3828,7 +3828,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "optional": true, "requires": { @@ -3837,7 +3837,7 @@ }, "mkdirp": { "version": "0.5.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "optional": true, "requires": { @@ -3846,13 +3846,13 @@ }, "ms": { "version": "2.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "optional": true }, "needle": { "version": "2.3.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "optional": true, "requires": { @@ -3863,7 +3863,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "optional": true, "requires": { @@ -3881,7 +3881,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "optional": true, "requires": { @@ -3891,13 +3891,13 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "optional": true, "requires": { @@ -3907,7 +3907,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "optional": true, "requires": { @@ -3919,19 +3919,19 @@ }, "number-is-nan": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "optional": true }, "object-assign": { "version": "4.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "optional": true }, "once": { "version": "1.4.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "optional": true, "requires": { @@ -3940,19 +3940,19 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "optional": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "optional": true }, "osenv": { "version": "0.1.5", - "resolved": false, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "optional": true, "requires": { @@ -3962,19 +3962,19 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "optional": true }, "process-nextick-args": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "optional": true }, "rc": { "version": "1.2.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "optional": true, "requires": { @@ -3986,7 +3986,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "optional": true } @@ -3994,7 +3994,7 @@ }, "readable-stream": { "version": "2.3.6", - "resolved": false, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "optional": true, "requires": { @@ -4009,7 +4009,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "optional": true, "requires": { @@ -4018,43 +4018,43 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "optional": true }, "safer-buffer": { "version": "2.1.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "optional": true }, "sax": { "version": "1.2.4", - "resolved": false, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "optional": true }, "semver": { "version": "5.7.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "optional": true }, "set-blocking": { "version": "2.0.0", - "resolved": false, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "optional": true }, "signal-exit": { "version": "3.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "optional": true }, "string-width": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "optional": true, "requires": { @@ -4065,7 +4065,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "optional": true, "requires": { @@ -4074,7 +4074,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "optional": true, "requires": { @@ -4083,13 +4083,13 @@ }, "strip-json-comments": { "version": "2.0.1", - "resolved": false, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "optional": true }, "tar": { "version": "4.4.8", - "resolved": false, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "optional": true, "requires": { @@ -4104,13 +4104,13 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "optional": true }, "wide-align": { "version": "1.1.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "optional": true, "requires": { @@ -4119,13 +4119,13 @@ }, "wrappy": { "version": "1.0.2", - "resolved": false, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "optional": true }, "yallist": { "version": "3.0.3", - "resolved": false, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "optional": true } diff --git a/src/controllers/commentsController.js b/src/controllers/commentsController.js index e69de29b..0a1d8609 100644 --- a/src/controllers/commentsController.js +++ b/src/controllers/commentsController.js @@ -0,0 +1,29 @@ +import strings from '../utils/stringsUtil'; +import commentsHelper from '../helpers/commentsHelper'; + +const { COMMENT_UPDATED, COMMENT_DELETED } = strings.comments.success; + +export default class CommentsController { + static editComment(req, res) { + const { id } = req.params; + const { comment } = req.body; + + commentsHelper.findComment(req).then(async comments => { + await commentsHelper.checkComment( + req, comments, res, { comment }, id, + COMMENT_UPDATED, comments + ); + }); + } + + static deleteComment(req, res) { + const { id } = req.params; + + commentsHelper.findComment(req).then(async comments => { + await commentsHelper.checkComment( + req, comments, res, { deleted: true }, id, + COMMENT_DELETED, comments + ); + }); + } +} diff --git a/src/database/migrations/20191029094125-create-comments.js b/src/database/migrations/20191029094125-create-comments.js new file mode 100644 index 00000000..752043af --- /dev/null +++ b/src/database/migrations/20191029094125-create-comments.js @@ -0,0 +1,36 @@ +'use strict'; +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.createTable('comments', { + id: { + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: Sequelize.INTEGER + }, + comment: { + type: Sequelize.STRING + }, + userId: { + type: Sequelize.INTEGER + }, + requestId: { + type: Sequelize.INTEGER + }, + deleted: { + type: Sequelize.BOOLEAN + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE + } + }); + }, + down: (queryInterface, Sequelize) => { + return queryInterface.dropTable('comments'); + } +}; \ No newline at end of file diff --git a/src/database/models/comments.js b/src/database/models/comments.js index d66741ee..b34a845c 100644 --- a/src/database/models/comments.js +++ b/src/database/models/comments.js @@ -4,21 +4,10 @@ module.exports = (sequelize, DataTypes) => { comment: DataTypes.STRING, userId: DataTypes.INTEGER, requestId: DataTypes.INTEGER, - deleted: { - type: DataTypes.BOOLEAN, - defaultValue: false - } + deleted: DataTypes.BOOLEAN }, {}); comments.associate = function(models) { // associations can be defined here - comments.belongsTo(models.users, { - as: 'commenter', - foreignKey: 'userId', - }); - comments.belongsTo(models.requests, { - as: 'requestComment', - foreignKey: 'requestId', - }); }; return comments; }; diff --git a/src/database/seeders/20191029103632-comments.js b/src/database/seeders/20191029103632-comments.js index f57f5824..c21d6ca5 100644 --- a/src/database/seeders/20191029103632-comments.js +++ b/src/database/seeders/20191029103632-comments.js @@ -1,20 +1,18 @@ 'use strict'; - module.exports = { - up: (queryInterface, Sequelize) => Promise.all([ - queryInterface.bulkInsert('comments', [ - { - comment: 'i want to go to andela kigali', - userId: 2, - requestId: 3, - deleted: false, - createdAt: new Date(), - updatedAt: new Date() - } - ]) - ]), - - down: (queryInterface, Sequelize) => Promise.all([ - queryInterface.bulkDelete('comments', null, {}) - ]) + up: (queryInterface, Sequelize) => Promise.all([ + queryInterface.bulkInsert('comments', [ + { + comment: 'i want to go to andela kigali', + userId: 3, + requestId: 3, + deleted: false, + createdAt: new Date(), + updatedAt: new Date() + } + ]) + ]), + down: (queryInterface, Sequelize) => Promise.all([ + queryInterface.bulkDelete('comments', null, {}) + ]) }; diff --git a/src/helpers/commentsHelper.js b/src/helpers/commentsHelper.js new file mode 100644 index 00000000..24693015 --- /dev/null +++ b/src/helpers/commentsHelper.js @@ -0,0 +1,34 @@ +import sequelize from 'sequelize'; +import models from '../database/models'; +import strings from '../utils/stringsUtil'; +import responseUtil from '../utils/responseUtil'; + +const findComment = req => { + const { Op } = sequelize; + const { id } = req.params; + const comment = models.comments.findOne({ + where: { + [Op.and]: [{ id }, + { deleted: false }] + }, + }); + return comment; +}; + +const checkComment = async (req, comments, res, data, id, message) => { + const ownerId = req.user.payload.id; + + if (!comments) { + return responseUtil(res, 404, strings.comments.error.COMMENT_NOT_FOUND); + } + if (comments.userId !== ownerId) { + return responseUtil(res, 403, strings.comments.error.NOT_OWNER); + } + await models.comments.update(data, { where: { id, }, }); + const commentData = await models.comments.findOne({ where: { id, }, attributes: { exclude: ['userId', 'requestId', 'deleted', 'createdAt', 'updatedAt'] }, }); + return responseUtil(res, 200, message, commentData); +}; + +export default { + findComment, checkComment +}; diff --git a/src/middlewares/inputValidation.js b/src/middlewares/inputValidation.js index 5acd867b..bdc8317a 100644 --- a/src/middlewares/inputValidation.js +++ b/src/middlewares/inputValidation.js @@ -200,4 +200,13 @@ export default class InputValidation { }); validation(req, res, schema, next); } + + static validateComment(req, res, next) { + const schema = Joi.object({ + comment: Joi.string().min(1).max(250) + .message('comment should be at least 1 character and not more than 250 characters!') + .required(), + }); + validation(req, res, schema, next); + } } diff --git a/src/routes/api/requests.js b/src/routes/api/requests.js index d1f46b06..9bafec7e 100644 --- a/src/routes/api/requests.js +++ b/src/routes/api/requests.js @@ -1,5 +1,6 @@ import { Router } from 'express'; import requestController from '../../controllers/requestController'; +import commentsController from '../../controllers/commentsController'; import validateToken from '../../middlewares/auth/validateToken'; import verifyRelationships from '../../middlewares/requests/relationVerification'; import checkId from '../../middlewares/checkId'; @@ -18,11 +19,11 @@ const { } = requestController; const { - validateSearchRequestUser, - validateSearchRequestManager, - validateRequest, + validateSearchRequestUser, validateSearchRequestManager, + validateComment, validateRequest, } = InputValidation; const { checkManagerRole, supplierNotAllowed } = checkRole; +const { editComment, deleteComment } = commentsController; /** * @swagger @@ -152,5 +153,6 @@ router.get('/', validateToken, viewMyRequests); router.get('/manager', validateToken, checkManagerRole, viewManagerRequests); router.patch('/manager/:action/:id', validateToken, checkManagerRole, checkId, wrongAction, isProcessed, changeStatus); router.patch('/:id', validateToken, pendingRequest.requestOwner, pendingRequest.selectPending, validateRequest, pendingRequest.validateBody, updateRequest); - +router.put('/comments/:id', validateToken, checkId, validateComment, editComment); +router.delete('/comments/:id', validateToken, checkId, deleteComment); export default router; diff --git a/src/tests/index.spec.js b/src/tests/index.spec.js index 14e0f63c..5b52b8b8 100644 --- a/src/tests/index.spec.js +++ b/src/tests/index.spec.js @@ -3,7 +3,7 @@ import defaultTests from './defaultTests.spec'; import signupTests from './signupTest.spec'; import profileTests from './profile.spec'; import loginTest from './loginTest.spec'; -import requestTest from './requestTests/index.spec'; +import requestTest from './requestTests/index.spec' import requestTests from './requestTests.spec'; import accommodationTest from './accommodationTest.spec'; import editRequest from './editRequest.spec'; @@ -19,7 +19,7 @@ describe('Social Authentication Tests', authTests); describe('Signup Tests', signupTests); describe('Login Tests', loginTest); describe('Request Test', requestTest); -describe('Request Tests', requestTests); +describe('Requests-Tests', requestTests); describe('Accommodation Tests', accommodationTest); describe('Setting Profile Test', profileTests); describe('Social Authentication Tests', loginTest); diff --git a/src/tests/mockData/mockData.js b/src/tests/mockData/mockData.js index 7428bcc1..63b7696c 100644 --- a/src/tests/mockData/mockData.js +++ b/src/tests/mockData/mockData.js @@ -23,5 +23,7 @@ const mockData = { OutdateBookingDate:{checkInDate:'2019-02-22',checkOutDate:'2019-02-25',roomsNumber:3,accomodationId:3}, travelAdmin:{email: 'travelAdmin@caretbn.com', password: 'Pa55w0rd'}, activationInfo: {reasons: 'This is a valid reason to take action on your accommodation'}, + commentData:{comment:'change dates'}, + emptyComment:{comment:''} }; export default mockData; diff --git a/src/tests/requestTests.spec.js b/src/tests/requestTests.spec.js index 9878f8c0..f8968dc8 100644 --- a/src/tests/requestTests.spec.js +++ b/src/tests/requestTests.spec.js @@ -203,4 +203,86 @@ describe('Request Tests', () => { done(); }); }); + it('it Should be able to edit comment', (done) => { + chai.request(app) + .put('/api/v1/requests/comments/1') + .send(mockData.commentData) + .set('Authorization', `Bearer ${userToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(200); + expect(body.message).to.be.eql('Comment Successfully Updated!'); + done(); + }); + }); + it('it Should not be able to edit comment with wrong id', (done) => { + chai.request(app) + .put('/api/v1/requests/comments/1677') + .send(mockData.commentData) + .set('Authorization', `Bearer ${userToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(404); + expect(body.message).to.be.eql('Ooops! This comment does not exist!'); + done(); + }); + }); + it('it Should not be able to edit comment with empty comment', (done) => { + chai.request(app) + .put('/api/v1/requests/comments/1') + .send(mockData.emptyComment) + .set('Authorization', `Bearer ${userToken}`) + .end((err, res) => { + const { status } = res; + expect(status).to.be.eql(400); + done(); + }); + }); + it('it Should not be able to edit comment with anauthorized user', (done) => { + chai.request(app) + .put('/api/v1/requests/comments/1') + .send(mockData.commentData) + .set('Authorization', `Bearer ${managerToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(403); + expect(body.message).to.be.eql('Oops! You are not the owner of this comment!'); + done(); + }); + }); + + it('it Should not be able to delete a comment with wrong id', (done) => { + chai.request(app) + .delete('/api/v1/requests/comments/15566') + .set('Authorization', `Bearer ${userToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(404); + expect(body.message).to.be.eql('Ooops! This comment does not exist!'); + done(); + }); + }); + + it('it Should not be able to delete a comment with anauthorized user', (done) => { + chai.request(app) + .delete('/api/v1/requests/comments/1') + .set('Authorization', `Bearer ${managerToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(403); + expect(body.message).to.be.eql('Oops! You are not the owner of this comment!'); + done(); + }); + }); + it('it Should be able to delete a comment', (done) => { + chai.request(app) + .delete('/api/v1/requests/comments/1') + .set('Authorization', `Bearer ${userToken}`) + .end((err, res) => { + const { status, body } = res; + expect(status).to.be.eql(200); + expect(body.message).to.be.eql('Comment Successfully Deleted!'); + done(); + }); + }); }); \ No newline at end of file diff --git a/src/utils/stringsUtil.js b/src/utils/stringsUtil.js index 2ed7f257..b27699ef 100644 --- a/src/utils/stringsUtil.js +++ b/src/utils/stringsUtil.js @@ -117,6 +117,16 @@ const strings = { ID_INVALID: 'Invalid id, id should be an integer', }, }, + comments: { + success: { + COMMENT_UPDATED: 'Comment Successfully Updated!', + COMMENT_DELETED: 'Comment Successfully Deleted!' + }, + error: { + COMMENT_NOT_FOUND: 'Ooops! This comment does not exist!', + NOT_OWNER: 'Oops! You are not the owner of this comment!', + }, + }, }; export default strings;