From 35c224e57716741e62f1e6c828519fb4315ba6f5 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 16:10:34 +0900 Subject: [PATCH 001/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20=EB=B7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 128 +++ package.json | 5 +- src/api/service/rainbowService.ts | 73 +- .../mainPageDto/RainbowMainPageResDto.ts | 50 +- src/models/book/Book.ts | 2 +- src/models/diary/PetEmotions.ts | 2 +- .../tableContents/FirstPartTableContents.ts | 3 +- src/models/tableContents/TableContents.ts | 4 +- yarn.lock | 778 +++++++++++++++++- 9 files changed, 1020 insertions(+), 25 deletions(-) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index aa310f6..b5c620d 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -12,10 +12,13 @@ "dotenv@^10.0.0", "express@^4.17.1", "mongoose@^5.13.0", + "nodemon@^2.0.9", "ts-node@^10.0.0", "typescript@^4.3.4" ], "lockfileEntries": { + "@sindresorhus/is@^0.14.0": "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea", + "@szmarczak/http-timer@^1.1.2": "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421", "@tsconfig/node10@^1.0.7": "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9", "@tsconfig/node12@^1.0.7": "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c", "@tsconfig/node14@^1.0.0": "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2", @@ -32,46 +35,118 @@ "@types/qs@*": "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1", "@types/range-parser@*": "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c", "@types/serve-static@*": "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e", + "abbrev@1": "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8", "accepts@~1.3.7": "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd", + "ansi-align@^3.0.0": "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb", + "ansi-regex@^4.1.0": "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997", + "ansi-regex@^5.0.0": "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75", + "ansi-styles@^4.1.0": "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937", + "anymatch@~3.1.2": "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716", "arg@^4.1.0": "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089", "array-flatten@1.1.1": "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2", + "balanced-match@^1.0.0": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee", "bcryptjs@^2.4.3": "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb", + "binary-extensions@^2.0.0": "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d", "bl@^2.2.1": "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5", "bluebird@3.5.1": "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9", "body-parser@1.19.0": "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a", + "boxen@^4.2.0": "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64", + "brace-expansion@^1.1.7": "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd", + "braces@~3.0.2": "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107", "bson@^1.1.4": "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a", "buffer-from@^1.0.0": "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef", "bytes@3.1.0": "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6", + "cacheable-request@^6.0.0": "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912", + "camelcase@^5.3.1": "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320", + "chalk@^3.0.0": "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4", + "chokidar@^3.2.2": "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75", + "ci-info@^2.0.0": "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46", + "cli-boxes@^2.2.0": "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f", + "clone-response@^1.0.2": "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b", + "color-convert@^2.0.1": "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3", + "color-name@~1.1.4": "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2", + "concat-map@0.0.1": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b", + "configstore@^5.0.1": "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96", "content-disposition@0.5.3": "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd", "content-type@~1.0.4": "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b", "cookie-signature@1.0.6": "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c", "cookie@0.4.0": "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba", "core-util-is@~1.0.0": "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7", "create-require@^1.1.0": "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333", + "crypto-random-string@^2.0.0": "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5", "debug@2.6.9": "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f", "debug@3.1.0": "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261", + "debug@^2.2.0": "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f", + "debug@^3.2.6": "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a", + "decompress-response@^3.3.0": "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3", + "deep-extend@^0.6.0": "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac", + "defer-to-connect@^1.0.1": "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591", "denque@^1.4.1": "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de", "depd@~1.1.2": "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9", "destroy@~1.0.4": "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80", "diff@^4.0.1": "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d", + "dot-prop@^5.2.0": "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88", "dotenv@^10.0.0": "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81", + "duplexer3@^0.1.4": "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2", "ee-first@1.1.1": "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d", + "emoji-regex@^7.0.1": "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156", + "emoji-regex@^8.0.0": "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37", "encodeurl@~1.0.2": "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59", + "end-of-stream@^1.1.0": "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0", + "escape-goat@^2.0.0": "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675", "escape-html@~1.0.3": "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988", "etag@~1.8.1": "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887", "express@^4.17.1": "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134", + "fill-range@^7.0.1": "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40", "finalhandler@~1.1.2": "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d", "forwarded@0.2.0": "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811", "fresh@0.5.2": "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7", + "fsevents@~2.3.2": "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a", + "get-stream@^4.1.0": "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5", + "get-stream@^5.1.0": "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3", + "glob-parent@~5.1.2": "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4", + "global-dirs@^2.0.1": "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d", + "got@^9.6.0": "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85", + "graceful-fs@^4.1.2": "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee", + "has-flag@^3.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd", + "has-flag@^4.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b", + "has-yarn@^2.1.0": "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77", + "http-cache-semantics@^4.0.0": "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390", "http-errors@1.7.2": "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f", "http-errors@~1.7.2": "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06", "iconv-lite@0.4.24": "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b", + "ignore-by-default@^1.0.1": "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09", + "import-lazy@^2.1.0": "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43", + "imurmurhash@^0.1.4": "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea", "inherits@2.0.3": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de", "inherits@2.0.4": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", "inherits@~2.0.3": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", + "ini@1.3.7": "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84", + "ini@~1.3.0": "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c", "ipaddr.js@1.9.1": "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3", + "is-binary-path@~2.1.0": "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09", + "is-ci@^2.0.0": "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c", + "is-extglob@^2.1.1": "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2", + "is-fullwidth-code-point@^2.0.0": "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f", + "is-fullwidth-code-point@^3.0.0": "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d", + "is-glob@^4.0.1": "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc", + "is-glob@~4.0.1": "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc", + "is-installed-globally@^0.3.1": "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141", + "is-npm@^4.0.0": "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d", + "is-number@^7.0.0": "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b", + "is-obj@^2.0.0": "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982", + "is-path-inside@^3.0.1": "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283", + "is-typedarray@^1.0.0": "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a", + "is-yarn-global@^0.3.0": "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232", "isarray@~1.0.0": "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11", + "json-buffer@3.0.0": "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898", "kareem@2.3.2": "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93", + "keyv@^3.0.0": "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9", + "latest-version@^5.0.0": "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face", + "lowercase-keys@^1.0.0": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f", + "lowercase-keys@^1.0.1": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f", + "lowercase-keys@^2.0.0": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479", + "make-dir@^3.0.0": "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f", "make-error@^1.1.1": "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2", "media-typer@0.3.0": "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748", "memory-pager@^1.0.2": "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5", @@ -80,6 +155,10 @@ "mime-db@1.48.0": "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d", "mime-types@~2.1.24": "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b", "mime@1.6.0": "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1", + "mimic-response@^1.0.0": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", + "mimic-response@^1.0.1": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", + "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083", + "minimist@^1.2.0": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", "mongodb@3.6.8": "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407", "mongoose-legacy-pluralize@1.0.2": "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4", "mongoose@^5.13.0": "https://registry.yarnpkg.com/mongoose/-/mongoose-5.13.0.tgz#3d5241991261681a913696d5b7c88f76b31aedb0", @@ -88,19 +167,40 @@ "ms@2.0.0": "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8", "ms@2.1.1": "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a", "ms@2.1.2": "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009", + "ms@^2.1.1": "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2", "negotiator@0.6.2": "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb", + "nodemon@^2.0.9": "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.9.tgz#f5cd550ba215da3c1081459ae2c1c8da2c353165", + "nopt@~1.0.10": "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee", + "normalize-path@^3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", + "normalize-path@~3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", + "normalize-url@^4.1.0": "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a", "on-finished@~2.3.0": "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947", + "once@^1.3.1": "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1", + "once@^1.4.0": "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1", "optional-require@^1.0.3": "https://registry.yarnpkg.com/optional-require/-/optional-require-1.0.3.tgz#275b8e9df1dc6a17ad155369c2422a440f89cb07", + "p-cancelable@^1.0.0": "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc", + "package-json@^6.3.0": "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0", "parseurl@~1.3.3": "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4", "path-to-regexp@0.1.7": "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c", + "picomatch@^2.0.4": "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972", + "picomatch@^2.2.1": "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972", + "prepend-http@^2.0.0": "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897", "process-nextick-args@~2.0.0": "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2", "proxy-addr@~2.0.5": "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025", + "pstree.remy@^1.1.7": "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a", + "pump@^3.0.0": "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64", + "pupa@^2.0.1": "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62", "qs@6.7.0": "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc", "range-parser@~1.2.1": "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031", "raw-body@2.4.0": "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332", + "rc@^1.2.8": "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed", "readable-stream@^2.3.5": "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57", + "readdirp@~3.6.0": "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7", "regexp-clone@1.0.0": "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63", "regexp-clone@^1.0.0": "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63", + "registry-auth-token@^4.0.0": "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250", + "registry-url@^5.0.0": "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009", + "responselike@^1.0.2": "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7", "safe-buffer@5.1.2": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d", "safe-buffer@5.2.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6", "safe-buffer@^5.1.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6", @@ -109,27 +209,55 @@ "safe-buffer@~5.1.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d", "safer-buffer@>= 2.1.2 < 3": "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a", "saslprep@^1.0.0": "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226", + "semver-diff@^3.1.1": "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b", + "semver@^5.7.1": "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7", + "semver@^6.0.0": "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d", + "semver@^6.2.0": "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d", + "semver@^6.3.0": "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d", "send@0.17.1": "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8", "serve-static@1.14.1": "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9", "setprototypeof@1.1.1": "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683", "sift@13.5.2": "https://registry.yarnpkg.com/sift/-/sift-13.5.2.tgz#24a715e13c617b086166cd04917d204a591c9da6", + "signal-exit@^3.0.2": "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c", "sliced@1.0.1": "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41", "source-map-support@^0.5.17": "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61", "source-map@^0.6.0": "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263", "sparse-bitfield@^3.0.3": "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11", "statuses@>= 1.5.0 < 2": "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c", "statuses@~1.5.0": "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c", + "string-width@^3.0.0": "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961", + "string-width@^4.0.0": "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5", + "string-width@^4.1.0": "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5", "string_decoder@~1.1.1": "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8", + "strip-ansi@^5.1.0": "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae", + "strip-ansi@^6.0.0": "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532", + "strip-json-comments@~2.0.1": "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a", + "supports-color@^5.5.0": "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f", + "supports-color@^7.1.0": "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da", + "term-size@^2.1.0": "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54", + "to-readable-stream@^1.0.0": "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771", + "to-regex-range@^5.0.1": "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4", "toidentifier@1.0.0": "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553", + "touch@^3.1.0": "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b", "ts-node@^10.0.0": "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be", + "type-fest@^0.8.1": "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d", "type-is@~1.6.17": "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131", "type-is@~1.6.18": "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131", + "typedarray-to-buffer@^3.1.5": "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080", "typescript@^4.3.4": "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc", + "undefsafe@^2.0.3": "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae", + "unique-string@^2.0.0": "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d", "unpipe@1.0.0": "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec", "unpipe@~1.0.0": "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec", + "update-notifier@^4.1.0": "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3", + "url-parse-lax@^3.0.0": "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c", "util-deprecate@~1.0.1": "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf", "utils-merge@1.0.1": "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713", "vary@~1.1.2": "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc", + "widest-line@^3.1.0": "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca", + "wrappy@1": "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f", + "write-file-atomic@^3.0.0": "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8", + "xdg-basedir@^4.0.0": "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13", "yn@3.1.1": "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" }, "files": [], diff --git a/package.json b/package.json index 3b3476f..37f2a53 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "dev": "ts-node src", + "dev": "nodemon -r ts-node src/index.ts", "build": "tsc && node dist", "test": "nodemon" }, @@ -20,6 +20,7 @@ "bcryptjs": "^2.4.3", "dotenv": "^10.0.0", "express": "^4.17.1", - "mongoose": "^5.13.0" + "mongoose": "^5.13.0", + "nodemon": "^2.0.9" } } diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 69b1390..f3e3507 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,5 +1,4 @@ import User from "../../models/user/User" -import Pet from "../../models/pet/Pet" import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/rainbowMainPageResDto" import Help from "../../models/etc/Help" @@ -8,11 +7,81 @@ require("../../models/pet/Pet") require("../../models/book/Book") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') +require('../../models/diary/PetEmotions') require('../../models/tableContents/SecondPartTableContent') +require('../../models/diary/UserDiary') require("../../models/etc/Help") module.exports = { getMainPage: async (userId, petId) => { - + try { + const findUser = await User.findById(userId).populate({ + path: "pets" + }).populate({ + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents", + populate : { + path : "petDiary", + populate : { + path : "petEmotions" + } + } + } + } + }) + + const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book) + const firstPartTableContents = findUser.book.tableContents.firstPartTableContents + + const validMemories = firstPartTableContents.filter(tableContents => + tableContents.petDiary.length>0).map(tableContents => + tableContents.petDiary.filter(petDiary => + petDiary.pets.includes(petId)) + ) + //validMemories : [tableContetns [petDiary]] + + let memoriesResDto = [null,null] + if(validMemories.length == 2){ + for(let i = 0 ; i<2;i++){ + memoriesResDto[i] = new MemoriesResDto(validMemories[i],petId) + } + }else if(validMemories.length >2){ + let firstTableContentsIndex = await getRandomNumber(validMemories.length) + let secondTableContentsIndex = await getRandomNumber(validMemories.length) + + if(firstTableContentsIndex == secondTableContentsIndex){ + while(firstTableContentsIndex == secondTableContentsIndex){ + if(secondTableContentsIndex == firstTableContentsIndex){ + secondTableContentsIndex = await getRandomNumber(validMemories.length) + }else{ + break; + } + } + } + memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex],petId) + memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex],petId) + }else if(validMemories.length == 1){ + memoriesResDto[0] = new MemoriesResDto(validMemories[0],petId) + } + //helpResDto + const helps = await Help.find() + const helpResDto = helps.map(help => new HelpResDto(help)) + + rainbowMainPageResDto.setMemories(memoriesResDto) + rainbowMainPageResDto.setHelp(helpResDto) + + return rainbowMainPageResDto + } catch (error) { + throw error + } + + function getRandomNumber(max : number){ + max = Math.floor(max); + return Math.floor(Math.random()*max); + } }, } \ No newline at end of file diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 66f4537..2787f6e 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -3,26 +3,36 @@ import { IHelp } from "../../../interfaces/etc/IHelp"; import { IPet } from "../../../interfaces/pet/IPet"; import { IFirstPartTableContents } from "../../../interfaces/tableContents/IFirstPartTableContents"; import { IUser } from "../../../interfaces/user/IUser"; +import mongoose from "mongoose" +import PetEmotions from "../../../models/diary/PetEmotions"; +import { IBook } from "../../../interfaces/book/IBook"; interface IRainbowMainPageResDto{ title : String, bookImg : String, - memories : [MemoriesResDto], - help : [HelpResDto] + memories : Array, + help : Array } export class RainbowMainPageResDto{ - public rainbowMainPage : IRainbowMainPageResDto; + public rainbowMainPage = { + title : null, + bookImg : null, + memories : [], + help : [] + } - constructor(user : IUser){ - this.rainbowMainPage.title //작가와 무지개다리를 건넌 동물의 이름 합친거 - this.rainbowMainPage.bookImg = user.book.imgs //책 이미지에서 맨앞에? + constructor(book : IBook){ + console.log('왜 없대 ?? :'+book) + console.log('왜?? : '+book.title) + this.rainbowMainPage.title = book.title//작가와 무지개다리를 건넌 동물의 이름 합친거 + this.rainbowMainPage.bookImg = book.imgs //책 이미지에서 맨앞에? } - setMemories(memories : MemoriesResDto){ - this.rainbowMainPage.memories.push(memories) + setMemories(memories : MemoriesResDto[]){ + this.rainbowMainPage.memories = memories } - setHelp(helps : [HelpResDto]){ + setHelp(helps : HelpResDto[]){ this.rainbowMainPage.help = helps } } @@ -31,15 +41,25 @@ export class MemoriesResDto{ private title; private contents; private date; - private feel; + private feeling; + + constructor(petDiaries : IPetDiary[], petId : IPet){ + const diaryIndex = this.getRandomMemoryIndex(petDiaries.length) + const randomDiary = petDiaries[diaryIndex] + console.log("랜덤된 petEmotion "+randomDiary.petEmotions.filter(petEmotion => + petEmotion.pet == petId)[0]) - constructor(firstPartTableContents : IFirstPartTableContents[], pet : IPet){ - + this.title = randomDiary.title + this.contents = randomDiary.contents + this.date = randomDiary.date + this.feeling = randomDiary.petEmotions.filter(petEmotion => + petEmotion.pet == petId)[0].feeling } - randomMemory(firstPartTableContents : IFirstPartTableContents[]){ - const tableContentsLenght = firstPartTableContents.length - const min = Math.ceil(0) + getRandomMemoryIndex(max : number){ + let min = Math.ceil(0); + max = Math.floor(max); + return Math.floor(Math.random()*(max-min))+min; } } diff --git a/src/models/book/Book.ts b/src/models/book/Book.ts index f96288b..ca1fd92 100644 --- a/src/models/book/Book.ts +++ b/src/models/book/Book.ts @@ -5,7 +5,7 @@ import { ITableContents } from "../../interfaces/tableContents/ITableContents" const BookSchema: Schema = new mongoose.Schema({ title: { type: String }, author: { type: String }, - img: { type: String }, + imgs: { type: String }, tableContents: { type: mongoose.SchemaTypes.ObjectId, ref: "TableContents" diff --git a/src/models/diary/PetEmotions.ts b/src/models/diary/PetEmotions.ts index 09e2c63..daa5fa4 100644 --- a/src/models/diary/PetEmotions.ts +++ b/src/models/diary/PetEmotions.ts @@ -11,7 +11,7 @@ const PetEmotionsSchema: Schema = new mongoose.Schema({ type: mongoose.SchemaTypes.ObjectId, ref: "Pet" }, - feel: { type: Number } + feeling: { type: Number } }) PetEmotionsSchema.methods.setPetDiary = async function (petDiary: IPetDiary) { diff --git a/src/models/tableContents/FirstPartTableContents.ts b/src/models/tableContents/FirstPartTableContents.ts index c1e93db..2d83cf4 100644 --- a/src/models/tableContents/FirstPartTableContents.ts +++ b/src/models/tableContents/FirstPartTableContents.ts @@ -16,7 +16,8 @@ const FirstPartTableContentsSchema: Schema = new mongoo petDiary: [ { type: mongoose.SchemaTypes.ObjectId, - ref: "PetDiary" + ref: "PetDiary", + default : null } ] }) diff --git a/src/models/tableContents/TableContents.ts b/src/models/tableContents/TableContents.ts index c837fbc..293daad 100644 --- a/src/models/tableContents/TableContents.ts +++ b/src/models/tableContents/TableContents.ts @@ -1,9 +1,9 @@ import mongoose, { Schema } from "mongoose" -import { ITableContentsDocument, ITableContentsModel } from "../../interfaces/tableContents/ITableContents" +import { ITableContents, ITableContentsDocument, ITableContentsModel } from "../../interfaces/tableContents/ITableContents" import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents" import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" -const TableContentsSchema: Schema = new mongoose.Schema({ +const TableContentsSchema: Schema = new mongoose.Schema({ firstPartTableContents: [ { type: mongoose.SchemaTypes.ObjectId, diff --git a/yarn.lock b/yarn.lock index b48f414..beeff29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,18 @@ # yarn lockfile v1 +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + "@tsconfig/node10@^1.0.7": version "1.0.8" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" @@ -99,6 +111,11 @@ "@types/mime" "^1" "@types/node" "*" +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -107,6 +124,38 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + dependencies: + string-width "^3.0.0" + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -117,11 +166,21 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + bcryptjs@^2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + bl@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5" @@ -151,6 +210,35 @@ body-parser@1.19.0: raw-body "2.4.0" type-is "~1.6.17" +boxen@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" + integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^5.3.1" + chalk "^3.0.0" + cli-boxes "^2.2.0" + string-width "^4.1.0" + term-size "^2.1.0" + type-fest "^0.8.1" + widest-line "^3.1.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + bson@^1.1.4: version "1.1.6" resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a" @@ -166,6 +254,93 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chokidar@^3.2.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +cli-boxes@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -198,7 +373,12 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -debug@2.6.9: +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -212,6 +392,30 @@ debug@3.1.0: dependencies: ms "2.0.0" +debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + denque@^1.4.1: version "1.5.0" resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" @@ -232,21 +436,55 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + dotenv@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -293,6 +531,13 @@ express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -316,6 +561,81 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +global-dirs@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== + dependencies: + ini "1.3.7" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -345,6 +665,21 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -355,21 +690,141 @@ inherits@2.0.4, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" + integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== + dependencies: + global-dirs "^2.0.1" + is-path-inside "^3.0.1" + +is-npm@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" + integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + kareem@2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93" integrity sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ== +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +latest-version@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -412,6 +867,23 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + mongodb@3.6.8: version "3.6.8" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407" @@ -479,11 +951,49 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +nodemon@^2.0.9: + version "2.0.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.9.tgz#f5cd550ba215da3c1081459ae2c1c8da2c353165" + integrity sha512-6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg== + dependencies: + chokidar "^3.2.2" + debug "^3.2.6" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.7" + semver "^5.7.1" + supports-color "^5.5.0" + touch "^3.1.0" + undefsafe "^2.0.3" + update-notifier "^4.1.0" + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + dependencies: + abbrev "1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -491,11 +1001,33 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" +once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + optional-require@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.0.3.tgz#275b8e9df1dc6a17ad155369c2422a440f89cb07" integrity sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA== +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -506,6 +1038,16 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +picomatch@^2.0.4, picomatch@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -519,6 +1061,26 @@ proxy-addr@~2.0.5: forwarded "0.2.0" ipaddr.js "1.9.1" +pstree.remy@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" + integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pupa@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -539,6 +1101,16 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -552,11 +1124,39 @@ readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + regexp-clone@1.0.0, regexp-clone@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63" integrity sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw== +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -579,6 +1179,23 @@ saslprep@^1.0.0: dependencies: sparse-bitfield "^3.0.3" +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -618,6 +1235,11 @@ sift@13.5.2: resolved "https://registry.yarnpkg.com/sift/-/sift-13.5.2.tgz#24a715e13c617b086166cd04917d204a591c9da6" integrity sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA== +signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + sliced@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" @@ -648,6 +1270,24 @@ sparse-bitfield@^3.0.3: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.0.0, string-width@^4.1.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -655,11 +1295,68 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +term-size@^2.1.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" + integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== + dependencies: + nopt "~1.0.10" + ts-node@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" @@ -676,6 +1373,11 @@ ts-node@^10.0.0: source-map-support "^0.5.17" yn "3.1.1" +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -684,16 +1386,63 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typescript@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== +undefsafe@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae" + integrity sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A== + dependencies: + debug "^2.2.0" + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +update-notifier@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" + integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== + dependencies: + boxen "^4.2.0" + chalk "^3.0.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.3.1" + is-npm "^4.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.0.0" + pupa "^2.0.1" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -709,6 +1458,33 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From c9509c898fa1e48a87d2a6ebcc1909722985fd4a Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 16:24:05 +0900 Subject: [PATCH 002/168] =?UTF-8?q?reafactor=20:=20schema=20interface=20&?= =?UTF-8?q?=20model=20=ED=83=80=EC=9E=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/diary/PetEmotions.ts | 4 ++-- src/models/diary/UserDiary.ts | 4 ++-- src/models/etc/Comments.ts | 4 ++-- src/models/etc/Help.ts | 4 ++-- src/models/etc/Institution.ts | 4 ++-- src/models/tableContents/TableContents.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/models/diary/PetEmotions.ts b/src/models/diary/PetEmotions.ts index daa5fa4..6942d81 100644 --- a/src/models/diary/PetEmotions.ts +++ b/src/models/diary/PetEmotions.ts @@ -1,8 +1,8 @@ import mongoose, { Schema } from "mongoose" import { IPetDiary } from "../../interfaces/diary/IPetDiary" -import { IPetEmotions, IPetEmotionsDocument, IPetEmotionsModel } from "../../interfaces/diary/IPetEmotions" +import { IPetEmotionsDocument, IPetEmotionsModel } from "../../interfaces/diary/IPetEmotions" -const PetEmotionsSchema: Schema = new mongoose.Schema({ +const PetEmotionsSchema: Schema = new mongoose.Schema({ petDiary: { type: mongoose.SchemaTypes.ObjectId, ref: "PetDiary" diff --git a/src/models/diary/UserDiary.ts b/src/models/diary/UserDiary.ts index 0efec97..b1aa164 100644 --- a/src/models/diary/UserDiary.ts +++ b/src/models/diary/UserDiary.ts @@ -1,8 +1,8 @@ import mongoose,{Schema} from "mongoose" -import { IUserDiary, IUserDiaryDocument, IUserDiaryModel } from "../../interfaces/diary/IUserDiary" +import { IUserDiaryDocument, IUserDiaryModel } from "../../interfaces/diary/IUserDiary" import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" -const UserDiarySchema : Schema = new mongoose.Schema({ +const UserDiarySchema : Schema = new mongoose.Schema({ title : { type : String}, contents : {type : String}, imgs : [ diff --git a/src/models/etc/Comments.ts b/src/models/etc/Comments.ts index fa05197..ba0987a 100644 --- a/src/models/etc/Comments.ts +++ b/src/models/etc/Comments.ts @@ -1,7 +1,7 @@ import mongoose, { Schema } from "mongoose" -import { IComments, ICommentsDocument, ICommentsModel } from "../../interfaces/etc/IComments" +import { ICommentsDocument, ICommentsModel } from "../../interfaces/etc/IComments" -const CommentsSchema: Schema = new mongoose.Schema({ +const CommentsSchema: Schema = new mongoose.Schema({ feeling: { type: Number }, comments: { type: String }, classification: { type: Number } diff --git a/src/models/etc/Help.ts b/src/models/etc/Help.ts index b7a3061..ddd98e6 100644 --- a/src/models/etc/Help.ts +++ b/src/models/etc/Help.ts @@ -1,7 +1,7 @@ import mongoose, { Schema } from "mongoose" -import { IHelp, IHelpDocument, IHelpModel } from "../../interfaces/etc/IHelp" +import { IHelpDocument, IHelpModel } from "../../interfaces/etc/IHelp" -const HelpSchema: Schema = new mongoose.Schema({ +const HelpSchema: Schema = new mongoose.Schema({ classification: { type: String }, title: { type: String }, url: { type: String } diff --git a/src/models/etc/Institution.ts b/src/models/etc/Institution.ts index 20ffbae..3c34274 100644 --- a/src/models/etc/Institution.ts +++ b/src/models/etc/Institution.ts @@ -1,7 +1,7 @@ import mongoose,{Schema} from "mongoose" -import { IInstitution, IInstitutionDocument, IInstitutionModel } from "../../interfaces/etc/IInstitution" +import { IInstitutionDocument, IInstitutionModel } from "../../interfaces/etc/IInstitution" -const InstitutionSchema: Schema = new mongoose.Schema({ +const InstitutionSchema: Schema = new mongoose.Schema({ feeling: { type: Number }, type: { type: Number }, contents: { type: String }, diff --git a/src/models/tableContents/TableContents.ts b/src/models/tableContents/TableContents.ts index 293daad..c837fbc 100644 --- a/src/models/tableContents/TableContents.ts +++ b/src/models/tableContents/TableContents.ts @@ -1,9 +1,9 @@ import mongoose, { Schema } from "mongoose" -import { ITableContents, ITableContentsDocument, ITableContentsModel } from "../../interfaces/tableContents/ITableContents" +import { ITableContentsDocument, ITableContentsModel } from "../../interfaces/tableContents/ITableContents" import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents" import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" -const TableContentsSchema: Schema = new mongoose.Schema({ +const TableContentsSchema: Schema = new mongoose.Schema({ firstPartTableContents: [ { type: mongoose.SchemaTypes.ObjectId, From c9f82caa16976199671e630e0d58fb2c4607d145 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 18:52:17 +0900 Subject: [PATCH 003/168] =?UTF-8?q?refactor=20:=20schema=20interface=20&?= =?UTF-8?q?=20model=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/diary/PetDiary.ts | 12 ++++++++---- src/models/diary/PetEmotions.ts | 5 ++++- src/models/tableContents/FirstPartTableContents.ts | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/models/diary/PetDiary.ts b/src/models/diary/PetDiary.ts index db36b98..8f6df6e 100644 --- a/src/models/diary/PetDiary.ts +++ b/src/models/diary/PetDiary.ts @@ -1,10 +1,10 @@ import mongoose,{Schema} from "mongoose" -import { IPetDiary, IPetDiaryDocument, IPetDiaryModel } from "../../interfaces/diary/IPetDiary" +import { IPetDiaryDocument, IPetDiaryModel } from "../../interfaces/diary/IPetDiary" import {IPet} from "../../interfaces/pet/IPet" import { IPetEmotions } from "../../interfaces/diary/IPetEmotions" import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents" -const PetDiarySchema : Schema= new mongoose.Schema({ +const PetDiarySchema : Schema= new mongoose.Schema({ pets : [ { type : mongoose.SchemaTypes.ObjectId, @@ -15,8 +15,12 @@ const PetDiarySchema : Schema= new mongoose.Schema({ type : mongoose.SchemaTypes.ObjectId, ref: "FirstPartTableContents" }, - title : {type : String}, - contents : {type : String}, + title : { + type : String + }, + contents : { + type : String + }, imgs : [ { type : String, diff --git a/src/models/diary/PetEmotions.ts b/src/models/diary/PetEmotions.ts index 6942d81..008e5d6 100644 --- a/src/models/diary/PetEmotions.ts +++ b/src/models/diary/PetEmotions.ts @@ -11,7 +11,10 @@ const PetEmotionsSchema: Schema = new mongoose.Schema({ type: mongoose.SchemaTypes.ObjectId, ref: "Pet" }, - feeling: { type: Number } + feeling: { + type: Number, + default : 0 + } }) PetEmotionsSchema.methods.setPetDiary = async function (petDiary: IPetDiary) { diff --git a/src/models/tableContents/FirstPartTableContents.ts b/src/models/tableContents/FirstPartTableContents.ts index 2d83cf4..605c154 100644 --- a/src/models/tableContents/FirstPartTableContents.ts +++ b/src/models/tableContents/FirstPartTableContents.ts @@ -1,8 +1,8 @@ import mongoose, { Schema } from "mongoose" -import { IFirstPartTableContents, IFirstPartTableContentsDocument, IFirstPartTableContentsModel } from "../../interfaces/tableContents/IFirstPartTableContents" +import { IFirstPartTableContentsDocument, IFirstPartTableContentsModel } from "../../interfaces/tableContents/IFirstPartTableContents" import { IPetDiary } from "../../interfaces/diary/IPetDiary" -const FirstPartTableContentsSchema: Schema = new mongoose.Schema({ +const FirstPartTableContentsSchema: Schema = new mongoose.Schema({ chapter: { type: Number }, From 6baa0f7bf749312c83d1044d9812afcdfe07883b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 18:55:23 +0900 Subject: [PATCH 004/168] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=EB=A9=94=EC=9D=B8=20=ED=99=88=20=EB=B7=B0=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index f3e3507..3b97913 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -45,10 +45,10 @@ module.exports = { //validMemories : [tableContetns [petDiary]] let memoriesResDto = [null,null] - if(validMemories.length == 2){ - for(let i = 0 ; i<2;i++){ - memoriesResDto[i] = new MemoriesResDto(validMemories[i],petId) - } + + if(validMemories.length == 2){ + memoriesResDto[0] = new MemoriesResDto(validMemories[0],petId) + memoriesResDto[1] = new MemoriesResDto(validMemories[1],petId) }else if(validMemories.length >2){ let firstTableContentsIndex = await getRandomNumber(validMemories.length) let secondTableContentsIndex = await getRandomNumber(validMemories.length) @@ -67,11 +67,12 @@ module.exports = { }else if(validMemories.length == 1){ memoriesResDto[0] = new MemoriesResDto(validMemories[0],petId) } + rainbowMainPageResDto.setMemories(memoriesResDto) + //helpResDto const helps = await Help.find() const helpResDto = helps.map(help => new HelpResDto(help)) - rainbowMainPageResDto.setMemories(memoriesResDto) rainbowMainPageResDto.setHelp(helpResDto) return rainbowMainPageResDto From 764188617c4e58eb5aa45b5056fe2e49a0f2c5b2 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 20:18:58 +0900 Subject: [PATCH 005/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=EB=8B=A4=EB=A6=AC=20=EA=B1=B4=EB=84=8C=20=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=95=A0=20=EB=B0=98=EB=A0=A4=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EC=A0=95=EB=B3=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4?= =?UTF-8?q?=EA=B8=B0=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 14 ++++++- src/api/controller/test.ts | 41 ------------------- src/api/router/rainbow/index.ts | 1 + src/api/service/rainbowService.ts | 19 ++++++++- .../mainPageDto/RainbowMainPageResDto.ts | 9 ---- src/dto/rainbow/petDto/RainbowPetResDto.ts | 21 ++++++++++ src/interfaces/pet/IPet.ts | 2 +- src/models/pet/Pet.ts | 13 +++--- src/modules/responseMessage.ts | 1 + 9 files changed, 61 insertions(+), 60 deletions(-) delete mode 100644 src/api/controller/test.ts create mode 100644 src/dto/rainbow/petDto/RainbowPetResDto.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index 8a8ead0..c9ad456 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -7,8 +7,18 @@ module.exports = { mainPage: async (req, res) => { const { userId, petId } = req.params; try { - const result = await rainbowService.getMainPage(userId, petId) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE,result)) + const result = await rainbowService.getMainPage(userId, petId) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + selectRainbowPet: async (req, res) => { + try { + const result = await rainbowService.selectPet(); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) diff --git a/src/api/controller/test.ts b/src/api/controller/test.ts deleted file mode 100644 index b653d5a..0000000 --- a/src/api/controller/test.ts +++ /dev/null @@ -1,41 +0,0 @@ -import express from "express" -import User from "../../models/user/User" -import Pet from "../../models/pet/Pet" - -require("../models/user/User") -require("../models/pet/Pet") - - -const router = express.Router() - -router.get("/",async(req,res)=>{ - try{ - const user = new User({ - email : "test@gmail.com", - password : "asdsasd", - }) - const pet = new Pet({ - name : "코봉", - kind : 1, - gender : 1, - imgs : ["asdasd","asdasd"], - }) - const saveUser = await user.save() - const savePet = await pet.save() - - await saveUser.setPet(pet) - await savePet.setUser(saveUser) - - const result1 = await saveUser.save() - const result2 = await savePet.save() - - console.log('saveUser : '+result1) - console.log('savePet : '+ result2) - res.status(200).send() - }catch(error){ - console.error(error.message); - res.status(500).send("Server Error") - } -}) - -module.exports = router \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 8383eb6..84e47a6 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -3,5 +3,6 @@ const router = express.Router() const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 +router.get('/pet',rainbowController.selectRainbowPet) module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 3b97913..6dd9104 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,6 +1,8 @@ import User from "../../models/user/User" -import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/rainbowMainPageResDto" +import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" +import { findSourceMap } from "module" +import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" require("../../models/user/User") require("../../models/pet/Pet") @@ -85,4 +87,19 @@ module.exports = { return Math.floor(Math.random()*max); } }, + + selectPet : async() => { + try{ + const findUser = await User.find().populate({ + path : "pets" + }) + const rainbowPetResDto = findUser[0].pets.map(pet => + new MyPetInfoResDto(pet)) + + console.log('pets : '+rainbowPetResDto) + return rainbowPetResDto + }catch(err){ + throw err + } + } } \ No newline at end of file diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 2787f6e..7a08e82 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -7,13 +7,6 @@ import mongoose from "mongoose" import PetEmotions from "../../../models/diary/PetEmotions"; import { IBook } from "../../../interfaces/book/IBook"; -interface IRainbowMainPageResDto{ - title : String, - bookImg : String, - memories : Array, - help : Array -} - export class RainbowMainPageResDto{ public rainbowMainPage = { title : null, @@ -23,8 +16,6 @@ export class RainbowMainPageResDto{ } constructor(book : IBook){ - console.log('왜 없대 ?? :'+book) - console.log('왜?? : '+book.title) this.rainbowMainPage.title = book.title//작가와 무지개다리를 건넌 동물의 이름 합친거 this.rainbowMainPage.bookImg = book.imgs //책 이미지에서 맨앞에? } diff --git a/src/dto/rainbow/petDto/RainbowPetResDto.ts b/src/dto/rainbow/petDto/RainbowPetResDto.ts new file mode 100644 index 0000000..d3b1c75 --- /dev/null +++ b/src/dto/rainbow/petDto/RainbowPetResDto.ts @@ -0,0 +1,21 @@ +import {IPet} from "../../../interfaces/pet/IPet" + +export class RainbowPetResDto{ + public pet = [] + + constructor(myPetInfoResDto : MyPetInfoResDto[]){ + this.pet = myPetInfoResDto + } +} + +export class MyPetInfoResDto{ + public _id + public name + public img + + constructor(pet : IPet){ + this._id = pet._id + this.name = pet.name + this.img = pet.imgs + } +} \ No newline at end of file diff --git a/src/interfaces/pet/IPet.ts b/src/interfaces/pet/IPet.ts index 1c8e5c6..7a429f8 100644 --- a/src/interfaces/pet/IPet.ts +++ b/src/interfaces/pet/IPet.ts @@ -7,7 +7,7 @@ export interface IPet extends Document { name: String; kind: Number; gender: Number; - imgs: Array; + imgs: String; user: IUser; book: IBook; rainbow : Boolean; diff --git a/src/models/pet/Pet.ts b/src/models/pet/Pet.ts index 6d184f9..9a800e3 100644 --- a/src/models/pet/Pet.ts +++ b/src/models/pet/Pet.ts @@ -7,11 +7,9 @@ const PetSchema: Schema = new mongoose.Schema({ name: { type: String }, kind: { type: Number }, gender: { type: Number }, - imgs: [ - { - type: String - } - ], + imgs:{ + type: String + }, user: { type: mongoose.SchemaTypes.ObjectId, ref: "User" }, @@ -19,7 +17,10 @@ const PetSchema: Schema = new mongoose.Schema({ type: mongoose.SchemaTypes.ObjectId, ref: "Book:" }, - rainbow: { type: Boolean }, + rainbow: { + type: Boolean, + default: false + }, startDate: { type: Date, default: Date.now() diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index d310694..6957d1a 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -15,6 +15,7 @@ module.exports = { /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", + SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 912f21eeecc045c70e51a6ff54ab2541be3cbdf3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 5 Jul 2021 21:06:59 +0900 Subject: [PATCH 006/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EA=B1=B4=EB=84=8C=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20&=20=EB=AC=B4=EC=A7=80=EA=B0=9C=20?= =?UTF-8?q?=EA=B1=B4=EB=84=8C=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 11 ++++ src/api/router/rainbow/index.ts | 5 +- src/api/service/rainbowService.ts | 65 +++++++++++-------- .../mainPageDto/RainbowMainPageResDto.ts | 4 -- 4 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index c9ad456..50f8db5 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -23,5 +23,16 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + setRainbowPet : async(req,res)=>{ + const petId = req.params.petId + try{ + await rainbowService.isRainbowPet(petId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET)) + }catch(err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 84e47a6..708fe49 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -2,7 +2,8 @@ const express = require('express') const router = express.Router() const rainbowController = require('../../controller/rainbowController') -router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 -router.get('/pet',rainbowController.selectRainbowPet) +router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 +router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 +router.put('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 6dd9104..25cf288 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,8 +1,8 @@ import User from "../../models/user/User" import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" -import { findSourceMap } from "module" import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" +import Pet from "../../models/pet/Pet" require("../../models/user/User") require("../../models/pet/Pet") @@ -24,12 +24,12 @@ module.exports = { path: "book", populate: { path: "tableContents", - populate: { + populate: { path: "firstPartTableContents", - populate : { - path : "petDiary", - populate : { - path : "petEmotions" + populate: { + path: "petDiary", + populate: { + path: "petEmotions" } } } @@ -40,34 +40,34 @@ module.exports = { const firstPartTableContents = findUser.book.tableContents.firstPartTableContents const validMemories = firstPartTableContents.filter(tableContents => - tableContents.petDiary.length>0).map(tableContents => + tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId)) ) //validMemories : [tableContetns [petDiary]] - let memoriesResDto = [null,null] + let memoriesResDto = [null, null] - if(validMemories.length == 2){ - memoriesResDto[0] = new MemoriesResDto(validMemories[0],petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[1],petId) - }else if(validMemories.length >2){ + if (validMemories.length == 2) { + memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) + memoriesResDto[1] = new MemoriesResDto(validMemories[1], petId) + } else if (validMemories.length > 2) { let firstTableContentsIndex = await getRandomNumber(validMemories.length) let secondTableContentsIndex = await getRandomNumber(validMemories.length) - if(firstTableContentsIndex == secondTableContentsIndex){ - while(firstTableContentsIndex == secondTableContentsIndex){ - if(secondTableContentsIndex == firstTableContentsIndex){ + if (firstTableContentsIndex == secondTableContentsIndex) { + while (firstTableContentsIndex == secondTableContentsIndex) { + if (secondTableContentsIndex == firstTableContentsIndex) { secondTableContentsIndex = await getRandomNumber(validMemories.length) - }else{ + } else { break; } } } - memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex],petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex],petId) - }else if(validMemories.length == 1){ - memoriesResDto[0] = new MemoriesResDto(validMemories[0],petId) + memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex], petId) + memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex], petId) + } else if (validMemories.length == 1) { + memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) } rainbowMainPageResDto.setMemories(memoriesResDto) @@ -82,23 +82,32 @@ module.exports = { throw error } - function getRandomNumber(max : number){ + function getRandomNumber(max: number) { max = Math.floor(max); - return Math.floor(Math.random()*max); + return Math.floor(Math.random() * max); } }, - selectPet : async() => { - try{ + selectPet: async () => { + try { const findUser = await User.find().populate({ - path : "pets" + path: "pets" }) - const rainbowPetResDto = findUser[0].pets.map(pet => + const rainbowPetResDto = findUser[0].pets.map(pet => new MyPetInfoResDto(pet)) - console.log('pets : '+rainbowPetResDto) return rainbowPetResDto - }catch(err){ + } catch (err) { + throw err + } + }, + + isRainbowPet: async (petId) => { + try { + const findPet = await Pet.findById(petId) + findPet.rainbow = true + await findPet.save() + } catch (err) { throw err } } diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 7a08e82..fd7775b 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -1,10 +1,6 @@ import { IPetDiary } from "../../../interfaces/diary/IPetDiary"; import { IHelp } from "../../../interfaces/etc/IHelp"; import { IPet } from "../../../interfaces/pet/IPet"; -import { IFirstPartTableContents } from "../../../interfaces/tableContents/IFirstPartTableContents"; -import { IUser } from "../../../interfaces/user/IUser"; -import mongoose from "mongoose" -import PetEmotions from "../../../models/diary/PetEmotions"; import { IBook } from "../../../interfaces/book/IBook"; export class RainbowMainPageResDto{ From b85685bcd70dff9a276d37a7ce33d5bc459585e3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 02:27:05 +0900 Subject: [PATCH 007/168] =?UTF-8?q?feat=20:=201.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20&=201.5=EB=B6=80=20=EC=9D=B4=EB=B3=84?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B4=EC=A7=80=EA=B0=9C=EB=8B=A4?= =?UTF-8?q?=EB=A6=AC=20=EB=A9=98=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 4 ++-- src/api/service/rainbowService.ts | 24 +++++++++++++++++-- .../partingDto/PartingRainbowResDto.ts | 9 +++++++ .../tableContents/FirstPartTableContents.ts | 5 ++-- src/modules/responseMessage.ts | 1 + 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/dto/rainbow/partingDto/PartingRainbowResDto.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index 50f8db5..a5b3ad2 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -28,8 +28,8 @@ module.exports = { setRainbowPet : async(req,res)=>{ const petId = req.params.petId try{ - await rainbowService.isRainbowPet(petId); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET)) + const result = await rainbowService.setPartingRainbowPet(petId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) }catch(err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 25cf288..00792cd 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -3,6 +3,9 @@ import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rai import Help from "../../models/etc/Help" import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import PetDiary from "../../models/diary/PetDiary" +import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" require("../../models/user/User") require("../../models/pet/Pet") @@ -102,11 +105,28 @@ module.exports = { } }, - isRainbowPet: async (petId) => { + setPartingRainbowPet: async (petId) => { try { - const findPet = await Pet.findById(petId) + const findPet = await Pet.findById(petId).populate({ + path : "user", + populate : { + path : "book", + populate : { + path : "tableContents", + populate : { + path : "firstPartTableContents" + } + } + } + }) findPet.rainbow = true await findPet.save() + const user = findPet.user + let epilogueCount = 0 + user.book.tableContents.firstPartTableContents.forEach(tableContent => + epilogueCount += tableContent.petDiary.length) + + return new PartingRainbowResDto(epilogueCount,findPet.name) } catch (err) { throw err } diff --git a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts new file mode 100644 index 0000000..f4b0d1d --- /dev/null +++ b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts @@ -0,0 +1,9 @@ +export class PartingRainbowResDto{ + public partingRainbowBridge = { + contents : "" + } + + constructor(epilogueCount : Number, petName : String){ + this.partingRainbowBridge.contents =`작가님과 함께했던 ${epilogueCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.` + } +} \ No newline at end of file diff --git a/src/models/tableContents/FirstPartTableContents.ts b/src/models/tableContents/FirstPartTableContents.ts index 605c154..ed7084b 100644 --- a/src/models/tableContents/FirstPartTableContents.ts +++ b/src/models/tableContents/FirstPartTableContents.ts @@ -4,7 +4,8 @@ import { IPetDiary } from "../../interfaces/diary/IPetDiary" const FirstPartTableContentsSchema: Schema = new mongoose.Schema({ chapter: { - type: Number + type: Number, + default : 0 }, title: { type: String @@ -17,7 +18,7 @@ const FirstPartTableContentsSchema: Schema = ne { type: mongoose.SchemaTypes.ObjectId, ref: "PetDiary", - default : null + default : [] } ] }) diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 6957d1a..c1c4761 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -16,6 +16,7 @@ module.exports = { /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", + SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 6df3d08fe9bfe286210a67c41267fe437b5ac132 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 02:28:26 +0900 Subject: [PATCH 008/168] =?UTF-8?q?feat=20:=201.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20&=201.5=EB=B6=80=20=EC=9D=B4=EB=B3=84?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B4=EC=A7=80=EA=B0=9C=EB=8B=A4?= =?UTF-8?q?=EB=A6=AC=20=EB=A9=98=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/router/rainbow/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 708fe49..9925eba 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -4,6 +4,6 @@ const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 -router.put('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 +router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 module.exports = router; \ No newline at end of file From ecb76d3dd3201890f3dabad310b581cd8231e709 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 03:40:07 +0900 Subject: [PATCH 009/168] =?UTF-8?q?feat=20:=201.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EC=9D=B4=EB=B3=84=EC=97=90=20=EC=A4=80?= =?UTF-8?q?=EB=B9=84=ED=95=98=EB=8A=94=20=EC=9E=91=EA=B0=80=EC=9D=98=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=8B=9C=EC=9E=91=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 17 ++++++-- src/api/router/rainbow/index.ts | 3 +- src/api/service/rainbowService.ts | 40 ++++++++++++++++--- .../partingDto/PartingRainbowResDto.ts | 4 +- .../ReadyPartingAndStartRecordResDto.ts | 23 +++++++++++ src/modules/dateMethod.ts | 31 ++++++++++++++ src/modules/responseMessage.ts | 1 + 7 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts create mode 100644 src/modules/dateMethod.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index a5b3ad2..ad9496f 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -25,12 +25,23 @@ module.exports = { } }, - setRainbowPet : async(req,res)=>{ + setRainbowPet: async (req, res) => { const petId = req.params.petId - try{ + try { const result = await rainbowService.setPartingRainbowPet(petId); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) - }catch(err) { + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + getReadyPartingPetComment: async (req, res) => { + const petId = req.params.petId + try { + const result = await rainbowService.getReadyPartingPetComment(petId) + res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) + } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 9925eba..413715c 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -4,6 +4,7 @@ const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 -router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 +router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 +router.get('/record/:petId',rainbowController.getReadyPartingPetComment) module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 00792cd..d9f5326 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -3,9 +3,9 @@ import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rai import Help from "../../models/etc/Help" import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" -import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" -import PetDiary from "../../models/diary/PetDiary" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" +import { ReadyPartingAndStartRecordResDto,BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/readyPartingAndStartRecordResDto" +const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") require("../../models/pet/Pet") @@ -122,13 +122,43 @@ module.exports = { findPet.rainbow = true await findPet.save() const user = findPet.user - let epilogueCount = 0 + let diaryCount = 0 user.book.tableContents.firstPartTableContents.forEach(tableContent => - epilogueCount += tableContent.petDiary.length) + diaryCount += tableContent.petDiary.length) - return new PartingRainbowResDto(epilogueCount,findPet.name) + return new PartingRainbowResDto(diaryCount,findPet.name) } catch (err) { throw err } + }, + + getReadyPartingPetComment: async(petId) =>{ + try{ + const pet = await Pet.findById(petId).populate({ + path : "user", + populate : { + path : "book", + populate : { + path : "tableContents", + populate : { + path : "firstPartTableContents" + } + } + } + }) + + const user = pet.user + const bookInfo = new BookInfoResDto(pet.user.book) + let diaryCount = 0 + user.book.tableContents.firstPartTableContents.forEach(tableContent => + diaryCount += tableContent.petDiary.length) + + const startDate = pet.startDate + const dayTogether = await dateMethod.getElapsedDay(startDate) + + return new ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo) + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts index f4b0d1d..056ae47 100644 --- a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts +++ b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts @@ -3,7 +3,7 @@ export class PartingRainbowResDto{ contents : "" } - constructor(epilogueCount : Number, petName : String){ - this.partingRainbowBridge.contents =`작가님과 함께했던 ${epilogueCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.` + constructor(diaryCount : Number, petName : String){ + this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.` } } \ No newline at end of file diff --git a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts new file mode 100644 index 0000000..9fb07e9 --- /dev/null +++ b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts @@ -0,0 +1,23 @@ +import { IBook } from "../../../interfaces/book/IBook"; + +export class ReadyPartingAndStartRecordResDto{ + diaryCount = 0; + dayTogether = 0; + bookInfo = {} + + constructor(diaryCount : number, dayTogether : number, bookInfo : BookInfoResDto){ + this.diaryCount = diaryCount + this.dayTogether = dayTogether + this.bookInfo = bookInfo + } +} + +export class BookInfoResDto{ + title = null; + bookImg = null; + + constructor(book : IBook){ + this.title = book.title + this.bookImg = book.imgs + } +} \ No newline at end of file diff --git a/src/modules/dateMethod.ts b/src/modules/dateMethod.ts new file mode 100644 index 0000000..1ec28ad --- /dev/null +++ b/src/modules/dateMethod.ts @@ -0,0 +1,31 @@ +module.exports = { + toStringByFormatting : async(source) => { + const year = source.getFullYear() + const month = leftPad(source.getMonth() + 1); + const day = leftPad(source.getDate()) + + return [year, month, day].join('.') + + function leftPad(value){ + if(value >= 10){ + return value + } + return `0${value}` + } + }, + + getElapsedDay : async(startDate : Date) => { + const now = new Date() + const year = now.getFullYear() + const month = now.getMonth() + const day = now.getDate() + + startDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate()) + const endDate = new Date(year,month,day) + + const elapsedMs = endDate.getTime() - startDate.getTime() + const elapsedDay = elapsedMs / (1000*60*60*24) + + return elapsedDay + } +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index c1c4761..2842e09 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -17,6 +17,7 @@ module.exports = { SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", + SUCCESS_GET_READY_PARTING_PET_COMMENT : "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From b12d7e11cb30101159d419d320c0f5ec6139c3b8 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 16:59:40 +0900 Subject: [PATCH 010/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EC=9E=91=EA=B0=80=EC=9D=98=20=EB=A7=90=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 22 +++++++ src/api/router/rainbow/index.ts | 4 +- src/api/service/rainbowService.ts | 59 ++++++++++++++++++- .../tableContents/ISecondPartTableContents.ts | 1 + .../tableContents/SecondPartTableContent.ts | 17 +++++- src/modules/responseMessage.ts | 1 + 6 files changed, 99 insertions(+), 5 deletions(-) diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index ad9496f..82792a2 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -45,5 +45,27 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + theBestMoment: async (req, res) => { //보류 무지개 로직 제일 마지막에 구현 + try { + + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + postEpilogue: async (req, res) => { + const { userId, petId } = req.params + const data = req.body + try { + await rainbowService.postEpilogue(userId,petId,data) + const result = await rainbowService.getMainPage(userId, petId) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_EPILOGUE, result)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 413715c..b41deef 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -5,6 +5,8 @@ const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 -router.get('/record/:petId',rainbowController.getReadyPartingPetComment) +router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 +router.get('/moment/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 +router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index d9f5326..0d0e938 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -5,6 +5,8 @@ import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" import { ReadyPartingAndStartRecordResDto,BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/readyPartingAndStartRecordResDto" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") @@ -155,10 +157,65 @@ module.exports = { const startDate = pet.startDate const dayTogether = await dateMethod.getElapsedDay(startDate) - + return new ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo) }catch(err){ throw err } + }, + + postEpilogue: async(userId,petId,data)=>{ + try{ + const user = await User.findById(userId).populate({ + path : "book", + populate : ({ + path : "tableContents", + populate : ({ + path : "firstPartTableContents secondPartTableContents" + }) + }) + }) + const tableContents = user.book.tableContents + + console.log('user : '+tableContents) + console.log('first : '+user.book.tableContents.firstPartTableContents) + console.log('second : '+user.book.tableContents.secondPartTableContents) + + //1부 목차 마지막에 에필로그 + const firstPartEpilogue = new FirstPartTableContents({ + chapter : -1, + title : "작가의 말", + contents : data.content + }) + await firstPartEpilogue.save() + await tableContents.firstPartTableContents.push(firstPartEpilogue) + + //2부 목차 처음에 에필로그 + const secondPartEpilogue = new SecondPartTableContent({ + chapter : 0, + title : "작가의 말", + contents : data.content + }) + await secondPartEpilogue.save() + await tableContents.secondPartTableContents.push(secondPartEpilogue) + + const season = ["봄","여름","가을","겨울"] + for(let i = 0;i<4;i++){ + let chapter = 1 + const dummySecondPartTableContents = new SecondPartTableContent({ + chapter, + title : `${user.book.author}의 ${season[i]}` + }) + await dummySecondPartTableContents.save() + await tableContents.secondPartTableContents.push(dummySecondPartTableContents) + chapter = chapter+1 + } + const test = await tableContents.save() + console.log('!!!!!!!!!!!!!!!! : '+test) + + return user + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/interfaces/tableContents/ISecondPartTableContents.ts b/src/interfaces/tableContents/ISecondPartTableContents.ts index 2ab3aef..6e0cc49 100644 --- a/src/interfaces/tableContents/ISecondPartTableContents.ts +++ b/src/interfaces/tableContents/ISecondPartTableContents.ts @@ -5,6 +5,7 @@ export interface ISecondPartTableContents extends Document{ _id : mongoose.Types.ObjectId; chapter : Number; title : String; + contents : String; userDiary : Array; } diff --git a/src/models/tableContents/SecondPartTableContent.ts b/src/models/tableContents/SecondPartTableContent.ts index 7f533f8..7f8ce54 100644 --- a/src/models/tableContents/SecondPartTableContent.ts +++ b/src/models/tableContents/SecondPartTableContent.ts @@ -3,12 +3,23 @@ import { IUserDiary } from "../../interfaces/diary/IUserDiary" import { ISecondPartTableContentsDocument, ISecondPartTableContentsModel } from "../../interfaces/tableContents/ISecondPartTableContents" const SecondPartTableContentsSchema: Schema = new mongoose.Schema({ - chapter: { type: Number }, - title: { type: String }, + chapter: { + type: Number, + default : 0 + }, + title: { + type: String, + default : null + }, + contents : { + type : String, + default : null + }, userDiary: [ { type: mongoose.SchemaTypes.ObjectId, - ref: "UserDiary" + ref: "UserDiary", + default: [] } ] }) diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 2842e09..2a865f4 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -18,6 +18,7 @@ module.exports = { SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", SUCCESS_GET_READY_PARTING_PET_COMMENT : "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", + SUCCESS_POST_EPILOGUE : "1부 끝 작가의말 - 에필로그 작성 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From cae3cc151fce62ec58d175bb88e394d188a27524 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 17:45:31 +0900 Subject: [PATCH 011/168] =?UTF-8?q?refactor=20:=201.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EC=A0=9C=EB=AA=A9=20=EB=8F=99=EC=A0=81?= =?UTF-8?q?=ED=95=A0=EB=8B=B9=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 16 ++++++++++++++-- .../rainbow/mainPageDto/RainbowMainPageResDto.ts | 5 +++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 0d0e938..5fe84cf 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -3,6 +3,7 @@ import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rai import Help from "../../models/etc/Help" import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" +import { IPet } from "../../interfaces/pet/IPet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" import { ReadyPartingAndStartRecordResDto,BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/readyPartingAndStartRecordResDto" import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" @@ -41,7 +42,9 @@ module.exports = { } }) - const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book) + const isRainbowPet = await isRainbow(findUser.pets) + console.log('######## : '+isRainbowPet) + const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet) const firstPartTableContents = findUser.book.tableContents.firstPartTableContents const validMemories = firstPartTableContents.filter(tableContents => @@ -87,10 +90,19 @@ module.exports = { throw error } - function getRandomNumber(max: number) { + async function getRandomNumber(max: number) { max = Math.floor(max); return Math.floor(Math.random() * max); } + function isRainbow(pets : IPet[]){ + let rainbow = false + pets.forEach(pet =>{ + if(pet.rainbow === true){ + rainbow = true + } + }) + return rainbow + } }, selectPet: async () => { diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index fd7775b..fa1855f 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -11,8 +11,9 @@ export class RainbowMainPageResDto{ help : [] } - constructor(book : IBook){ - this.rainbowMainPage.title = book.title//작가와 무지개다리를 건넌 동물의 이름 합친거 + constructor(book : IBook,isRainbowPet : Boolean){ + console.log('$$$$$ : '+isRainbowPet) + this.rainbowMainPage.title = isRainbowPet ? "우리들의 무지개" : "무지개 준비하기"//작가와 무지개다리를 건넌 동물의 이름 합친거 this.rainbowMainPage.bookImg = book.imgs //책 이미지에서 맨앞에? } From 2f16322d39a7e6f75871ae001225ed8b0d748d60 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 19:25:15 +0900 Subject: [PATCH 012/168] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=ED=99=88=EB=B7=B0=EC=97=90=EC=84=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94=20rainbowCheck=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20DTO=EC=97=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 2 +- src/api/service/rainbowService.ts | 26 +++++++++++-------- .../mainPageDto/RainbowMainPageResDto.ts | 7 ++--- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index 82792a2..ae4ddc8 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -60,7 +60,7 @@ module.exports = { const { userId, petId } = req.params const data = req.body try { - await rainbowService.postEpilogue(userId,petId,data) + await rainbowService.postEpilogue(userId,data) const result = await rainbowService.getMainPage(userId, petId) res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_EPILOGUE, result)) } catch (err) { diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 5fe84cf..d130461 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -43,8 +43,8 @@ module.exports = { }) const isRainbowPet = await isRainbow(findUser.pets) - console.log('######## : '+isRainbowPet) - const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet) + const rainbowButtonCheck = await rainbowCheck(findUser.pets) + const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck) const firstPartTableContents = findUser.book.tableContents.firstPartTableContents const validMemories = firstPartTableContents.filter(tableContents => @@ -90,7 +90,7 @@ module.exports = { throw error } - async function getRandomNumber(max: number) { + function getRandomNumber(max: number) { max = Math.floor(max); return Math.floor(Math.random() * max); } @@ -103,6 +103,15 @@ module.exports = { }) return rainbow } + function rainbowCheck(pets : IPet[]){ + let check = true + pets.forEach(pet=>{ + if(pet.rainbow === false){ + check = false + } + }) + return check + } }, selectPet: async () => { @@ -176,7 +185,7 @@ module.exports = { } }, - postEpilogue: async(userId,petId,data)=>{ + postEpilogue: async(userId,data)=>{ try{ const user = await User.findById(userId).populate({ path : "book", @@ -189,15 +198,11 @@ module.exports = { }) const tableContents = user.book.tableContents - console.log('user : '+tableContents) - console.log('first : '+user.book.tableContents.firstPartTableContents) - console.log('second : '+user.book.tableContents.secondPartTableContents) - //1부 목차 마지막에 에필로그 const firstPartEpilogue = new FirstPartTableContents({ chapter : -1, title : "작가의 말", - contents : data.content + contents : data.contents }) await firstPartEpilogue.save() await tableContents.firstPartTableContents.push(firstPartEpilogue) @@ -206,7 +211,7 @@ module.exports = { const secondPartEpilogue = new SecondPartTableContent({ chapter : 0, title : "작가의 말", - contents : data.content + contents : data.contents }) await secondPartEpilogue.save() await tableContents.secondPartTableContents.push(secondPartEpilogue) @@ -223,7 +228,6 @@ module.exports = { chapter = chapter+1 } const test = await tableContents.save() - console.log('!!!!!!!!!!!!!!!! : '+test) return user }catch(err){ diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index fa1855f..7898164 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -7,14 +7,15 @@ export class RainbowMainPageResDto{ public rainbowMainPage = { title : null, bookImg : null, + rainbowCheck : false, memories : [], help : [] } - constructor(book : IBook,isRainbowPet : Boolean){ - console.log('$$$$$ : '+isRainbowPet) + constructor(book : IBook,isRainbowPet : boolean,rainbowButtonCheck : boolean){ this.rainbowMainPage.title = isRainbowPet ? "우리들의 무지개" : "무지개 준비하기"//작가와 무지개다리를 건넌 동물의 이름 합친거 - this.rainbowMainPage.bookImg = book.imgs //책 이미지에서 맨앞에? + this.rainbowMainPage.bookImg = book.imgs + this.rainbowMainPage.rainbowCheck = rainbowButtonCheck } setMemories(memories : MemoriesResDto[]){ From d40e11ad51ffab4eb791f30034c47402fbf3155e Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 19:32:42 +0900 Subject: [PATCH 013/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EC=B5=9C=EA=B3=A0=EC=9D=98=20=EC=88=9C=EA=B0=84=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 14 ++++++++------ src/api/router/rainbow/index.ts | 4 ++-- src/api/service/rainbowService.ts | 8 ++++++++ src/modules/responseMessage.ts | 1 + 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index ae4ddc8..63f7852 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -8,7 +8,7 @@ module.exports = { const { userId, petId } = req.params; try { const result = await rainbowService.getMainPage(userId, petId) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -18,7 +18,7 @@ module.exports = { selectRainbowPet: async (req, res) => { try { const result = await rainbowService.selectPet(); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -29,7 +29,7 @@ module.exports = { const petId = req.params.petId try { const result = await rainbowService.setPartingRainbowPet(petId); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -40,7 +40,7 @@ module.exports = { const petId = req.params.petId try { const result = await rainbowService.getReadyPartingPetComment(petId) - res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) + return res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -48,8 +48,10 @@ module.exports = { }, theBestMoment: async (req, res) => { //보류 무지개 로직 제일 마지막에 구현 + const { userId, petId } = req.params try { - + const result = await rainbowService.getTheBestMoment(userId, petId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_BEST_MOMENT, result, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -60,7 +62,7 @@ module.exports = { const { userId, petId } = req.params const data = req.body try { - await rainbowService.postEpilogue(userId,data) + await rainbowService.postEpilogue(userId, data) const result = await rainbowService.getMainPage(userId, petId) res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_EPILOGUE, result)) } catch (err) { diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index b41deef..0746e2f 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -6,7 +6,7 @@ router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 -router.get('/moment/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 -router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) +router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 +router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) //1.5부 작가의 말 작성 module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index d130461..8fb05f8 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -185,6 +185,14 @@ module.exports = { } }, + getTheBestMoment: async(userId, petId)=>{ + try{ + + }catch(err){ + throw err + } + }, + postEpilogue: async(userId,data)=>{ try{ const user = await User.findById(userId).populate({ diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 2a865f4..cc3d400 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -18,6 +18,7 @@ module.exports = { SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", SUCCESS_GET_READY_PARTING_PET_COMMENT : "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", + SUCCESS_GET_BEST_MOMENT : "최고의 순간 불러오기 성공", SUCCESS_POST_EPILOGUE : "1부 끝 작가의말 - 에필로그 작성 성공", /* 서버에러 */ From dbfa6661f19f2889af596e5f7430e9eb396ba895 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 6 Jul 2021 19:37:08 +0900 Subject: [PATCH 014/168] =?UTF-8?q?refactor=20:=20=EC=8A=A4=ED=82=A4?= =?UTF-8?q?=EB=A7=88=20=EB=B0=B0=EC=97=B4=20=EC=83=9D=EC=84=B1=EC=8B=9C=20?= =?UTF-8?q?=EB=B9=88=EB=B0=B0=EC=97=B4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/diary/PetDiary.ts | 4 +++- src/models/diary/UserDiary.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/models/diary/PetDiary.ts b/src/models/diary/PetDiary.ts index 8f6df6e..4532af4 100644 --- a/src/models/diary/PetDiary.ts +++ b/src/models/diary/PetDiary.ts @@ -24,12 +24,14 @@ const PetDiarySchema : Schema= new mongoose.Schema({ imgs : [ { type : String, + default : [] } ], petEmotions : [ { type : mongoose.SchemaTypes.ObjectId, - ref : "PetEmotions" + ref : "PetEmotions", + default : [] } ], episode : { diff --git a/src/models/diary/UserDiary.ts b/src/models/diary/UserDiary.ts index b1aa164..7a8b4be 100644 --- a/src/models/diary/UserDiary.ts +++ b/src/models/diary/UserDiary.ts @@ -7,7 +7,8 @@ const UserDiarySchema : Schema = new mongoose.Schema({ contents : {type : String}, imgs : [ { - type : String + type : String, + default : [] } ], feeling : {type : Number}, From b58cf696330ebbe6d20b6aba8c78e0cc9ef5be1e Mon Sep 17 00:00:00 2001 From: soleu Date: Wed, 7 Jul 2021 01:33:51 +0900 Subject: [PATCH 015/168] =?UTF-8?q?feat=20:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8,?= =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85,=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - post 메소드를 이용 - 회원가입 절차에서 book 객체 생성 --- node_modules/.yarn-integrity | 6 ++- package.json | 1 + src/api/controller/petController.ts | 24 +++++++++ src/api/controller/userController.ts | 38 +++++++++++++++ src/api/router/index.ts | 5 +- src/api/router/pet/index.ts | 6 +++ src/api/router/rainbow/index.ts | 8 +-- src/api/router/user/index.ts | 9 ++++ src/api/service/petService.ts | 46 ++++++++++++++++++ src/api/service/rainbowService.ts | 2 +- src/api/service/userService.ts | 73 ++++++++++++++++++++++++++++ src/index.ts | 3 +- src/interfaces/pet/IPet.ts | 8 +-- src/models/pet/Pet.ts | 4 +- src/modules/responseMessage.ts | 11 ++++- tsconfig.json | 3 +- yarn.lock | 18 +++++++ 17 files changed, 249 insertions(+), 16 deletions(-) create mode 100644 src/api/controller/petController.ts create mode 100644 src/api/controller/userController.ts create mode 100644 src/api/router/pet/index.ts create mode 100644 src/api/router/user/index.ts create mode 100644 src/api/service/petService.ts create mode 100644 src/api/service/userService.ts diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index aa310f6..a226b3b 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "win32-x64-72", + "systemParams": "win32-x64-83", "modulesFolders": [ "node_modules" ], @@ -10,6 +10,7 @@ "@types/node@^15.12.5", "bcryptjs@^2.4.3", "dotenv@^10.0.0", + "express-validator@^6.12.0", "express@^4.17.1", "mongoose@^5.13.0", "ts-node@^10.0.0", @@ -59,6 +60,7 @@ "encodeurl@~1.0.2": "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59", "escape-html@~1.0.3": "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988", "etag@~1.8.1": "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887", + "express-validator@^6.12.0": "https://registry.yarnpkg.com/express-validator/-/express-validator-6.12.0.tgz#a9cd49b3fe4c470abb615ae2e7dd111053c25f66", "express@^4.17.1": "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134", "finalhandler@~1.1.2": "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d", "forwarded@0.2.0": "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811", @@ -72,6 +74,7 @@ "ipaddr.js@1.9.1": "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3", "isarray@~1.0.0": "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11", "kareem@2.3.2": "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93", + "lodash@^4.17.21": "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c", "make-error@^1.1.1": "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2", "media-typer@0.3.0": "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748", "memory-pager@^1.0.2": "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5", @@ -129,6 +132,7 @@ "unpipe@~1.0.0": "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec", "util-deprecate@~1.0.1": "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf", "utils-merge@1.0.1": "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713", + "validator@^13.5.2": "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059", "vary@~1.1.2": "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc", "yn@3.1.1": "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" }, diff --git a/package.json b/package.json index 3b3476f..be2802f 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "bcryptjs": "^2.4.3", "dotenv": "^10.0.0", "express": "^4.17.1", + "express-validator": "^6.12.0", "mongoose": "^5.13.0" } } diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts new file mode 100644 index 0000000..7d0a615 --- /dev/null +++ b/src/api/controller/petController.ts @@ -0,0 +1,24 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const petService = require('../service/petService') + + +module.exports = { + registerPet: async (req, res) => { + let reqData=req.body; + console.log(req.body) + try { + const result = await petService.registerPet(reqData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, "")) + } catch (err) { + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error(err) + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } +} +export{}; \ No newline at end of file diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts new file mode 100644 index 0000000..92eb64f --- /dev/null +++ b/src/api/controller/userController.ts @@ -0,0 +1,38 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const userService = require('../service/userService') +import User from '../../models/user/User' +import Pet from '../../models/pet/Pet' + +module.exports = { + //register user + register: async (req, res) => { + const { email, password } = req.body; + try { + const result = await userService.register(email, password); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS, result)) + } catch (err) { + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error(err) + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + login: async (req, res) => { + const { email, password } = req.body; + try { + const result = await userService.login(email, password); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGN_IN_SUCCESS, "")) + } catch (err) { + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error(err) + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } +} \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 494404c..33c080b 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,9 @@ import express from "express" -const router = express.Router() +const router = express.Router(); router.use('/rainbow',require('./rainbow')) //무지개 +router.use('/user',require('./user'))//user +router.use('/pet',require('./pet'))//pet +//router.use('/book',require('./book'));//book module.exports = router; \ No newline at end of file diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts new file mode 100644 index 0000000..98301c2 --- /dev/null +++ b/src/api/router/pet/index.ts @@ -0,0 +1,6 @@ +const express = require('express') +const router = express.Router() +const petController = require('../../controller/petController') + +router.post('/register',petController.registerPet) //register pet +module.exports = router; \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 8383eb6..922a8f5 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -1,7 +1,9 @@ -const express = require('express') -const router = express.Router() +const express = require('express'); +const router = express.Router(); const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 -module.exports = router; \ No newline at end of file +module.exports = router; +//solve error TS2451 : Cannot redeclare block-scoped variable +export{}; \ No newline at end of file diff --git a/src/api/router/user/index.ts b/src/api/router/user/index.ts new file mode 100644 index 0000000..18bdb53 --- /dev/null +++ b/src/api/router/user/index.ts @@ -0,0 +1,9 @@ +const express = require('express') +const router = express.Router() +const userController = require('../../controller/userController') +import { check, validationResult } from "express-validator"; + +router.post('/register',userController.register) //user register +router.post('/login',userController.login) //user login + +module.exports=router; \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts new file mode 100644 index 0000000..96f5ecf --- /dev/null +++ b/src/api/service/petService.ts @@ -0,0 +1,46 @@ +import { Request, Response, NextFunction } from 'express' +import User from '../../models/user/User' +import Pet from '../../models/pet/Pet' +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const util = require('../../modules/util') +const petService = require('../service/petService') +var mongoose = require('mongoose') + +require("../../models/user/User") +require("../../models/pet/Pet") +module.exports = { + registerPet: async (reqData) => { + try{ + //error handling + let pets=[]; + const startDate= new Date(reqData.pets[0].startDate) + startDate.setDate(startDate.getDate() + 1); + for (let i = 0; i < reqData.pets.length; i++) { + let pet = new Pet({ + name: reqData.pets[i].name, + kind: reqData.pets[i].kind, + gender: reqData.pets[i].gender, + imgs: reqData.pets[i].petImages, + user: mongoose.Types.ObjectId(reqData._id), + rainbow: false, + startDate: new Date(startDate) + + // findUser, UserId만 해서 되면 가능 + //book://나중에 책을 등록할때, pet에 book을 등록. 연관관계 확인. 안들어가있는게 있으면 나중에 같이 넣어야됨. + //SETTER사용. pet 찾아서 setter로 넣기. + }); + pets[i]=pet; + } + console.log(reqData); + //db save + for (let i = 0; i < pets.length; i++) { + await pets[i].save(); + } + return responseMessage.SUCCESS_REGISTER_PET; + }catch(err){ + console.log(err) + throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; + } + } +} \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 69b1390..18371b5 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,6 +1,6 @@ import User from "../../models/user/User" import Pet from "../../models/pet/Pet" -import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/rainbowMainPageResDto" +import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" require("../../models/user/User") diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts new file mode 100644 index 0000000..ac8190c --- /dev/null +++ b/src/api/service/userService.ts @@ -0,0 +1,73 @@ +import { Request, Response, NextFunction } from 'express' +import User from '../../models/user/User' +import Book from '../../models/book/Book' +import Pet from '../../models/pet/Pet' +import bcrypt from 'bcryptjs' +import { check, validationResult } from "express-validator"; +const validator = require('validator'); +require("../../models/user/User") +require("../../models/pet/Pet") +require("../../models/book/Book") +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +module.exports = { + register: + async (email, password) => { + //See if user exists(check valid email) + const errors = validationResult(email); + if (!errors.isEmpty()) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; + } + if (!validator.isEmail(email) || !validator.isLength(password, { min: 8 })) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.WRONG_FORM }; + } + + let user = await User.findOne({ email }); + if (user) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.ALREADY_ID }; + } + + user = new User({ + email, + password + }); + + //Encrpyt password + const salt = await bcrypt.genSalt(10); + user.password = await bcrypt.hash(password, salt); + + //Create book object + const book = new Book() + user.setBook(book); + + //db save + await user.save(); + + return {bookId:book._id}; + }, + login: async (email, password) => { + const errors = validationResult(email); + if (!errors.isEmpty()) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; + } + let user = await User.findOne({ email }); + if (!user) { + //등록되지 않은 email + throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; + } + bcrypt.compare(password, user.password, function (err, isMatch) { + if (err) { + return console.log(err) + } else if (!isMatch) { + //return fail + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.MISS_MATCH_PW }; + } else { + //result==true + console.log("password matches"); + return responseMessage.SIGN_IN_SUCCESS; + } + }) + } +} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index f7ef43d..f848ca0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -9,7 +9,6 @@ app.use(express.json()); // Define Routes app.use('/api',require('./api/router/index')) - // error handler app.use(function (err, req, res, next) { // set locals, only providing error in development @@ -32,4 +31,4 @@ app .on("error", (err) => { console.error(err); process.exit(1); - }); + }); \ No newline at end of file diff --git a/src/interfaces/pet/IPet.ts b/src/interfaces/pet/IPet.ts index 1c8e5c6..296b7c5 100644 --- a/src/interfaces/pet/IPet.ts +++ b/src/interfaces/pet/IPet.ts @@ -3,13 +3,13 @@ import { IUser } from "../user/IUser" import { IBook } from "../book/IBook" export interface IPet extends Document { - _id: mongoose.Types.ObjectId; + _id?: mongoose.Types.ObjectId; name: String; kind: Number; gender: Number; - imgs: Array; - user: IUser; - book: IBook; + imgs: String; + user?: IUser; + book?: IBook; rainbow : Boolean; startDate: Date; } diff --git a/src/models/pet/Pet.ts b/src/models/pet/Pet.ts index 6d184f9..8564349 100644 --- a/src/models/pet/Pet.ts +++ b/src/models/pet/Pet.ts @@ -7,11 +7,11 @@ const PetSchema: Schema = new mongoose.Schema({ name: { type: String }, kind: { type: Number }, gender: { type: Number }, - imgs: [ + imgs: { type: String } - ], + , user: { type: mongoose.SchemaTypes.ObjectId, ref: "User" }, diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index d310694..791edfc 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -6,13 +6,22 @@ module.exports = { /* 회원가입 */ SIGN_UP_SUCCESS: "회원가입성공", SIGN_UP_FAIL: "회원 가입 실패", + ALREADY_ID: "존재하는 ID 입니다.", + EMPTY_ID: "이메일을 입력해주세요", + WRONG_FORM:"유효하지 않은 형식입니다.", + + /* 로그인 */ SIGN_IN_SUCCESS: "로그인 성공", SIGN_IN_FAIL: "로그인 실패", - ALREADY_ID: "존재하는 ID 입니다.", NO_USER: "존재하지않는 유저 id 입니다.", MISS_MATCH_PW: "비밀번호가 일치하지 않습니다", MISS_MATCH: "아이디나 비밀번호가 일치하지 않습니다.", + /* 반려동물 등록 (by 솔)*/ + SUCCESS_REGISTER_PET: "반려동물 등록 성공", + + /*1부 반려동물 일기 (by 솔)*/ + /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", diff --git a/tsconfig.json b/tsconfig.json index def7395..e6b0bd3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,8 @@ "allowJs": true, "noEmit": false, "esModuleInterop": true, - "typeRoots": ["./src/types/express.d.ts", "./node_modules/@types"] + "typeRoots": ["./src/types/express.d.ts", "./node_modules/@types"], + "lib":["es6"] }, "include": ["./src/**/*"], "exclude": ["node_modules", "tests"] diff --git a/yarn.lock b/yarn.lock index b48f414..3c5edf0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -257,6 +257,14 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +express-validator@^6.12.0: + version "6.12.0" + resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.12.0.tgz#a9cd49b3fe4c470abb615ae2e7dd111053c25f66" + integrity sha512-lcQAdVeAO+pBbHD33nIsDsd+QPakLX08tJ82iEsXj6ezyWCfYjE9RY/g9SVq5z4G0NaIkH8039Oe4r0G92DRyA== + dependencies: + lodash "^4.17.21" + validator "^13.5.2" + express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -370,6 +378,11 @@ kareem@2.3.2: resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93" integrity sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ== +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -704,6 +717,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +validator@^13.5.2: + version "13.6.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059" + integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg== + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" From 93ee5b0dcebe924d3ab6f9856a31d2d041754655 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 02:30:27 +0900 Subject: [PATCH 016/168] =?UTF-8?q?refactor=20:=202=EB=B6=80=20=EC=9E=91?= =?UTF-8?q?=EA=B0=80=EC=9D=98=20=EB=A7=90=20=EB=93=B1=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 151 +++++++++++------- .../theBestMomentDto/TheBestMomentResDto.ts | 45 ++++++ 2 files changed, 138 insertions(+), 58 deletions(-) create mode 100644 src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 8fb05f8..e7940a3 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -5,9 +5,12 @@ import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" import { IPet } from "../../interfaces/pet/IPet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" -import { ReadyPartingAndStartRecordResDto,BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/readyPartingAndStartRecordResDto" +import { ReadyPartingAndStartRecordResDto, BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto" import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +import { TheBestMomentDiary } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") @@ -43,7 +46,7 @@ module.exports = { }) const isRainbowPet = await isRainbow(findUser.pets) - const rainbowButtonCheck = await rainbowCheck(findUser.pets) + const rainbowButtonCheck = await rainbowCheck(findUser.pets) const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck) const firstPartTableContents = findUser.book.tableContents.firstPartTableContents @@ -94,19 +97,19 @@ module.exports = { max = Math.floor(max); return Math.floor(Math.random() * max); } - function isRainbow(pets : IPet[]){ + function isRainbow(pets: IPet[]) { let rainbow = false - pets.forEach(pet =>{ - if(pet.rainbow === true){ + pets.forEach(pet => { + if (pet.rainbow === true) { rainbow = true } }) return rainbow } - function rainbowCheck(pets : IPet[]){ + function rainbowCheck(pets: IPet[]) { let check = true - pets.forEach(pet=>{ - if(pet.rainbow === false){ + pets.forEach(pet => { + if (pet.rainbow === false) { check = false } }) @@ -131,13 +134,13 @@ module.exports = { setPartingRainbowPet: async (petId) => { try { const findPet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" + path: "user", + populate: { + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents" } } } @@ -149,22 +152,22 @@ module.exports = { user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length) - return new PartingRainbowResDto(diaryCount,findPet.name) + return new PartingRainbowResDto(diaryCount, findPet.name) } catch (err) { throw err } }, - getReadyPartingPetComment: async(petId) =>{ - try{ + getReadyPartingPetComment: async (petId) => { + try { const pet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" + path: "user", + populate: { + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents" } } } @@ -180,27 +183,53 @@ module.exports = { const dayTogether = await dateMethod.getElapsedDay(startDate) return new ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo) - }catch(err){ + } catch (err) { throw err } }, - getTheBestMoment: async(userId, petId)=>{ - try{ + getTheBestMoment: async (userId, petId) => { + try { + const loveDiary = await PetEmotions.find({ "feeling": { $eq: 1 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + const joyDiary = await PetEmotions.find({ "feeling": { $eq: 2 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + const normalDiary = await PetEmotions.find({ "feeling": { $eq: 3 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + const blackBileDiary = await PetEmotions.find({ "feeling": { $eq: 4 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + const angryDiary = await PetEmotions.find({ "feeling": { $eq: 5 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + const boredDiary = await PetEmotions.find({ "feeling": { $eq: 6 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) + + console.log('loveDiary : ' + loveDiary) + console.log('joyDiary : ' + joyDiary) + console.log('normalDiary : ' + normalDiary) + console.log('blackBileDiary : ' + blackBileDiary) + console.log('angryDiary : ' + angryDiary) + console.log('boredDiary : ' + boredDiary) - }catch(err){ + } catch (err) { throw err } + + function getPositiveRadomDiary(diaries: []) { + const diaryLength = diaries.length + const theBestMomentDiaries = [] + if (diaryLength < 8) { + for (let i = 0; i < diaryLength; i++) { + theBestMomentDiaries.push(new TheBestMomentDiary(diaries)) + } + } + } + function getNagativeRadonDiary(diaries: []) { + + } }, - postEpilogue: async(userId,data)=>{ - try{ + postEpilogue: async (userId, data) => { + try { const user = await User.findById(userId).populate({ - path : "book", - populate : ({ - path : "tableContents", - populate : ({ - path : "firstPartTableContents secondPartTableContents" + path: "book", + populate: ({ + path: "tableContents", + populate: ({ + path: "firstPartTableContents secondPartTableContents" }) }) }) @@ -208,37 +237,43 @@ module.exports = { //1부 목차 마지막에 에필로그 const firstPartEpilogue = new FirstPartTableContents({ - chapter : -1, - title : "작가의 말", - contents : data.contents - }) + chapter: -1, + title: data.title, + contents: data.contents + }) await firstPartEpilogue.save() await tableContents.firstPartTableContents.push(firstPartEpilogue) + const isAlreadySecondPartTableContents = await SecondPartTableContent.find()//첫 반려동물이 무지개를 건넜는지 확인하기 위한 로직 + //2부 목차 처음에 에필로그 const secondPartEpilogue = new SecondPartTableContent({ - chapter : 0, - title : "작가의 말", - contents : data.contents + chapter: 0, + title: data.title, + contents: data.contents }) - await secondPartEpilogue.save() - await tableContents.secondPartTableContents.push(secondPartEpilogue) - - const season = ["봄","여름","가을","겨울"] - for(let i = 0;i<4;i++){ - let chapter = 1 - const dummySecondPartTableContents = new SecondPartTableContent({ - chapter, - title : `${user.book.author}의 ${season[i]}` - }) - await dummySecondPartTableContents.save() - await tableContents.secondPartTableContents.push(dummySecondPartTableContents) - chapter = chapter+1 + const saveSecondPartEpiogue = await secondPartEpilogue.save() + await tableContents.secondPartTableContents.unshift(saveSecondPartEpiogue) + + console.log('2부 목차 길이!!!!!!!!!! : '+isAlreadySecondPartTableContents.length) + if (isAlreadySecondPartTableContents.length < 1) { + console.log('로직 돌아가나??') + const season = ["봄", "여름", "가을", "겨울"] + for (let i = 0; i < 4; i++) { + let chapter = 1 + const dummySecondPartTableContents = new SecondPartTableContent({ + chapter, + title: `${user.book.author}의 ${season[i]}` + }) + const saveSecondPartEpiogue = await dummySecondPartTableContents.save() + await tableContents.secondPartTableContents.push(saveSecondPartEpiogue) + chapter = chapter + 1 + } } - const test = await tableContents.save() + await tableContents.save() return user - }catch(err){ + } catch (err) { throw err } } diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts new file mode 100644 index 0000000..e0cc959 --- /dev/null +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -0,0 +1,45 @@ +import { IPetDiary } from "../../../interfaces/diary/IPetDiary" + +export class TheBestMomentsResDto{ + theBestMoments : [] + + constructor(){} + + +} + +export class IllegalityTheBestMoment{ //[우울,화,심심] + blackBile : TheBestMoment + angry : TheBestMoment + bored : TheBestMoment + + constructor(){ + this.blackBile + this.angry + this.bored + } +} + +export class TheBestMoment{ //[사랑],[기쁨],[보통] + comment : null + feeling : null + diaries : [] + + constructor(){ + this.comment + this.feeling + this.diaries + } +} + +export class TheBestMomentDiary{ + chapter : number + episode : number + title : string + contents : string + date : string + + constructor(diaryPerMood : IPetDiary[]){ + + } +} \ No newline at end of file From 2c9e0173fc56af3fcaa93b66be72a9169799cfca Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 02:30:55 +0900 Subject: [PATCH 017/168] =?UTF-8?q?refactor=20:=202=EB=B6=80=20=EC=9E=91?= =?UTF-8?q?=EA=B0=80=EC=9D=98=20=EB=A7=90=20=EB=93=B1=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index e7940a3..a624e08 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -255,9 +255,7 @@ module.exports = { const saveSecondPartEpiogue = await secondPartEpilogue.save() await tableContents.secondPartTableContents.unshift(saveSecondPartEpiogue) - console.log('2부 목차 길이!!!!!!!!!! : '+isAlreadySecondPartTableContents.length) if (isAlreadySecondPartTableContents.length < 1) { - console.log('로직 돌아가나??') const season = ["봄", "여름", "가을", "겨울"] for (let i = 0; i < 4; i++) { let chapter = 1 From 445d482b0168234ee55b75622590c53bd304470b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 03:00:23 +0900 Subject: [PATCH 018/168] =?UTF-8?q?feat=20:=20=EC=9E=91=EB=B3=84=ED=95=A0?= =?UTF-8?q?=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 11 +++++++++++ src/api/router/rainbow/index.ts | 1 + src/api/service/rainbowService.ts | 12 +++++++++++- src/dto/rainbow/petDto/PetNameResDto.ts | 9 +++++++++ src/modules/responseMessage.ts | 1 + 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/dto/rainbow/petDto/PetNameResDto.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index 63f7852..7d84f33 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -58,6 +58,17 @@ module.exports = { } }, + getPartingPetName: async (req, res) => { + const { petId } = req.params + try { + const result = await rainbowService.getPartingPetName(petId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PETNAME, result, result)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + postEpilogue: async (req, res) => { const { userId, petId } = req.params const data = req.body diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 0746e2f..5ef3548 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -7,6 +7,7 @@ router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반 router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 +router.get('/parting/pet/:petId',rainbowController.getPartingPetName) router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) //1.5부 작가의 말 작성 module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index a624e08..a91a973 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -11,6 +11,7 @@ import SecondPartTableContent from "../../models/tableContents/SecondPartTableCo import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" import { TheBestMomentDiary } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" +import { PetNameResDto } from "../../dto/rainbow/petDto/PetNameResDto" const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") @@ -222,6 +223,15 @@ module.exports = { } }, + getPartingPetName: async (petId) => { + try{ + const pet = await Pet.findById(petId) + return new PetNameResDto(pet) + }catch(err){ + throw err + } + }, + postEpilogue: async (userId, data) => { try { const user = await User.findById(userId).populate({ @@ -245,7 +255,7 @@ module.exports = { await tableContents.firstPartTableContents.push(firstPartEpilogue) const isAlreadySecondPartTableContents = await SecondPartTableContent.find()//첫 반려동물이 무지개를 건넜는지 확인하기 위한 로직 - + //2부 목차 처음에 에필로그 const secondPartEpilogue = new SecondPartTableContent({ chapter: 0, diff --git a/src/dto/rainbow/petDto/PetNameResDto.ts b/src/dto/rainbow/petDto/PetNameResDto.ts new file mode 100644 index 0000000..5dfb973 --- /dev/null +++ b/src/dto/rainbow/petDto/PetNameResDto.ts @@ -0,0 +1,9 @@ +import { IPet } from "../../../interfaces/pet/IPet"; + +export class PetNameResDto{ + name + + constructor(pet : IPet){ + this.name = pet.name + } +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index cc3d400..489feb6 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -19,6 +19,7 @@ module.exports = { SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", SUCCESS_GET_READY_PARTING_PET_COMMENT : "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", SUCCESS_GET_BEST_MOMENT : "최고의 순간 불러오기 성공", + SUCCESS_GET_PARTING_PETNAME : "이별할 동물 이름 가져오기 성공", SUCCESS_POST_EPILOGUE : "1부 끝 작가의말 - 에필로그 작성 성공", /* 서버에러 */ From 38046dbbe8c008fdd2302280a1487697e4b340ef Mon Sep 17 00:00:00 2001 From: soleu Date: Wed, 7 Jul 2021 13:19:12 +0900 Subject: [PATCH 019/168] =?UTF-8?q?feat=20:=20=EC=B1=85=20=ED=94=84?= =?UTF-8?q?=EB=A1=A4=EB=A1=9C=EA=B7=B8=20=EC=9E=91=EC=84=B1=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/bookController.ts | 21 +++++++++++++ src/api/router/book/index.ts | 7 +++++ src/api/service/bookService.ts | 44 ++++++++++++++++++++++++++++ src/modules/responseMessage.ts | 4 +++ 4 files changed, 76 insertions(+) create mode 100644 src/api/controller/bookController.ts create mode 100644 src/api/router/book/index.ts create mode 100644 src/api/service/bookService.ts diff --git a/src/api/controller/bookController.ts b/src/api/controller/bookController.ts new file mode 100644 index 0000000..be4daab --- /dev/null +++ b/src/api/controller/bookController.ts @@ -0,0 +1,21 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const bookService = require('../service/bookService') +module.exports = { + postPrologue: async (req, res) => { + const bookData = req.body; + try { + const result = await bookService.postPrologue(bookData) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } +} +export { }; \ No newline at end of file diff --git a/src/api/router/book/index.ts b/src/api/router/book/index.ts new file mode 100644 index 0000000..69a6613 --- /dev/null +++ b/src/api/router/book/index.ts @@ -0,0 +1,7 @@ +const express = require('express') +const router = express.Router() +const bookController = require('../../controller/bookController') + +router.post('/prologue',bookController.postPrologue) //1부 프롤로그 작성 +module.exports = router; +export{}; \ No newline at end of file diff --git a/src/api/service/bookService.ts b/src/api/service/bookService.ts new file mode 100644 index 0000000..d834f00 --- /dev/null +++ b/src/api/service/bookService.ts @@ -0,0 +1,44 @@ +import User from "../../models/user/User" +import Book from "../../models/book/Book" +import TableContents from "../../models/tableContents/TableContents" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import { response } from "express" +require("../../models/user/User") +require("../../models/book/Book") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +module.exports = { + postPrologue: async (bookData) => { + try { + // add book info + let book = new Book(); + book=await Book.findById(bookData._id); + book.title = bookData.title; + book.imgs = bookData.image; + book.author=bookData.userName; + + //add tableContents info + let tc = new TableContents(); + let ftc = new FirstPartTableContents({ + chapter: 0, + title: bookData.prologueTitle, + contents: bookData.prologueContents + }) + tc.setFirstPartTableContents(ftc); + await book.setTableContents(tc); + + //save db + book.save() + return responseMessage.SUCCESS_POST_PROLOGUE; + + //error handling + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK} + } + }, +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 2842e09..37d84fc 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -13,6 +13,10 @@ module.exports = { MISS_MATCH_PW: "비밀번호가 일치하지 않습니다", MISS_MATCH: "아이디나 비밀번호가 일치하지 않습니다.", + /*1부(by.sol) */ + NO_BOOK:"존재하지 않는 책 id입니다.", + + /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", From e8fe268eb31d3db4ad577b8cd2c439c01b85a53c Mon Sep 17 00:00:00 2001 From: soleu Date: Wed, 7 Jul 2021 13:20:54 +0900 Subject: [PATCH 020/168] =?UTF-8?q?feat=20:=20=EC=B1=85=20=ED=94=84?= =?UTF-8?q?=EB=A1=A4=EB=A1=9C=EA=B7=B8=20=EC=9E=91=EC=84=B1=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/router/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 494404c..3d36524 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,6 @@ import express from "express" const router = express.Router() -router.use('/rainbow',require('./rainbow')) //무지개 +router.use('/book',require('./book')) //1부,2부 책 module.exports = router; \ No newline at end of file From 24cc24020cbf6cee155d92e724e8694a7be4fd58 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 14:07:04 +0900 Subject: [PATCH 021/168] =?UTF-8?q?petDiary=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 49 ------- src/api/router/index.ts | 2 +- src/api/router/rainbow/index.ts | 10 -- src/api/service/rainbowService.ts | 164 ------------------------ 4 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 src/api/controller/rainbowController.ts delete mode 100644 src/api/router/rainbow/index.ts delete mode 100644 src/api/service/rainbowService.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts deleted file mode 100644 index ad9496f..0000000 --- a/src/api/controller/rainbowController.ts +++ /dev/null @@ -1,49 +0,0 @@ -const util = require('../../modules/util') -const responseMessage = require('../../modules/responseMessage') -const statusCode = require('../../modules/statusCode') -const rainbowService = require('../service/rainbowService') - -module.exports = { - mainPage: async (req, res) => { - const { userId, petId } = req.params; - try { - const result = await rainbowService.getMainPage(userId, petId) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - selectRainbowPet: async (req, res) => { - try { - const result = await rainbowService.selectPet(); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - setRainbowPet: async (req, res) => { - const petId = req.params.petId - try { - const result = await rainbowService.setPartingRainbowPet(petId); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - getReadyPartingPetComment: async (req, res) => { - const petId = req.params.petId - try { - const result = await rainbowService.getReadyPartingPetComment(petId) - res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - } -} \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 3d36524..dd2d661 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -2,5 +2,5 @@ import express from "express" const router = express.Router() router.use('/book',require('./book')) //1부,2부 책 - +router.use('/diary',require('./diary'));//1부 일기 module.exports = router; \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts deleted file mode 100644 index 413715c..0000000 --- a/src/api/router/rainbow/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -const express = require('express') -const router = express.Router() -const rainbowController = require('../../controller/rainbowController') - -router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 -router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 -router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 -router.get('/record/:petId',rainbowController.getReadyPartingPetComment) - -module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts deleted file mode 100644 index d9f5326..0000000 --- a/src/api/service/rainbowService.ts +++ /dev/null @@ -1,164 +0,0 @@ -import User from "../../models/user/User" -import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" -import Help from "../../models/etc/Help" -import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" -import Pet from "../../models/pet/Pet" -import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" -import { ReadyPartingAndStartRecordResDto,BookInfoResDto } from "../../dto/rainbow/readyPartingAndStartRecordDto/readyPartingAndStartRecordResDto" -const dateMethod = require("../../modules/dateMethod") - -require("../../models/user/User") -require("../../models/pet/Pet") -require("../../models/book/Book") -require('../../models/tableContents/TableContents') -require('../../models/tableContents/FirstPartTableContents') -require('../../models/diary/PetDiary') -require('../../models/diary/PetEmotions') -require('../../models/tableContents/SecondPartTableContent') -require('../../models/diary/UserDiary') -require("../../models/etc/Help") - -module.exports = { - getMainPage: async (userId, petId) => { - try { - const findUser = await User.findById(userId).populate({ - path: "pets" - }).populate({ - path: "book", - populate: { - path: "tableContents", - populate: { - path: "firstPartTableContents", - populate: { - path: "petDiary", - populate: { - path: "petEmotions" - } - } - } - } - }) - - const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book) - const firstPartTableContents = findUser.book.tableContents.firstPartTableContents - - const validMemories = firstPartTableContents.filter(tableContents => - tableContents.petDiary.length > 0).map(tableContents => - tableContents.petDiary.filter(petDiary => - petDiary.pets.includes(petId)) - ) - //validMemories : [tableContetns [petDiary]] - - let memoriesResDto = [null, null] - - if (validMemories.length == 2) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[1], petId) - } else if (validMemories.length > 2) { - let firstTableContentsIndex = await getRandomNumber(validMemories.length) - let secondTableContentsIndex = await getRandomNumber(validMemories.length) - - if (firstTableContentsIndex == secondTableContentsIndex) { - while (firstTableContentsIndex == secondTableContentsIndex) { - if (secondTableContentsIndex == firstTableContentsIndex) { - secondTableContentsIndex = await getRandomNumber(validMemories.length) - } else { - break; - } - } - } - memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex], petId) - } else if (validMemories.length == 1) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) - } - rainbowMainPageResDto.setMemories(memoriesResDto) - - //helpResDto - const helps = await Help.find() - const helpResDto = helps.map(help => new HelpResDto(help)) - - rainbowMainPageResDto.setHelp(helpResDto) - - return rainbowMainPageResDto - } catch (error) { - throw error - } - - function getRandomNumber(max: number) { - max = Math.floor(max); - return Math.floor(Math.random() * max); - } - }, - - selectPet: async () => { - try { - const findUser = await User.find().populate({ - path: "pets" - }) - const rainbowPetResDto = findUser[0].pets.map(pet => - new MyPetInfoResDto(pet)) - - return rainbowPetResDto - } catch (err) { - throw err - } - }, - - setPartingRainbowPet: async (petId) => { - try { - const findPet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" - } - } - } - }) - findPet.rainbow = true - await findPet.save() - const user = findPet.user - let diaryCount = 0 - user.book.tableContents.firstPartTableContents.forEach(tableContent => - diaryCount += tableContent.petDiary.length) - - return new PartingRainbowResDto(diaryCount,findPet.name) - } catch (err) { - throw err - } - }, - - getReadyPartingPetComment: async(petId) =>{ - try{ - const pet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" - } - } - } - }) - - const user = pet.user - const bookInfo = new BookInfoResDto(pet.user.book) - let diaryCount = 0 - user.book.tableContents.firstPartTableContents.forEach(tableContent => - diaryCount += tableContent.petDiary.length) - - const startDate = pet.startDate - const dayTogether = await dateMethod.getElapsedDay(startDate) - - return new ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo) - }catch(err){ - throw err - } - } -} \ No newline at end of file From 949e9384a6b9481cb05dc9039aeaa4fc3aab8e65 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 17:16:44 +0900 Subject: [PATCH 022/168] =?UTF-8?q?feat=20:=201=EB=B6=80=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=99=88=ED=99=94=EB=A9=B4=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 7 +- package.json | 1 + src/api/controller/firstPartController.ts | 19 ++ src/api/controller/rainbowController.ts | 49 ------ src/api/router/firstPart/index.ts | 8 + src/api/router/index.ts | 2 +- src/api/router/rainbow/index.ts | 10 -- src/api/service/firstPartService.ts | 53 ++++++ src/api/service/rainbowService.ts | 164 ------------------ .../mainPageDto/FirstPartMainPageResDto.ts | 61 +++++++ src/modules/responseMessage.ts | 1 + yarn.lock | 25 +++ 12 files changed, 175 insertions(+), 225 deletions(-) create mode 100644 src/api/controller/firstPartController.ts delete mode 100644 src/api/controller/rainbowController.ts create mode 100644 src/api/router/firstPart/index.ts delete mode 100644 src/api/router/rainbow/index.ts create mode 100644 src/api/service/firstPartService.ts delete mode 100644 src/api/service/rainbowService.ts create mode 100644 src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index b5c620d..88bdfb8 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "win32-x64-72", + "systemParams": "win32-x64-83", "modulesFolders": [ "node_modules" ], @@ -11,6 +11,7 @@ "bcryptjs@^2.4.3", "dotenv@^10.0.0", "express@^4.17.1", + "global@^4.4.0", "mongoose@^5.13.0", "nodemon@^2.0.9", "ts-node@^10.0.0", @@ -85,6 +86,7 @@ "depd@~1.1.2": "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9", "destroy@~1.0.4": "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80", "diff@^4.0.1": "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d", + "dom-walk@^0.1.0": "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84", "dot-prop@^5.2.0": "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88", "dotenv@^10.0.0": "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81", "duplexer3@^0.1.4": "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2", @@ -106,6 +108,7 @@ "get-stream@^5.1.0": "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3", "glob-parent@~5.1.2": "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4", "global-dirs@^2.0.1": "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d", + "global@^4.4.0": "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406", "got@^9.6.0": "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85", "graceful-fs@^4.1.2": "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee", "has-flag@^3.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd", @@ -157,6 +160,7 @@ "mime@1.6.0": "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1", "mimic-response@^1.0.0": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", "mimic-response@^1.0.1": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", + "min-document@^2.19.0": "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685", "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083", "minimist@^1.2.0": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", "mongodb@3.6.8": "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407", @@ -186,6 +190,7 @@ "picomatch@^2.2.1": "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972", "prepend-http@^2.0.0": "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897", "process-nextick-args@~2.0.0": "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2", + "process@^0.11.10": "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182", "proxy-addr@~2.0.5": "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025", "pstree.remy@^1.1.7": "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a", "pump@^3.0.0": "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64", diff --git a/package.json b/package.json index 37f2a53..817f3b7 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "bcryptjs": "^2.4.3", "dotenv": "^10.0.0", "express": "^4.17.1", + "global": "^4.4.0", "mongoose": "^5.13.0", "nodemon": "^2.0.9" } diff --git a/src/api/controller/firstPartController.ts b/src/api/controller/firstPartController.ts new file mode 100644 index 0000000..7708717 --- /dev/null +++ b/src/api/controller/firstPartController.ts @@ -0,0 +1,19 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const firstPartService=require('../service/firstPartService') + + +module.exports = { + mainPage: async (req, res) => { + const { userId } = req.params; + try { + const result = await firstPartService.getMainPage(userId) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + } +} +export{} \ No newline at end of file diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts deleted file mode 100644 index ad9496f..0000000 --- a/src/api/controller/rainbowController.ts +++ /dev/null @@ -1,49 +0,0 @@ -const util = require('../../modules/util') -const responseMessage = require('../../modules/responseMessage') -const statusCode = require('../../modules/statusCode') -const rainbowService = require('../service/rainbowService') - -module.exports = { - mainPage: async (req, res) => { - const { userId, petId } = req.params; - try { - const result = await rainbowService.getMainPage(userId, petId) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - selectRainbowPet: async (req, res) => { - try { - const result = await rainbowService.selectPet(); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - setRainbowPet: async (req, res) => { - const petId = req.params.petId - try { - const result = await rainbowService.setPartingRainbowPet(petId); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - }, - - getReadyPartingPetComment: async (req, res) => { - const petId = req.params.petId - try { - const result = await rainbowService.getReadyPartingPetComment(petId) - res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) - } catch (err) { - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - } -} \ No newline at end of file diff --git a/src/api/router/firstPart/index.ts b/src/api/router/firstPart/index.ts new file mode 100644 index 0000000..6a1937d --- /dev/null +++ b/src/api/router/firstPart/index.ts @@ -0,0 +1,8 @@ +import express from "express" +const router = express.Router() +const firstPartController = require('../../controller/FirstPartController') + +//1부 메인페이지 불러오기 +router.get('/main/:userId', firstPartController.mainPage) + +module.exports = router; \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 3d36524..04fc63c 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,6 @@ import express from "express" const router = express.Router() -router.use('/book',require('./book')) //1부,2부 책 +router.use('/firstPart',require('./firstPart')) //1부 module.exports = router; \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts deleted file mode 100644 index 413715c..0000000 --- a/src/api/router/rainbow/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -const express = require('express') -const router = express.Router() -const rainbowController = require('../../controller/rainbowController') - -router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 -router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 -router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 -router.get('/record/:petId',rainbowController.getReadyPartingPetComment) - -module.exports = router; \ No newline at end of file diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts new file mode 100644 index 0000000..9bd0ead --- /dev/null +++ b/src/api/service/firstPartService.ts @@ -0,0 +1,53 @@ +import User from "../../models/user/User" +import Pet from "../../models/pet/Pet" +import { DiaryResDto,FirstPartMainPageResDto,TableContentsResDto } from "../../dto/firstPart/mainPageDto/FirstPartMainPageResDto" +const dateMethod=require("../../modules/dateMethod") +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +require("../../models/user/User") +require("../../models/pet/Pet") +require("../../models/book/Book") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') +require('../../models/diary/PetEmotions') +require('../../models/diary/UserDiary') + +module.exports = { + getMainPage: async (userId) => { + try { + //find userData + const findUser = await User.findById(userId).populate({ + path: "pets" + }).populate({ + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents", + populate: { + path: "petDiary", + populate: { + path: "petEmotions" + } + } + } + } + }) + + const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) + const lastDiary = new DiaryResDto( findUser.book.tableContents.firstPartTableContents[3]) + for(let i=0; i { - try { - const findUser = await User.findById(userId).populate({ - path: "pets" - }).populate({ - path: "book", - populate: { - path: "tableContents", - populate: { - path: "firstPartTableContents", - populate: { - path: "petDiary", - populate: { - path: "petEmotions" - } - } - } - } - }) - - const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book) - const firstPartTableContents = findUser.book.tableContents.firstPartTableContents - - const validMemories = firstPartTableContents.filter(tableContents => - tableContents.petDiary.length > 0).map(tableContents => - tableContents.petDiary.filter(petDiary => - petDiary.pets.includes(petId)) - ) - //validMemories : [tableContetns [petDiary]] - - let memoriesResDto = [null, null] - - if (validMemories.length == 2) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[1], petId) - } else if (validMemories.length > 2) { - let firstTableContentsIndex = await getRandomNumber(validMemories.length) - let secondTableContentsIndex = await getRandomNumber(validMemories.length) - - if (firstTableContentsIndex == secondTableContentsIndex) { - while (firstTableContentsIndex == secondTableContentsIndex) { - if (secondTableContentsIndex == firstTableContentsIndex) { - secondTableContentsIndex = await getRandomNumber(validMemories.length) - } else { - break; - } - } - } - memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex], petId) - } else if (validMemories.length == 1) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) - } - rainbowMainPageResDto.setMemories(memoriesResDto) - - //helpResDto - const helps = await Help.find() - const helpResDto = helps.map(help => new HelpResDto(help)) - - rainbowMainPageResDto.setHelp(helpResDto) - - return rainbowMainPageResDto - } catch (error) { - throw error - } - - function getRandomNumber(max: number) { - max = Math.floor(max); - return Math.floor(Math.random() * max); - } - }, - - selectPet: async () => { - try { - const findUser = await User.find().populate({ - path: "pets" - }) - const rainbowPetResDto = findUser[0].pets.map(pet => - new MyPetInfoResDto(pet)) - - return rainbowPetResDto - } catch (err) { - throw err - } - }, - - setPartingRainbowPet: async (petId) => { - try { - const findPet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" - } - } - } - }) - findPet.rainbow = true - await findPet.save() - const user = findPet.user - let diaryCount = 0 - user.book.tableContents.firstPartTableContents.forEach(tableContent => - diaryCount += tableContent.petDiary.length) - - return new PartingRainbowResDto(diaryCount,findPet.name) - } catch (err) { - throw err - } - }, - - getReadyPartingPetComment: async(petId) =>{ - try{ - const pet = await Pet.findById(petId).populate({ - path : "user", - populate : { - path : "book", - populate : { - path : "tableContents", - populate : { - path : "firstPartTableContents" - } - } - } - }) - - const user = pet.user - const bookInfo = new BookInfoResDto(pet.user.book) - let diaryCount = 0 - user.book.tableContents.firstPartTableContents.forEach(tableContent => - diaryCount += tableContent.petDiary.length) - - const startDate = pet.startDate - const dayTogether = await dateMethod.getElapsedDay(startDate) - - return new ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo) - }catch(err){ - throw err - } - } -} \ No newline at end of file diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts new file mode 100644 index 0000000..afcbd38 --- /dev/null +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -0,0 +1,61 @@ +import { IPetDiary } from "../../../interfaces/diary/IPetDiary"; +import { IHelp } from "../../../interfaces/etc/IHelp"; +import { IPet } from "../../../interfaces/pet/IPet"; +import { IBook } from "../../../interfaces/book/IBook"; +import { IFirstPartTableContents } from "../../../interfaces/tableContents/IFirstPartTableContents"; +import { ITableContents } from "../../../interfaces/tableContents/ITableContents"; +const dateMethod=require('../../../modules/dateMethod') + +export class FirstPartMainPageResDto { + public firstPartMainPage = { + title: null, + bookImg: null, + diary: {}, + tableContents: null + } + + constructor(book: IBook) { + this.firstPartMainPage.title = book.title + this.firstPartMainPage.bookImg = book.imgs + } + + //가장 최근 일기 작성(기분X) + setDiary(diary: DiaryResDto) { + this.firstPartMainPage.diary = diary + } + setTableContents(tableContents: TableContentsResDto) { + this.firstPartMainPage.tableContents.push(tableContents) + } +} + +export class DiaryResDto { + private chapter; + private episode; + private title; + private contents; + private date; + + //가장 마지막 화 들어감 + constructor(firstPartTableContents: IFirstPartTableContents) { + this.chapter = firstPartTableContents.chapter + this.episode = firstPartTableContents.petDiary.length; + this.title = firstPartTableContents.petDiary[this.episode].title; + this.contents = firstPartTableContents.petDiary[this.episode].contents; + this.date = dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode].date); + } +} + +export class TableContentsResDto { + + private chapterId; + private chapter; + private chapterName; + private episodePerchapterCount; + + constructor(firstPartTableContents: IFirstPartTableContents) { + this.chapterId = firstPartTableContents._id //목차 Id + this.chapter = firstPartTableContents.chapter; + this.chapterName = firstPartTableContents.title; + this.episodePerchapterCount = firstPartTableContents.petDiary.length; + } +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 37d84fc..c0e46d8 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -15,6 +15,7 @@ module.exports = { /*1부(by.sol) */ NO_BOOK:"존재하지 않는 책 id입니다.", + SUCCESS_GET_FIRSTPART_MAINPAGE:"1부 메인뷰 불러오기 성공", /** 1.5부 무지개다리 (by 현종) */ diff --git a/yarn.lock b/yarn.lock index beeff29..aa13844 100644 --- a/yarn.lock +++ b/yarn.lock @@ -436,6 +436,11 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dom-walk@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" + integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== + dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -594,6 +599,14 @@ global-dirs@^2.0.1: dependencies: ini "1.3.7" +global@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" + integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== + dependencies: + min-document "^2.19.0" + process "^0.11.10" + got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -872,6 +885,13 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +min-document@^2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" + integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= + dependencies: + dom-walk "^0.1.0" + minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1053,6 +1073,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" From e72791c702dd20a3dad25f25fb2e913ec7d9de41 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 17:22:11 +0900 Subject: [PATCH 023/168] =?UTF-8?q?fix=20:=20package.json=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 2 +- package.json | 2 +- yarn-error.log | 815 ++++++++++++++++++++++++++++++++++- 3 files changed, 808 insertions(+), 11 deletions(-) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 6b93e3f..c2ce4c3 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -145,11 +145,11 @@ "kareem@2.3.2": "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93", "keyv@^3.0.0": "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9", "latest-version@^5.0.0": "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face", + "lodash@^4.17.21": "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c", "lowercase-keys@^1.0.0": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f", "lowercase-keys@^1.0.1": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f", "lowercase-keys@^2.0.0": "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479", "make-dir@^3.0.0": "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f", - "lodash@^4.17.21": "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c", "make-error@^1.1.1": "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2", "media-typer@0.3.0": "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748", "memory-pager@^1.0.2": "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5", diff --git a/package.json b/package.json index 1431b82..ac1e8d8 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dotenv": "^10.0.0", "express": "^4.17.1", "express-validator": "^6.12.0", - "mongoose": "^5.13.0" + "mongoose": "^5.13.0", "nodemon": "^2.0.9" } } diff --git a/yarn-error.log b/yarn-error.log index 60986f8..8911309 100644 --- a/yarn-error.log +++ b/yarn-error.log @@ -1,25 +1,25 @@ Arguments: - C:\Program Files\nodejs\node.exe C:\Users\leehyunjong\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js run dev + C:\Program Files\nodejs\node.exe C:\Users\이솔\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js run dev PATH: - C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Users\leehyunjong\bin;C:\Program Files\Java\jdk1.8.0_261\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\Intel\WiFi\bin;C:\Program Files\Common Files\Intel\WirelessCommon;C:\Program Files\nodejs;C:\Program Files\MongoDB\Server\4.2\bin;C:\Users\leehyunjong\Anaconda3;C:\Users\leehyunjong\Anaconda3\Scripts;C:\Users\leehyunjong\Anaconda3\Library\bin;C:\Python\Python36;C:\Python\Python36\Scripts;C:\Program Files\Datasolution\KoreaPlus Statistics\Statistics\25\JRE\bin;C:\Program Files\Java\jdk-13.0.1\bin;C:\Program Files (x86)\H2bin;C:\Program Files\dotnet;C:\Program Files\Git\cmd;C:\Program Files (x86)\dotnet;C:\Users\leehyunjong\.windows-build-tools\python27;C:\Python\Python36\Scripts;C:\Python\Python36;C:\Program Files\MySQL\MySQL Shell 8.0\bin;C:\opencv\build\x64\vc14\bin'";C:\Users\leehyunjong\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Bandizip;C:\Users\leehyunjong\Microsoft VS Code\bin;C:\PyCharm Community Edition 2019.2.4\bin;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Users\leehyunjong\AppData\Roaming\npm;C:\Users\leehyunjong\AppData\Local\atom\bin;C:\opencv\build\x64\vc14\bin;C:\jython2.7.2\bin;C:\Users\leehyunjong\.dotnet\tools;C:\Users\leehyunjong\AppData\Local\gitkraken\bin;%USERPROFILE%\AppData\Local\Microsoft\WindowsApps + C:\Users\이솔\bin;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\local\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Users\이솔\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Program Files (x86)\PuTTY;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Users\이솔\AppData\Local\Programs\Python\Python39\Scripts;C:\Users\이솔\AppData\Local\Programs\Python\Python39;C:\Program Files\MySQL\MySQL Shell 8.0\bin;C:\Users\이솔\AppData\Local\Microsoft\WindowsApps;C:\Users\이솔\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\이솔\AppData\Local\Programs\Python\Python39\Scripts;C:\Users\이솔\AppData\Local\gitkraken\bin;C:\Users\이솔\AppData\Roaming\npm;C:\Users\이솔\AppData\Local\GitHubDesktop\bin;C:\Program Files\Git\usr\bin\vendor_perl;C:\Program Files\Git\usr\bin\core_perl Yarn version: 1.22.10 Node version: - 12.14.0 + 14.17.1 Platform: win32 x64 Trace: - SyntaxError: C:\Users\leehyunjong\Desktop\마스코타\mascota_server\package.json: Unexpected token } in JSON at position 171 + SyntaxError: C:\Users\이솔\OneDrive - catholic.ac.kr\바탕 화면\MASCOTA\mascota-server\package.json: Unexpected string in JSON at position 561 at JSON.parse () - at C:\Users\leehyunjong\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:1625:59 + at C:\Users\이솔\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:1625:59 at Generator.next () - at step (C:\Users\leehyunjong\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:310:30) - at C:\Users\leehyunjong\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:321:13 + at step (C:\Users\이솔\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:310:30) + at C:\Users\이솔\AppData\Roaming\npm\node_modules\yarn\lib\cli.js:321:13 npm manifest: { @@ -28,8 +28,9 @@ npm manifest: "description": "", "main": "index.js", "scripts": { - "dev": "ts-node src", + "dev": "nodemon -r ts-node src/index.ts", "build": "tsc && node dist", + "test": "nodemon" }, "author": "", "license": "ISC", @@ -43,7 +44,9 @@ npm manifest: "bcryptjs": "^2.4.3", "dotenv": "^10.0.0", "express": "^4.17.1", + "express-validator": "^6.12.0", "mongoose": "^5.13.0" + "nodemon": "^2.0.9" } } @@ -55,6 +58,18 @@ Lockfile: # yarn lockfile v1 + "@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + + "@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + "@tsconfig/node10@^1.0.7": version "1.0.8" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" @@ -152,6 +167,11 @@ Lockfile: "@types/mime" "^1" "@types/node" "*" + abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -160,6 +180,38 @@ Lockfile: mime-types "~2.1.24" negotiator "0.6.2" + ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + dependencies: + string-width "^3.0.0" + + ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + + ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + + ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + + anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -170,11 +222,21 @@ Lockfile: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + bcryptjs@^2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= + binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + bl@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5" @@ -204,6 +266,35 @@ Lockfile: raw-body "2.4.0" type-is "~1.6.17" + boxen@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" + integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^5.3.1" + chalk "^3.0.0" + cli-boxes "^2.2.0" + string-width "^4.1.0" + term-size "^2.1.0" + type-fest "^0.8.1" + widest-line "^3.1.0" + + brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + + braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + bson@^1.1.4: version "1.1.6" resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a" @@ -219,6 +310,93 @@ Lockfile: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + + camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + + chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + + chokidar@^3.2.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + + ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + + cli-boxes@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + + clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + + color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + + color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + + concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + + configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -251,7 +429,12 @@ Lockfile: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - debug@2.6.9: + crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + + debug@2.6.9, debug@^2.2.0: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -265,6 +448,30 @@ Lockfile: dependencies: ms "2.0.0" + debug@^3.2.6: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + + decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + + deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + + defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + denque@^1.4.1: version "1.5.0" resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" @@ -285,21 +492,55 @@ Lockfile: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + dotenv@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== + duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + + emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + + escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -310,6 +551,14 @@ Lockfile: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + express-validator@^6.12.0: + version "6.12.0" + resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.12.0.tgz#a9cd49b3fe4c470abb615ae2e7dd111053c25f66" + integrity sha512-lcQAdVeAO+pBbHD33nIsDsd+QPakLX08tJ82iEsXj6ezyWCfYjE9RY/g9SVq5z4G0NaIkH8039Oe4r0G92DRyA== + dependencies: + lodash "^4.17.21" + validator "^13.5.2" + express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -346,6 +595,13 @@ Lockfile: utils-merge "1.0.1" vary "~1.1.2" + fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -369,6 +625,81 @@ Lockfile: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + + get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + + get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + + glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + + global-dirs@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d" + integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ== + dependencies: + ini "1.3.7" + + got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + + graceful-fs@^4.1.2: + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + + has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + + has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + + has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + + http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -398,6 +729,21 @@ Lockfile: dependencies: safer-buffer ">= 2.1.2 < 3" + ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= + + import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + + imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -408,21 +754,146 @@ Lockfile: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + ini@1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + + ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + + is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + + is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + + is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + + is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + + is-glob@^4.0.1, is-glob@~4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + + is-installed-globally@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" + integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== + dependencies: + global-dirs "^2.0.1" + is-path-inside "^3.0.1" + + is-npm@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" + integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== + + is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + + is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + + is-path-inside@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + + is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + + is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + kareem@2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93" integrity sha512-STHz9P7X2L4Kwn72fA4rGyqyXdmrMSdxqHx9IXon/FXluXieaFA6KJ2upcHAHxQPQ0LeM/OjLrhFxifHewOALQ== + keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + + latest-version@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + + lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + + make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + + lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -465,6 +936,23 @@ Lockfile: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + + minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + + minimist@^1.2.0: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + mongodb@3.6.8: version "3.6.8" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407" @@ -532,11 +1020,49 @@ Lockfile: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + nodemon@^2.0.9: + version "2.0.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.9.tgz#f5cd550ba215da3c1081459ae2c1c8da2c353165" + integrity sha512-6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg== + dependencies: + chokidar "^3.2.2" + debug "^3.2.6" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.7" + semver "^5.7.1" + supports-color "^5.5.0" + touch "^3.1.0" + undefsafe "^2.0.3" + update-notifier "^4.1.0" + + nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + dependencies: + abbrev "1" + + normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + + normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -544,11 +1070,33 @@ Lockfile: dependencies: ee-first "1.1.1" + once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + optional-require@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/optional-require/-/optional-require-1.0.3.tgz#275b8e9df1dc6a17ad155369c2422a440f89cb07" integrity sha512-RV2Zp2MY2aeYK5G+B/Sps8lW5NHAzE5QClbFP15j+PWmP+T9PxlJXBOOLoSAdgwFvS4t0aMR4vpedMkbHfh0nA== + p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + + package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -559,6 +1107,16 @@ Lockfile: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + picomatch@^2.0.4, picomatch@^2.2.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + + prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -572,6 +1130,26 @@ Lockfile: forwarded "0.2.0" ipaddr.js "1.9.1" + pstree.remy@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" + integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== + + pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + + pupa@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -592,6 +1170,16 @@ Lockfile: iconv-lite "0.4.24" unpipe "1.0.0" + rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -605,11 +1193,39 @@ Lockfile: string_decoder "~1.1.1" util-deprecate "~1.0.1" + readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + regexp-clone@1.0.0, regexp-clone@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63" integrity sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw== + registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + + registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + + responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -632,6 +1248,23 @@ Lockfile: dependencies: sparse-bitfield "^3.0.3" + semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + + semver@^5.7.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + + semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -671,6 +1304,11 @@ Lockfile: resolved "https://registry.yarnpkg.com/sift/-/sift-13.5.2.tgz#24a715e13c617b086166cd04917d204a591c9da6" integrity sha512-+gxdEOMA2J+AI+fVsCqeNn7Tgx3M9ZN9jdi95939l1IJ8cZsqS8sqpJyOkic2SJk+1+98Uwryt/gL6XDaV+UZA== + signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + sliced@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" @@ -701,6 +1339,24 @@ Lockfile: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + + string-width@^4.0.0, string-width@^4.1.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -708,11 +1364,68 @@ Lockfile: dependencies: safe-buffer "~5.1.0" + strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + + strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + + strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + + supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + + supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + + term-size@^2.1.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" + integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== + + to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + + to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== + dependencies: + nopt "~1.0.10" + ts-node@^10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be" @@ -729,6 +1442,11 @@ Lockfile: source-map-support "^0.5.17" yn "3.1.1" + type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -737,16 +1455,63 @@ Lockfile: media-typer "0.3.0" mime-types "~2.1.24" + typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + typescript@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== + undefsafe@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae" + integrity sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A== + dependencies: + debug "^2.2.0" + + unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + update-notifier@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" + integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== + dependencies: + boxen "^4.2.0" + chalk "^3.0.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.3.1" + is-npm "^4.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.0.0" + pupa "^2.0.1" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + + url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -757,11 +1522,43 @@ Lockfile: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + validator@^13.5.2: + version "13.6.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059" + integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg== + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + + wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + + write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + + xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From d5a8206e78344047bf47ab0e8150d82f5c4b2887 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 17:28:00 +0900 Subject: [PATCH 024/168] =?UTF-8?q?feat=20:=201=EB=B6=80=20=ED=99=88?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/firstPartService.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index 9bd0ead..51d3bce 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -1,7 +1,8 @@ import User from "../../models/user/User" import Pet from "../../models/pet/Pet" -import { DiaryResDto,FirstPartMainPageResDto,TableContentsResDto } from "../../dto/firstPart/mainPageDto/FirstPartMainPageResDto" -const dateMethod=require("../../modules/dateMethod") +import { DiaryResDto, FirstPartMainPageResDto, TableContentsResDto } from "../../dto/firstPart/mainPageDto/FirstPartMainPageResDto" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +const dateMethod = require("../../modules/dateMethod") const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -36,18 +37,18 @@ module.exports = { } } }) - const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) - const lastDiary = new DiaryResDto( findUser.book.tableContents.firstPartTableContents[3]) - for(let i=0; i Date: Wed, 7 Jul 2021 18:07:24 +0900 Subject: [PATCH 025/168] =?UTF-8?q?refactor=20:=20=EB=AA=A9=EC=B0=A8=20?= =?UTF-8?q?=EA=B0=9D=EC=B2=B4=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/userService.ts | 10 ++++++++++ src/interfaces/book/IBook.ts | 2 +- src/models/book/Book.ts | 5 ++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index ac8190c..ae14580 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -2,6 +2,8 @@ import { Request, Response, NextFunction } from 'express' import User from '../../models/user/User' import Book from '../../models/book/Book' import Pet from '../../models/pet/Pet' +import FirstPartTableContents from '../../models/tableContents/FirstPartTableContents' +import TableContents from '../../models/tableContents/TableContents' import bcrypt from 'bcryptjs' import { check, validationResult } from "express-validator"; const validator = require('validator'); @@ -40,6 +42,14 @@ module.exports = { //Create book object const book = new Book() + + //Create tableContents object + const tableContents=new TableContents() + + //Create firstPartTableContents object + const firstPart =new FirstPartTableContents() + tableContents.setFirstPartTableContents(firstPart) + book.setTableContents(tableContents) user.setBook(book); //db save diff --git a/src/interfaces/book/IBook.ts b/src/interfaces/book/IBook.ts index bd3fa59..a0c6a98 100644 --- a/src/interfaces/book/IBook.ts +++ b/src/interfaces/book/IBook.ts @@ -10,7 +10,7 @@ export interface IBook extends Document { } export interface IBookDocument extends IBook { - setTableContents : (tableContents : ITableContents) => Promise + setTableContents: (tableContents: ITableContents) => Promise } export interface IBookModel extends Model { diff --git a/src/models/book/Book.ts b/src/models/book/Book.ts index ca1fd92..6ec0442 100644 --- a/src/models/book/Book.ts +++ b/src/models/book/Book.ts @@ -11,9 +11,8 @@ const BookSchema: Schema = new mongoose.Schema({ ref: "TableContents" } }) - -BookSchema.methods.setTableContents = async function (tableContents: ITableContents) { - this.tableContents = tableContents +BookSchema.methods.setTableContents=async function(tableContents: ITableContents){ + this.tableContents=tableContents } export default mongoose.model("Book", BookSchema, "books") \ No newline at end of file From 94c3dbe8fe174147b0e5cf6addd648f6ce6f63e8 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 19:10:27 +0900 Subject: [PATCH 026/168] =?UTF-8?q?feat=20:=20=ED=94=84=EB=A1=A4=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=9E=91=EC=84=B1=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{bookController.ts => diaryController.ts} | 4 +-- src/api/router/book/index.ts | 7 ----- src/api/router/diary/index.ts | 7 +++++ src/api/router/index.ts | 2 +- .../{bookService.ts => diaryService.ts} | 29 ++++++++++++------- 5 files changed, 29 insertions(+), 20 deletions(-) rename src/api/controller/{bookController.ts => diaryController.ts} (85%) delete mode 100644 src/api/router/book/index.ts create mode 100644 src/api/router/diary/index.ts rename src/api/service/{bookService.ts => diaryService.ts} (62%) diff --git a/src/api/controller/bookController.ts b/src/api/controller/diaryController.ts similarity index 85% rename from src/api/controller/bookController.ts rename to src/api/controller/diaryController.ts index be4daab..9d4f741 100644 --- a/src/api/controller/bookController.ts +++ b/src/api/controller/diaryController.ts @@ -1,12 +1,12 @@ const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') -const bookService = require('../service/bookService') +const diaryService = require('../service/diaryService') module.exports = { postPrologue: async (req, res) => { const bookData = req.body; try { - const result = await bookService.postPrologue(bookData) + const result = await diaryService.postPrologue(bookData) res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) } catch (err) { console.error(err) diff --git a/src/api/router/book/index.ts b/src/api/router/book/index.ts deleted file mode 100644 index 69a6613..0000000 --- a/src/api/router/book/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express') -const router = express.Router() -const bookController = require('../../controller/bookController') - -router.post('/prologue',bookController.postPrologue) //1부 프롤로그 작성 -module.exports = router; -export{}; \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts new file mode 100644 index 0000000..78d1b3b --- /dev/null +++ b/src/api/router/diary/index.ts @@ -0,0 +1,7 @@ +const express = require('express') +const router = express.Router() +const diaryController = require('../../controller/diaryController') + +router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 +module.exports = router; +export{}; \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index dd2d661..186c9f6 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,6 @@ import express from "express" const router = express.Router() -router.use('/book',require('./book')) //1부,2부 책 +//router.use('/book',require('./book')) //1부,2부 책 router.use('/diary',require('./diary'));//1부 일기 module.exports = router; \ No newline at end of file diff --git a/src/api/service/bookService.ts b/src/api/service/diaryService.ts similarity index 62% rename from src/api/service/bookService.ts rename to src/api/service/diaryService.ts index d834f00..78df25a 100644 --- a/src/api/service/bookService.ts +++ b/src/api/service/diaryService.ts @@ -2,11 +2,13 @@ import User from "../../models/user/User" import Book from "../../models/book/Book" import TableContents from "../../models/tableContents/TableContents" import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import PetDiary from "../../models/diary/PetDiary" import { response } from "express" require("../../models/user/User") require("../../models/book/Book") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -15,24 +17,31 @@ module.exports = { postPrologue: async (bookData) => { try { // add book info - let book = new Book(); + let book = await new Book(); book=await Book.findById(bookData._id); - book.title = bookData.title; - book.imgs = bookData.image; - book.author=bookData.userName; + book.title = await bookData.title; + book.imgs = await bookData.image; + book.author= await bookData.userName; //add tableContents info - let tc = new TableContents(); - let ftc = new FirstPartTableContents({ - chapter: 0, + let tc = await new TableContents(); + let tempPetDiary= await new PetDiary({ title: bookData.prologueTitle, contents: bookData.prologueContents }) - tc.setFirstPartTableContents(ftc); - await book.setTableContents(tc); + let ftc =await new FirstPartTableContents({ + chapter: 0, + title:"프롤로그" + // title: bookData.prologueTitle, + // contents: bookData.prologueContents + }) + await ftc.setPetDiary(tempPetDiary) + await tc.setFirstPartTableContents(ftc); + await tempPetDiary.setTableContents(tc); + await book.setTableContents(tc); //save db - book.save() + await book.save() return responseMessage.SUCCESS_POST_PROLOGUE; //error handling From 3390b02b1bb777aa9cc715e45abc2be6455a5543 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Wed, 7 Jul 2021 21:14:22 +0900 Subject: [PATCH 027/168] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 54 +++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/api/service/diaryService.ts diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts new file mode 100644 index 0000000..3c9dca7 --- /dev/null +++ b/src/api/service/diaryService.ts @@ -0,0 +1,54 @@ + +import { response } from "express" +import User from "../../models/user/User" +import Book from "../../models/book/Book" +import TableContents from "../../models/tableContents/TableContents" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import PetDiary from "../../models/diary/PetDiary" +require("../../models/user/User") +require("../../models/book/Book") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +module.exports = { + postPrologue: async (bookData) => { + try { + // add book info + let book = await new Book(); + book=await Book.findById(bookData._id); + book.title = await bookData.title; + book.imgs = await bookData.image; + book.author= await bookData.userName; + + //add tableContents info + let tc = await new TableContents(); + let tempPetDiary= await new PetDiary({ + title: bookData.prologueTitle, + contents: bookData.prologueContents + }) + let ftc =await new FirstPartTableContents({ + chapter: 0, + title:"프롤로그" + // title: bookData.prologueTitle, + // contents: bookData.prologueContents + }) + + await ftc.setPetDiary(tempPetDiary) + await tc.setFirstPartTableContents(ftc); + await tempPetDiary.setTableContents(tc); + await book.setTableContents(tc); + //save db + await book.save() + return responseMessage.SUCCESS_POST_PROLOGUE; + + //error handling + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK} + } + }, +} \ No newline at end of file From e35f9da01be8921a9ff8aaa87a19ca42f1166dd5 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 23:20:58 +0900 Subject: [PATCH 028/168] =?UTF-8?q?feat=20:=20=EC=B5=9C=EA=B3=A0=EC=9D=98?= =?UTF-8?q?=20=EC=88=9C=EA=B0=84=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/router/rainbow/index.ts | 2 +- src/api/service/rainbowService.ts | 114 +++++++++++++++--- .../theBestMomentDto/TheBestMomentResDto.ts | 58 ++++----- 3 files changed, 125 insertions(+), 49 deletions(-) diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 5ef3548..0859b6b 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -7,7 +7,7 @@ router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반 router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 -router.get('/parting/pet/:petId',rainbowController.getPartingPetName) +router.get('/parting/pet/:petId',rainbowController.getPartingPetName) //1.5부 반려동물 이름 반환 router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) //1.5부 작가의 말 작성 module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index a91a973..b3f2998 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -10,8 +10,10 @@ import FirstPartTableContents from "../../models/tableContents/FirstPartTableCon import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" -import { TheBestMomentDiary } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" +import { TheBestMoment, TheBestMomentDiary, TheBestMomentsResDto } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" import { PetNameResDto } from "../../dto/rainbow/petDto/PetNameResDto" +import { IPetDiary } from "../../interfaces/diary/IPetDiary" +import Comments from "../../models/etc/Comments" const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") @@ -191,43 +193,117 @@ module.exports = { getTheBestMoment: async (userId, petId) => { try { - const loveDiary = await PetEmotions.find({ "feeling": { $eq: 1 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - const joyDiary = await PetEmotions.find({ "feeling": { $eq: 2 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - const normalDiary = await PetEmotions.find({ "feeling": { $eq: 3 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - const blackBileDiary = await PetEmotions.find({ "feeling": { $eq: 4 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - const angryDiary = await PetEmotions.find({ "feeling": { $eq: 5 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - const boredDiary = await PetEmotions.find({ "feeling": { $eq: 6 } }).select("petDiary").populate("petDiary").map(emotion => emotion.petDiary) - - console.log('loveDiary : ' + loveDiary) - console.log('joyDiary : ' + joyDiary) - console.log('normalDiary : ' + normalDiary) - console.log('blackBileDiary : ' + blackBileDiary) - console.log('angryDiary : ' + angryDiary) - console.log('boredDiary : ' + boredDiary) + const diaryPerFeeling = [] + for (let i = 0; i < 6; i++) { + console.log(i) + const diaries = (await PetEmotions.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary) + if (diaries.length < 1) { + diaryPerFeeling.push(null) + } else { + diaryPerFeeling.push(diaries) + } + } + // const loveDiary = (await PetEmotions.find({ "feeling": { $eq: 0 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + // const joyDiary = (await PetEmotions.find({ "feeling": { $eq: 1 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + // const normalDiary = (await PetEmotions.find({ "feeling": { $eq: 2 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + // const blackBileDiary = (await PetEmotions.find({ "feeling": { $eq: 3 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + // const angryDiary = (await PetEmotions.find({ "feeling": { $eq: 4 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + // const boredDiary = (await PetEmotions.find({ "feeling": { $eq: 5 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) + + // console.log('loveDiary : ' + loveDiary) + // console.log('joyDiary : ' + joyDiary) + // console.log('normalDiary : ' + normalDiary) + // console.log('blackBileDiary : ' + blackBileDiary) + // console.log('angryDiary : ' + angryDiary) + // console.log('boredDiary : ' + boredDiary) + + //기분에 따른 멘트와 기분을 TheBestMoment에 넣는다 + //TheBestMoment에 dirayPerFeeling을 각 인덱스 값(기분)에 맞게 diaries에 넣는다 + // console.log('diaryPerFeeling : '+diaryPerFeeling) + + const theBestMomentsResDto = new TheBestMomentsResDto() + for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 + const commentPerFeeling = await Comments.findOne({ feeling: j, classification: 2 }) + let theBestMoment = null + if(j <3){ + theBestMoment = new TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])) + }else{ + theBestMoment = new TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])) + } + theBestMomentsResDto.setTheBestMoment(theBestMoment) + } + return theBestMomentsResDto } catch (err) { throw err } - function getPositiveRadomDiary(diaries: []) { + //각 기분에 따른 일기들을 배열로 묶어서 보내줘야함 + function getPositiveRadomDiary(diaries: IPetDiary[]) { + if(diaries === null) return null const diaryLength = diaries.length const theBestMomentDiaries = [] if (diaryLength < 8) { + for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 + theBestMomentDiaries.push(new TheBestMomentDiary(diaries[i])) + } + for(let j = 0;j<8-diaryLength;j++){ //남은 일기갯수(8-가지고 있는 일기수)만큼 null로 채워준다 + theBestMomentDiaries.push(null) + } + } else { + //8개 이상의 일기중 8개만 골라서 넣어준다. + const indexArray = [] + while(indexArray.length < 8){ + let index = getRandomNumber(diaryLength) + if(!indexArray.includes(index)){ + indexArray.push(index) + } + } + for(let k = 0;k<8;k++){ + theBestMomentDiaries.push(new TheBestMomentDiary(diaries[indexArray[k]])) + } + } + return theBestMomentDiaries + } + + //부정 일기는 2개씩만 + function getNegativeRandomDiary(diaries: IPetDiary[]) { + if(diaries === null ) return null + const diaryLength = diaries.length + const theBestMomentDiaries = [] + if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { - theBestMomentDiaries.push(new TheBestMomentDiary(diaries)) + theBestMomentDiaries.push(new TheBestMomentDiary(diaries[i])) + } + for( let j = 0;j<2-diaryLength;j++){ + theBestMomentDiaries.push(null) + } + } else { + const indexArray = [] + while(indexArray.length < 2){ + let index = getRandomNumber(diaryLength) + if(!indexArray.includes(index)){ + indexArray.push(index) + } + } + for(let k=0;k<2;k++){ + theBestMomentDiaries.push(new TheBestMomentDiary(diaries[indexArray[k]])) } } + return theBestMomentDiaries } - function getNagativeRadonDiary(diaries: []) { + function getRandomNumber(max: number) { + max = Math.floor(max); + return Math.floor(Math.random() * max); } }, getPartingPetName: async (petId) => { - try{ + try { const pet = await Pet.findById(petId) return new PetNameResDto(pet) - }catch(err){ + } catch (err) { throw err } }, diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index e0cc959..9092098 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -1,45 +1,45 @@ import { IPetDiary } from "../../../interfaces/diary/IPetDiary" +import { IComments } from "../../../interfaces/etc/IComments" +const dateMethod = require("../../../modules/dateMethod") export class TheBestMomentsResDto{ - theBestMoments : [] + private theBestMoments = [] constructor(){} - -} - -export class IllegalityTheBestMoment{ //[우울,화,심심] - blackBile : TheBestMoment - angry : TheBestMoment - bored : TheBestMoment - - constructor(){ - this.blackBile - this.angry - this.bored + setTheBestMoment(theBestMoment : TheBestMoment){ + this.theBestMoments.push(theBestMoment) } } export class TheBestMoment{ //[사랑],[기쁨],[보통] - comment : null - feeling : null - diaries : [] - - constructor(){ - this.comment - this.feeling - this.diaries + private comment = null + private feeling = null + private diaries = [] + + constructor(commentPerFeeling : IComments, theBestMomentDiary : TheBestMomentDiary[]){ + this.comment = commentPerFeeling.comments + this.feeling = commentPerFeeling.feeling + this.diaries = theBestMomentDiary } } export class TheBestMomentDiary{ - chapter : number - episode : number - title : string - contents : string - date : string - - constructor(diaryPerMood : IPetDiary[]){ - + private chapter = null + private episode = null + private title = null + private contents = null + private date = null + + constructor(diaryPerFeeling : IPetDiary){ + this.init(diaryPerFeeling) + } + + async init(diaryPerFeeling : IPetDiary){ + this.chapter = diaryPerFeeling.tableContents.chapter + this.episode = diaryPerFeeling.episode + this.title = diaryPerFeeling.title + this.contents = diaryPerFeeling.contents + this.date = await dateMethod.toStringByFormatting(diaryPerFeeling.date) } } \ No newline at end of file From eb22a6fed6c86ca92fdac52bafbcc71d587c0c99 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 23:49:34 +0900 Subject: [PATCH 029/168] =?UTF-8?q?feat=20:=20=EB=B0=98=EB=A0=A4=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EC=9D=B4=EB=B3=84=20=EC=B7=A8=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 11 ++++++++++ src/api/router/rainbow/index.ts | 1 + src/api/service/rainbowService.ts | 27 +++++++++---------------- src/modules/responseMessage.ts | 1 + 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index 7d84f33..d3b3405 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -36,6 +36,17 @@ module.exports = { } }, + cancelPartingPet: async(req,res)=>{ + const petId = req.params.petId + try{ + await rainbowService.cancelPartingPet(petId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_PARTING_PET)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + getReadyPartingPetComment: async (req, res) => { const petId = req.params.petId try { diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index 0859b6b..ff8336e 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -5,6 +5,7 @@ const rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 +router.delete('/pet/:petId',rainbowController.cancelPartingPet) //1.5부 무지개 반려동물 떠나보내기 취소 router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 router.get('/parting/pet/:petId',rainbowController.getPartingPetName) //1.5부 반려동물 이름 반환 diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index b3f2998..e460abb 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -161,6 +161,16 @@ module.exports = { } }, + cancelPartingPet:async(petId)=>{ + try{ + const findPet = await Pet.findById(petId) + findPet.rainbow = false + await findPet.save() + }catch(err){ + throw err + } + }, + getReadyPartingPetComment: async (petId) => { try { const pet = await Pet.findById(petId).populate({ @@ -203,23 +213,6 @@ module.exports = { diaryPerFeeling.push(diaries) } } - // const loveDiary = (await PetEmotions.find({ "feeling": { $eq: 0 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - // const joyDiary = (await PetEmotions.find({ "feeling": { $eq: 1 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - // const normalDiary = (await PetEmotions.find({ "feeling": { $eq: 2 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - // const blackBileDiary = (await PetEmotions.find({ "feeling": { $eq: 3 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - // const angryDiary = (await PetEmotions.find({ "feeling": { $eq: 4 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - // const boredDiary = (await PetEmotions.find({ "feeling": { $eq: 5 } }).select("petDiary").populate({path:"petDiary",populate:({path:"tableContents"})})).map(emotion => emotion.petDiary) - - // console.log('loveDiary : ' + loveDiary) - // console.log('joyDiary : ' + joyDiary) - // console.log('normalDiary : ' + normalDiary) - // console.log('blackBileDiary : ' + blackBileDiary) - // console.log('angryDiary : ' + angryDiary) - // console.log('boredDiary : ' + boredDiary) - - //기분에 따른 멘트와 기분을 TheBestMoment에 넣는다 - //TheBestMoment에 dirayPerFeeling을 각 인덱스 값(기분)에 맞게 diaries에 넣는다 - // console.log('diaryPerFeeling : '+diaryPerFeeling) const theBestMomentsResDto = new TheBestMomentsResDto() for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 489feb6..8f63f49 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -17,6 +17,7 @@ module.exports = { SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", SUCCESS_GET_PARTING_PET_COMMENT : "이별하는 무지개 다리 멘트 불러오기 성공", + SUCCESS_DELETE_PARTING_PET : "반려동물 이별 과정 취소 성공", SUCCESS_GET_READY_PARTING_PET_COMMENT : "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", SUCCESS_GET_BEST_MOMENT : "최고의 순간 불러오기 성공", SUCCESS_GET_PARTING_PETNAME : "이별할 동물 이름 가져오기 성공", From e577156a4b8a3c71e67dd6bee4125aa6c5fc12ea Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 7 Jul 2021 23:53:54 +0900 Subject: [PATCH 030/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EC=84=9C=EB=B8=8C=EB=B7=B0=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/responseMessage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 8f63f49..3a14c14 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -22,6 +22,7 @@ module.exports = { SUCCESS_GET_BEST_MOMENT : "최고의 순간 불러오기 성공", SUCCESS_GET_PARTING_PETNAME : "이별할 동물 이름 가져오기 성공", SUCCESS_POST_EPILOGUE : "1부 끝 작가의말 - 에필로그 작성 성공", + SUCCESS_GET_RAINBOW_SUB_PAGE : "무지개 서브뷰 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 250d3ca0a18455066b923104000d7fe2800d410b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 8 Jul 2021 01:19:59 +0900 Subject: [PATCH 031/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EA=B0=84=20=ED=95=B4=EB=8B=B9=20=EB=B0=98?= =?UTF-8?q?=EB=A0=A4=EB=8F=99=EB=AC=BC=20=EC=9D=B4=EB=A6=84=EA=B3=BC=20?= =?UTF-8?q?=EC=A2=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 36 ++++++++++--------- .../theBestMomentDto/TheBestMomentResDto.ts | 16 +++++++++ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index e460abb..7df32b3 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -10,7 +10,7 @@ import FirstPartTableContents from "../../models/tableContents/FirstPartTableCon import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" -import { TheBestMoment, TheBestMomentDiary, TheBestMomentsResDto } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" +import { TheBestMoment, TheBestMomentDiary, TheBestMomentsResDto, TheBestMomentPetInformation } from "../../dto/rainbow/theBestMomentDto/TheBestMomentResDto" import { PetNameResDto } from "../../dto/rainbow/petDto/PetNameResDto" import { IPetDiary } from "../../interfaces/diary/IPetDiary" import Comments from "../../models/etc/Comments" @@ -161,12 +161,12 @@ module.exports = { } }, - cancelPartingPet:async(petId)=>{ - try{ + cancelPartingPet: async (petId) => { + try { const findPet = await Pet.findById(petId) findPet.rainbow = false await findPet.save() - }catch(err){ + } catch (err) { throw err } }, @@ -203,6 +203,9 @@ module.exports = { getTheBestMoment: async (userId, petId) => { try { + const pet = await Pet.findById(petId) + const TheBestMomentPetInfo = new TheBestMomentPetInformation(pet) + const diaryPerFeeling = [] for (let i = 0; i < 6; i++) { console.log(i) @@ -218,12 +221,13 @@ module.exports = { for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 const commentPerFeeling = await Comments.findOne({ feeling: j, classification: 2 }) let theBestMoment = null - if(j <3){ + if (j < 3) { theBestMoment = new TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])) - }else{ + } else { theBestMoment = new TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])) } theBestMomentsResDto.setTheBestMoment(theBestMoment) + theBestMomentsResDto.setTheBestMomentPetInfo(TheBestMomentPetInfo) } return theBestMomentsResDto @@ -233,26 +237,26 @@ module.exports = { //각 기분에 따른 일기들을 배열로 묶어서 보내줘야함 function getPositiveRadomDiary(diaries: IPetDiary[]) { - if(diaries === null) return null + if (diaries === null) return null const diaryLength = diaries.length const theBestMomentDiaries = [] if (diaryLength < 8) { for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 theBestMomentDiaries.push(new TheBestMomentDiary(diaries[i])) } - for(let j = 0;j<8-diaryLength;j++){ //남은 일기갯수(8-가지고 있는 일기수)만큼 null로 채워준다 + for (let j = 0; j < 8 - diaryLength; j++) { //남은 일기갯수(8-가지고 있는 일기수)만큼 null로 채워준다 theBestMomentDiaries.push(null) } } else { //8개 이상의 일기중 8개만 골라서 넣어준다. const indexArray = [] - while(indexArray.length < 8){ + while (indexArray.length < 8) { let index = getRandomNumber(diaryLength) - if(!indexArray.includes(index)){ + if (!indexArray.includes(index)) { indexArray.push(index) } } - for(let k = 0;k<8;k++){ + for (let k = 0; k < 8; k++) { theBestMomentDiaries.push(new TheBestMomentDiary(diaries[indexArray[k]])) } } @@ -261,25 +265,25 @@ module.exports = { //부정 일기는 2개씩만 function getNegativeRandomDiary(diaries: IPetDiary[]) { - if(diaries === null ) return null + if (diaries === null) return null const diaryLength = diaries.length const theBestMomentDiaries = [] if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { theBestMomentDiaries.push(new TheBestMomentDiary(diaries[i])) } - for( let j = 0;j<2-diaryLength;j++){ + for (let j = 0; j < 2 - diaryLength; j++) { theBestMomentDiaries.push(null) } } else { const indexArray = [] - while(indexArray.length < 2){ + while (indexArray.length < 2) { let index = getRandomNumber(diaryLength) - if(!indexArray.includes(index)){ + if (!indexArray.includes(index)) { indexArray.push(index) } } - for(let k=0;k<2;k++){ + for (let k = 0; k < 2; k++) { theBestMomentDiaries.push(new TheBestMomentDiary(diaries[indexArray[k]])) } } diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index 9092098..b6715e5 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -1,8 +1,10 @@ import { IPetDiary } from "../../../interfaces/diary/IPetDiary" import { IComments } from "../../../interfaces/etc/IComments" +import { IPet } from "../../../interfaces/pet/IPet" const dateMethod = require("../../../modules/dateMethod") export class TheBestMomentsResDto{ + private pet = {} private theBestMoments = [] constructor(){} @@ -10,6 +12,20 @@ export class TheBestMomentsResDto{ setTheBestMoment(theBestMoment : TheBestMoment){ this.theBestMoments.push(theBestMoment) } + + setTheBestMomentPetInfo(petInfo : TheBestMomentPetInformation){ + this.pet = petInfo + } +} + +export class TheBestMomentPetInformation{ + private name = null + private kind = null + + constructor(pet : IPet){ + this.name = pet.name + this.kind = pet.kind + } } export class TheBestMoment{ //[사랑],[기쁨],[보통] From a7f3089d7981cb2d4dab8bfce4cdbfa9119fbe32 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 8 Jul 2021 03:03:15 +0900 Subject: [PATCH 032/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EC=84=9C=EB=B8=8C=20=EB=B7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/rainbowController.ts | 12 ++++++++++++ src/api/router/rainbow/index.ts | 1 + src/api/service/rainbowService.ts | 10 ++++++++++ .../theBestMomentDto/TheBestMomentSubResDto.ts | 18 ++++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index d3b3405..f45c396 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -91,5 +91,17 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + theBestMomentSub: async(req,res)=>{ + const {userId, petId} = req.params + try{ + const theBestMoment = await rainbowService.getTheBestMoment(userId, petId) + const result = await rainbowService.getTheBestMomentSub(petId,theBestMoment) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_SUB_PAGE,result)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index ff8336e..e38e167 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -10,5 +10,6 @@ router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1. router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 router.get('/parting/pet/:petId',rainbowController.getPartingPetName) //1.5부 반려동물 이름 반환 router.post('/epilogue/:userId/:petId',rainbowController.postEpilogue) //1.5부 작가의 말 작성 +router.get('/moment/sub/:userId/:petId',rainbowController.theBestMomentSub) //1.5부 무지개 서브 홈 module.exports = router; \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 7df32b3..d244dd8 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -14,6 +14,7 @@ import { TheBestMoment, TheBestMomentDiary, TheBestMomentsResDto, TheBestMomentP import { PetNameResDto } from "../../dto/rainbow/petDto/PetNameResDto" import { IPetDiary } from "../../interfaces/diary/IPetDiary" import Comments from "../../models/etc/Comments" +import { TheBestMomentSubResDto } from "../../dto/rainbow/theBestMomentDto/TheBestMomentSubResDto" const dateMethod = require("../../modules/dateMethod") require("../../models/user/User") @@ -357,5 +358,14 @@ module.exports = { } catch (err) { throw err } + }, + + getTheBestMomentSub:async (petId,theBestMoment) =>{ + try{ + const pet = await Pet.findById(petId) + return new TheBestMomentSubResDto(pet,theBestMoment) + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts new file mode 100644 index 0000000..0a6e935 --- /dev/null +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts @@ -0,0 +1,18 @@ +import { inherits } from "util" +import { IPet } from "../../../interfaces/pet/IPet" +import { TheBestMomentsResDto } from "./TheBestMomentResDto" +const dateMethod = require("../../../modules/dateMethod") + +export class TheBestMomentSubResDto{ + private rainbowComment + private theBestMoment + + constructor(pet: IPet, theBestMoment : TheBestMomentsResDto){ + this.init(pet, theBestMoment) + } + + async init(pet: IPet, theBestMoment : TheBestMomentsResDto){ + this.rainbowComment = `작가님과 함께했던 ${await dateMethod.getElapsedDay(pet.startDate)}일의 시간동안\n${pet.name}는 의젓하고 당당한 ${pet.name}으로써\n행복한 인생을 보낼 수 있었어요.\n이젠 ${pet.name}가 느꼇던 최고의 순간들을\n모아봤어요!` + this.theBestMoment = theBestMoment + } +} \ No newline at end of file From b76ee43fa728037abf67566be3a3596f766e29d7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 8 Jul 2021 03:05:24 +0900 Subject: [PATCH 033/168] =?UTF-8?q?feat=20:=20=EB=AC=B4=EC=A7=80=EA=B0=9C?= =?UTF-8?q?=20=EC=84=9C=EB=B8=8C=20=EB=B7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts index 0a6e935..313db42 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts @@ -5,7 +5,7 @@ const dateMethod = require("../../../modules/dateMethod") export class TheBestMomentSubResDto{ private rainbowComment - private theBestMoment + private rainbowBestMoment constructor(pet: IPet, theBestMoment : TheBestMomentsResDto){ this.init(pet, theBestMoment) @@ -13,6 +13,6 @@ export class TheBestMomentSubResDto{ async init(pet: IPet, theBestMoment : TheBestMomentsResDto){ this.rainbowComment = `작가님과 함께했던 ${await dateMethod.getElapsedDay(pet.startDate)}일의 시간동안\n${pet.name}는 의젓하고 당당한 ${pet.name}으로써\n행복한 인생을 보낼 수 있었어요.\n이젠 ${pet.name}가 느꼇던 최고의 순간들을\n모아봤어요!` - this.theBestMoment = theBestMoment + this.rainbowBestMoment = theBestMoment } } \ No newline at end of file From fba3bfcb9d9c10ba0b5c4e76ec22b9dc603ecc92 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Thu, 8 Jul 2021 03:19:08 +0900 Subject: [PATCH 034/168] =?UTF-8?q?1=EB=B6=80=20=ED=99=88=ED=99=94?= =?UTF-8?q?=EB=A9=B4(TableContents=20=EC=B6=9C=EB=A0=A5=EC=95=88=EB=90=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/firstPartService.ts | 31 +++++++++++++++++-- .../mainPageDto/FirstPartMainPageResDto.ts | 1 - 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index 51d3bce..b89be40 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -1,11 +1,13 @@ import User from "../../models/user/User" import Pet from "../../models/pet/Pet" import { DiaryResDto, FirstPartMainPageResDto, TableContentsResDto } from "../../dto/firstPart/mainPageDto/FirstPartMainPageResDto" -import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" const dateMethod = require("../../modules/dateMethod") const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') +import Book from "../../models/book/Book" +import TableContents from "../../models/tableContents/TableContents" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" require("../../models/user/User") require("../../models/pet/Pet") @@ -37,15 +39,40 @@ module.exports = { } } }) + console.log(findUser) + + let newBook=new Book() + let newTableContents=new TableContents() + let newFirstPartTableContents=new FirstPartTableContents() + newTableContents.setFirstPartTableContents(newFirstPartTableContents) + newBook.setTableContents(newTableContents) + + if(findUser.book==null){ + findUser.setBook(newBook) + } + if(findUser.book.tableContents==null){ + findUser.book.tableContents= new TableContents() + } + if(findUser.book.tableContents.firstPartTableContents==null){ + findUser.book.tableContents.firstPartTableContents.push(new FirstPartTableContents()) + } + const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length + //console.log("#:",lastTableNumber) + console.log(firstPartMainPageResDto) + const lastDiary = new DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]) + console.log("lastDiary:",lastDiary) + //tableContents for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]) firstPartMainPageResDto.setTableContents(tableContentsResDto) } firstPartMainPageResDto.setDiary(lastDiary) - return responseMessage.SUCCESS_GET_FIRSTPART_MAINPAGE; + + return {firstPartMainPageResDto}; + } catch (err) { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index afcbd38..94b27d8 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -46,7 +46,6 @@ export class DiaryResDto { } export class TableContentsResDto { - private chapterId; private chapter; private chapterName; From bc9df3290188eeaf040c75593257b9b133751328 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Thu, 8 Jul 2021 08:11:35 +0900 Subject: [PATCH 035/168] add --- src/api/controller/diaryController.ts | 17 +++++++- src/api/router/diary/index.ts | 1 + src/api/service/diaryService.ts | 62 +++++++++++++++++++++------ 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 9d4f741..110ebd3 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -16,6 +16,19 @@ module.exports = { } return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } + }, + postPetDiary: async (req, res) => { + const diaryData = req.body; + try { + const result = await diaryService.postPetDiary(diaryData) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } } -} -export { }; \ No newline at end of file +} \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 78d1b3b..9c5d28f 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -3,5 +3,6 @@ const router = express.Router() const diaryController = require('../../controller/diaryController') router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 +router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 78df25a..36db28b 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -2,13 +2,15 @@ import User from "../../models/user/User" import Book from "../../models/book/Book" import TableContents from "../../models/tableContents/TableContents" import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" -import PetDiary from "../../models/diary/PetDiary" +import Pet from "../../models/pet/Pet" import { response } from "express" +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" require("../../models/user/User") require("../../models/book/Book") +require("../../models/pet/Pet") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') -require('../../models/diary/PetDiary') const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -18,27 +20,20 @@ module.exports = { try { // add book info let book = await new Book(); - book=await Book.findById(bookData._id); + book = await Book.findById(bookData._id); book.title = await bookData.title; book.imgs = await bookData.image; - book.author= await bookData.userName; + book.author = await bookData.userName; //add tableContents info let tc = await new TableContents(); - let tempPetDiary= await new PetDiary({ + let ftc = await new FirstPartTableContents({ + chapter: 0, title: bookData.prologueTitle, contents: bookData.prologueContents }) - let ftc =await new FirstPartTableContents({ - chapter: 0, - title:"프롤로그" - // title: bookData.prologueTitle, - // contents: bookData.prologueContents - }) - await ftc.setPetDiary(tempPetDiary) await tc.setFirstPartTableContents(ftc); - await tempPetDiary.setTableContents(tc); await book.setTableContents(tc); //save db await book.save() @@ -47,7 +42,46 @@ module.exports = { //error handling } catch (err) { console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK} + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK } } }, + postPetDiary: async(diaryData)=>{ + const writeDate= new Date(diaryData.date) + writeDate.setDate(writeDate.getDate() + 1); + // console.log(FirstPartTableContents.findById(diaryData._id)) + + let newPetDiary=new PetDiary({ + tableContents:diaryData._id, + //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 + date:writeDate, + imgs:diaryData.diaryImages, + title:diaryData.title, + contents:diaryData.contents + + }) + try{ + //save petinfo + let petN=diaryData.character.length + for (let i=0;i Date: Thu, 8 Jul 2021 09:07:04 +0900 Subject: [PATCH 036/168] =?UTF-8?q?feat=20:=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=20=EC=A1=B0=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/diaryController.ts | 14 ++++++ src/api/router/diary/index.ts | 1 + src/api/service/diaryService.ts | 64 +++++++++++++++----------- src/dto/petDiary/PetDiaryPageResDto.ts | 34 ++++++++++++++ 4 files changed, 87 insertions(+), 26 deletions(-) create mode 100644 src/dto/petDiary/PetDiaryPageResDto.ts diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 110ebd3..649724b 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -30,5 +30,19 @@ module.exports = { } return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } + }, + getPetDiary: async(req,res)=>{ + const petDiaryId=req.params; + try { + const result = await diaryService.postPetDiary(petDiaryId) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } } } \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 9c5d28f..4358aae 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -4,5 +4,6 @@ const diaryController = require('../../controller/diaryController') router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 +router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 36db28b..ba9cf0e 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -6,11 +6,13 @@ import Pet from "../../models/pet/Pet" import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" +import { PetDiaryPageResDto} from "../../dto/petDiary/PetDiaryPageResDto" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -45,43 +47,53 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK } } }, - postPetDiary: async(diaryData)=>{ - const writeDate= new Date(diaryData.date) + postPetDiary: async (diaryData) => { + const writeDate = new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); - // console.log(FirstPartTableContents.findById(diaryData._id)) + // console.log(FirstPartTableContents.findById(diaryData._id)) + + let newPetDiary = new PetDiary({ + tableContents: diaryData._id, + //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 + date: writeDate, + imgs: diaryData.diaryImages, + title: diaryData.title, + contents: diaryData.contents - let newPetDiary=new PetDiary({ - tableContents:diaryData._id, - //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 - date:writeDate, - imgs:diaryData.diaryImages, - title:diaryData.title, - contents:diaryData.contents - }) - try{ + try { //save petinfo - let petN=diaryData.character.length - for (let i=0;i { + try { + const findPetDiary = PetDiary.findById(petDiaryId); + let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) + return petDiaryPageResDto + } catch (err) { console.log(err) + //throw err, noPetDiaryId } } } \ No newline at end of file diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts new file mode 100644 index 0000000..2011ff1 --- /dev/null +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -0,0 +1,34 @@ +import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +const dateMethod = require('../../modules/dateMethod') + +export class PetDiaryPageResDto{ + public petDiaryPage = { + _id:null, + chapter:null, + title : null, + bookImg : [], + date:null, + contents:null, + timeTogether:null + } + + constructor(petDiary : IPetDiary){ + _id:petDiary._id + chapter:petDiary.tableContents.chapter + title:petDiary.title + bookImg:petDiary.imgs + date:petDiary.date + contents:petDiary.contents + //가장 먼저 있는 애 기준 날짜 정리 + timeTogether: dateMethod.getElapsedDay(petDiary.pets[0].startDate) + } + +} +export{} \ No newline at end of file From c53ffd86efbd9585c8b9532438bc6795ab9cadd1 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Thu, 8 Jul 2021 09:25:56 +0900 Subject: [PATCH 037/168] =?UTF-8?q?feat:=201=EB=B6=80=20=EC=9D=BC=EA=B8=B0?= =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20=EC=82=AD=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/diaryController.ts | 31 +++++++++++++++- src/api/router/diary/index.ts | 2 + src/api/service/diaryService.ts | 53 +++++++++++++++++++++++++-- 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 649724b..9cfd6f2 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -34,7 +34,36 @@ module.exports = { getPetDiary: async(req,res)=>{ const petDiaryId=req.params; try { - const result = await diaryService.postPetDiary(petDiaryId) + const result = await diaryService.getPetDiary(petDiaryId) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + putPetDiary: async(req,res)=>{ + const petDiaryId=req.params; + const diaryData=req.body; + try { + const result = await diaryService.putPetDiary(petDiaryId,diaryData) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + deletePetDiary:async(req,res)=>{ + const petDiaryId=req.params; + try{ + const result = await diaryService.deletePetDiary(petDiaryId,) res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) } catch (err) { console.error(err) diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 4358aae..88978a4 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -5,5 +5,7 @@ const diaryController = require('../../controller/diaryController') router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 +router.put('/pet',diaryController.putPetDiary)//반려동물 일기 수정 +router.delete('/pet',diaryController.deletePetDiary)//반려동물 일기 삭제 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index ba9cf0e..687750d 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -6,7 +6,7 @@ import Pet from "../../models/pet/Pet" import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" -import { PetDiaryPageResDto} from "../../dto/petDiary/PetDiaryPageResDto" +import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -89,11 +89,56 @@ module.exports = { getPetDiary: async (petDiaryId) => { try { const findPetDiary = PetDiary.findById(petDiaryId); - let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) - return petDiaryPageResDto + //let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) 이부분 + // return petDiaryPageResDto } catch (err) { console.log(err) //throw err, noPetDiaryId } + }, + putPetDiary: async (petDiaryId, diaryData) => { + try { + const findPetDiary = PetDiary.findById(petDiaryId); + const writeDate = new Date(diaryData.date) + writeDate.setDate(writeDate.getDate() + 1); + // console.log(FirstPartTableContents.findById(diaryData._id)) + + let newPetDiary = new PetDiary({ + tableContents: diaryData._id, + //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 + date: writeDate, + imgs: diaryData.diaryImages, + title: diaryData.title, + contents: diaryData.contents + + }) + //save petinfo + let petN = diaryData.character.length + for (let i = 0; i < petN; i++) { + const petData = await Pet.findById(diaryData.character[0]._id).populate('_id') + newPetDiary.setPet(petData) + //save emotions + const petEmotion = new PetEmotions({ + pet: diaryData.character[0]._id, + feeling: diaryData.character[0].feeling + }) + newPetDiary.setPetEmotions(petEmotion) + } + + console.log(newPetDiary) + + + } catch (err) { + console.log(err) + } + + }, + deletePetDiary:async(petDiaryId)=>{ + try{ + const findPetDiary=PetDiary.findById(petDiaryId); + //화 정렬 순서 맞추기 + //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 + } } -} \ No newline at end of file + +} From 4d795037d833f69f3762e06140731a5bbf779e30 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Thu, 8 Jul 2021 20:41:08 +0900 Subject: [PATCH 038/168] =?UTF-8?q?1=EB=B6=80=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C/=EC=82=BD=EC=9E=85/=EC=82=AD=EC=A0=9C/?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/diaryController.ts | 6 +-- src/api/router/diary/index.ts | 4 +- src/api/service/diaryService.ts | 69 ++++++++++++++++++-------- src/dto/petDiary/PetDiaryPageResDto.ts | 21 +++++--- src/modules/responseMessage.ts | 1 + 5 files changed, 67 insertions(+), 34 deletions(-) diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 9cfd6f2..4e7223a 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -32,7 +32,7 @@ module.exports = { } }, getPetDiary: async(req,res)=>{ - const petDiaryId=req.params; + const petDiaryId=req.params.id;//id를 뺴면 객체를 보내줌 try { const result = await diaryService.getPetDiary(petDiaryId) res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) @@ -46,7 +46,7 @@ module.exports = { } }, putPetDiary: async(req,res)=>{ - const petDiaryId=req.params; + const petDiaryId=req.params.id; const diaryData=req.body; try { const result = await diaryService.putPetDiary(petDiaryId,diaryData) @@ -61,7 +61,7 @@ module.exports = { } }, deletePetDiary:async(req,res)=>{ - const petDiaryId=req.params; + const petDiaryId=req.params.id; try{ const result = await diaryService.deletePetDiary(petDiaryId,) res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 88978a4..71de7d5 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -5,7 +5,7 @@ const diaryController = require('../../controller/diaryController') router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 -router.put('/pet',diaryController.putPetDiary)//반려동물 일기 수정 -router.delete('/pet',diaryController.deletePetDiary)//반려동물 일기 삭제 +router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 +router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 687750d..077633b 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -7,6 +7,7 @@ import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" +import { isNull } from "util" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -48,21 +49,23 @@ module.exports = { } }, postPetDiary: async (diaryData) => { - const writeDate = new Date(diaryData.date) + const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) - + const temp =await FirstPartTableContents.findById(diaryData._id) + //console.log("temp:",temp,"end") let newPetDiary = new PetDiary({ tableContents: diaryData._id, - //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 + episode:temp.petDiary.length, date: writeDate, imgs: diaryData.diaryImages, title: diaryData.title, contents: diaryData.contents }) + try { - //save petinfo + //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { const petData = await Pet.findById(diaryData.character[0]._id).populate('_id') @@ -76,41 +79,48 @@ module.exports = { } console.log(newPetDiary) + await newPetDiary.save() + + await temp.setPetDiary(newPetDiary) //db관련은 await 붙이기(setter,save...) + await temp.save() + console.log(temp._id) - // let findPet=new Pet() - // findPet=Pet.findById(diaryData.character[i]._id) - // newPetDiary.setPet(findPet) - // } - //console.log(petData) } catch (err) { console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } }, getPetDiary: async (petDiaryId) => { - try { - const findPetDiary = PetDiary.findById(petDiaryId); - //let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) 이부분 - // return petDiaryPageResDto + try { + //console.log(petDiaryId); + const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents'); + //console.log(findPetDiary) + let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 + //console.log(petDiaryPageResDto) + return petDiaryPageResDto + } catch (err) { console.log(err) - //throw err, noPetDiaryId + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } }, putPetDiary: async (petDiaryId, diaryData) => { try { const findPetDiary = PetDiary.findById(petDiaryId); - const writeDate = new Date(diaryData.date) - writeDate.setDate(writeDate.getDate() + 1); + console.log(findPetDiary) + // const writeDate = new Date(diaryData.date) + //writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) + const ftc= await FirstPartTableContents.findById(diaryData._id) + //const episodeN=ftc.petDiary.length let newPetDiary = new PetDiary({ - tableContents: diaryData._id, - //episode:FirstPartTableContents.findById(diaryData._id).length, 이부분 수정하기 - date: writeDate, + tableContents: (await findPetDiary).tableContents, + episode:(await findPetDiary).episode, + date: (await findPetDiary).date, imgs: diaryData.diaryImages, title: diaryData.title, contents: diaryData.contents - }) //save petinfo let petN = diaryData.character.length @@ -126,18 +136,33 @@ module.exports = { } console.log(newPetDiary) - + newPetDiary.save() } catch (err) { console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } }, deletePetDiary:async(petDiaryId)=>{ try{ - const findPetDiary=PetDiary.findById(petDiaryId); + let findPetDiary= await PetDiary.findById(petDiaryId).populate('tableContents'); + console.log(findPetDiary) //화 정렬 순서 맞추기 //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 + let allDiaries=await (PetDiary.find({}).populate('tableContents')).find({(TableContents.chapter) : (findPetDiary.tableContents.chapter)}); + console.log("all",allDiaries) + //let sameChapterDiaries=await allDiaries.find({tableContents.chapter:findPetDiary.tableContents.chapter}) + //for(let i=0;i<(await findPetDiary.tableContents.petDiary.length;i++){ + // for(let j=0;j=findPetDiary.episode){ + // findTableContents[i].petDiary[j].episode--; + // } + // } + //findPetDiary = null; + }catch(err){ + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } } diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts index 2011ff1..ff5d219 100644 --- a/src/dto/petDiary/PetDiaryPageResDto.ts +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -12,22 +12,29 @@ export class PetDiaryPageResDto{ public petDiaryPage = { _id:null, chapter:null, + episode:null, title : null, bookImg : [], date:null, contents:null, timeTogether:null } + constructor(petDiary : IPetDiary){ - _id:petDiary._id - chapter:petDiary.tableContents.chapter - title:petDiary.title - bookImg:petDiary.imgs - date:petDiary.date - contents:petDiary.contents //가장 먼저 있는 애 기준 날짜 정리 - timeTogether: dateMethod.getElapsedDay(petDiary.pets[0].startDate) + this.init(petDiary) + } + async init(petDiary:IPetDiary){ + const temp= petDiary.populate('_id') + this.petDiaryPage._id=petDiary._id + //this.petDiaryPage.chapter=temp.chapter + this.petDiaryPage.title=petDiary.title + this.petDiaryPage.bookImg=petDiary.imgs + this.petDiaryPage.date=petDiary.date + this.petDiaryPage.episode=petDiary.episode + this.petDiaryPage.contents=petDiary.contents + this.petDiaryPage.timeTogether= await dateMethod.getElapsedDay(petDiary.pets[0].startDate) } } diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 37d84fc..c0949ff 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -15,6 +15,7 @@ module.exports = { /*1부(by.sol) */ NO_BOOK:"존재하지 않는 책 id입니다.", + NO_DIARY:"존재하지 않는 다이어리 id입니다.", /** 1.5부 무지개다리 (by 현종) */ From 32c3dd9903194a40eaf4fb83f8297bc54b544e31 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Fri, 9 Jul 2021 01:35:40 +0900 Subject: [PATCH 039/168] =?UTF-8?q?=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=9D=BC=EA=B8=B0=20=EC=9E=91=EC=84=B1,=EC=A1=B0=ED=9A=8C,?= =?UTF-8?q?=EC=88=98=EC=A0=95,=EC=82=AD=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 51 ++++++++++++++++++--------------- src/modules/responseMessage.ts | 4 ++- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 077633b..982cfdc 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -8,6 +8,7 @@ import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" import { isNull } from "util" +import { TIMEOUT } from "dns" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -52,20 +53,20 @@ module.exports = { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) - const temp =await FirstPartTableContents.findById(diaryData._id) + const temp = await FirstPartTableContents.findById(diaryData._id) //console.log("temp:",temp,"end") let newPetDiary = new PetDiary({ tableContents: diaryData._id, - episode:temp.petDiary.length, + episode: temp.petDiary.length, date: writeDate, imgs: diaryData.diaryImages, title: diaryData.title, contents: diaryData.contents }) - + try { - //save petinfo + //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { const petData = await Pet.findById(diaryData.character[0]._id).populate('_id') @@ -84,6 +85,7 @@ module.exports = { await temp.setPetDiary(newPetDiary) //db관련은 await 붙이기(setter,save...) await temp.save() console.log(temp._id) + return responseMessage.SUCCESS_POST_PETDIARY; } catch (err) { console.log(err) @@ -91,14 +93,14 @@ module.exports = { } }, getPetDiary: async (petDiaryId) => { - try { + try { //console.log(petDiaryId); const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents'); //console.log(findPetDiary) let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 //console.log(petDiaryPageResDto) return petDiaryPageResDto - + } catch (err) { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } @@ -111,12 +113,12 @@ module.exports = { // const writeDate = new Date(diaryData.date) //writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) - const ftc= await FirstPartTableContents.findById(diaryData._id) + const ftc = await FirstPartTableContents.findById(diaryData._id) //const episodeN=ftc.petDiary.length let newPetDiary = new PetDiary({ tableContents: (await findPetDiary).tableContents, - episode:(await findPetDiary).episode, + episode: (await findPetDiary).episode, date: (await findPetDiary).date, imgs: diaryData.diaryImages, title: diaryData.title, @@ -137,6 +139,7 @@ module.exports = { console.log(newPetDiary) newPetDiary.save() + return responseMessage.SUCCESS_EDIT_PETDIARY; } catch (err) { console.log(err) @@ -144,26 +147,28 @@ module.exports = { } }, - deletePetDiary:async(petDiaryId)=>{ - try{ - let findPetDiary= await PetDiary.findById(petDiaryId).populate('tableContents'); + deletePetDiary: async (petDiaryId) => { + try { + let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents'); console.log(findPetDiary) //화 정렬 순서 맞추기 //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 - let allDiaries=await (PetDiary.find({}).populate('tableContents')).find({(TableContents.chapter) : (findPetDiary.tableContents.chapter)}); - console.log("all",allDiaries) - //let sameChapterDiaries=await allDiaries.find({tableContents.chapter:findPetDiary.tableContents.chapter}) - //for(let i=0;i<(await findPetDiary.tableContents.petDiary.length;i++){ - // for(let j=0;j=findPetDiary.episode){ - // findTableContents[i].petDiary[j].episode--; - // } - // } - //findPetDiary = null; - }catch(err){ + // let allDiaries=await (PetDiary.find({}).populate('tableContents')) + let petDiaries = (await FirstPartTableContents.findOne({ chapter: { $eq: findPetDiary.tableContents.chapter } })).petDiary + + for (let i = 0; i < petDiaries.length; i++) { + let temp = await PetDiary.findById(petDiaries[i]) + if (findPetDiary.episode <= temp.episode) { + temp.episode = Number(temp.episode) - 1 + await temp.save() + } + } + findPetDiary=null; + return responseMessage.SUCCESS_DELETE_PETDIARY; + } catch (err) { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } } - + } diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index c0949ff..3a8e63a 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -16,7 +16,9 @@ module.exports = { /*1부(by.sol) */ NO_BOOK:"존재하지 않는 책 id입니다.", NO_DIARY:"존재하지 않는 다이어리 id입니다.", - + SUCCESS_POST_PETDIARY:"반려동물 다이어리 작성 성공", + SUCCESS_EDIT_PETDIARY:"반려동물 다이어리 수정 성공", + SUCCESS_DELETE_PETDIARY:"반려동물 다이어리 삭제 성공", /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", From 618142645a896711476c9adb87a8952aab9188e1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 9 Jul 2021 02:27:34 +0900 Subject: [PATCH 040/168] =?UTF-8?q?feat=20:=20=EC=BA=98=EB=A6=B0=EB=8D=94?= =?UTF-8?q?=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/calendarController.ts | 29 +++++++++ src/api/controller/rainbowController.ts | 6 +- src/api/router/calendar/index.ts | 8 +++ src/api/router/index.ts | 3 +- src/api/router/rainbow/index.ts | 6 +- src/api/service/calendarService.ts | 79 ++++++++++++++++++++++++ src/dto/calendar/calendarResDto.ts | 75 ++++++++++++++++++++++ src/interfaces/diary/IUserDiary.ts | 1 + src/models/diary/UserDiary.ts | 4 ++ src/modules/dateMethod.ts | 5 ++ src/modules/responseMessage.ts | 3 + 11 files changed, 212 insertions(+), 7 deletions(-) create mode 100644 src/api/controller/calendarController.ts create mode 100644 src/api/router/calendar/index.ts create mode 100644 src/api/service/calendarService.ts create mode 100644 src/dto/calendar/calendarResDto.ts diff --git a/src/api/controller/calendarController.ts b/src/api/controller/calendarController.ts new file mode 100644 index 0000000..3c9cf94 --- /dev/null +++ b/src/api/controller/calendarController.ts @@ -0,0 +1,29 @@ +var util = require('../../modules/util') +var responseMessage = require('../../modules/responseMessage') +var statusCode = require('../../modules/statusCode') +const calendarService = require('../service/calendarService') + +module.exports={ + getCalendar:async(req,res)=>{ + const {year,month,part} = req.params + try{ + console.log(month +'+'+part) + const result = await calendarService.getDiaryPerDate(year,month,part) + return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_MONTH_CALENDAR,result)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + yearCalendar:async(req,res)=>{ + const {year,month,part} = req.params + try{ + const result = await calendarService.getYearDiary(year,month,part) + return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_YEAR_CALENDAR,result)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + } +} \ No newline at end of file diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index f45c396..d52b60e 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -1,6 +1,6 @@ -const util = require('../../modules/util') -const responseMessage = require('../../modules/responseMessage') -const statusCode = require('../../modules/statusCode') +var util = require('../../modules/util') +var responseMessage = require('../../modules/responseMessage') +var statusCode = require('../../modules/statusCode') const rainbowService = require('../service/rainbowService') module.exports = { diff --git a/src/api/router/calendar/index.ts b/src/api/router/calendar/index.ts new file mode 100644 index 0000000..7cfaa94 --- /dev/null +++ b/src/api/router/calendar/index.ts @@ -0,0 +1,8 @@ +var express = require('express') +var router = express.Router() +const calendarController = require('../../controller/calendarController') + +router.get('/:year/:month/:part',calendarController.getCalendar)//월 캘린더 +// router.get('/year/:year/:moth/:part',calendarController.yearCalendar)//년 캘린더 + +module.exports = router \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 494404c..8b121f2 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,7 @@ import express from "express" const router = express.Router() -router.use('/rainbow',require('./rainbow')) //무지개 +router.use('/rainbow',require('./rainbow')) //무지개\ +router.use('/calendar',require('./calendar')) //캘린더 module.exports = router; \ No newline at end of file diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index e38e167..04c0ac9 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -1,6 +1,6 @@ -const express = require('express') -const router = express.Router() -const rainbowController = require('../../controller/rainbowController') +var express = require('express') +var router = express.Router() +let rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 diff --git a/src/api/service/calendarService.ts b/src/api/service/calendarService.ts new file mode 100644 index 0000000..e339b02 --- /dev/null +++ b/src/api/service/calendarService.ts @@ -0,0 +1,79 @@ +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" +import PetDiary from "../../models/diary/PetDiary" +import UserDiary from "../../models/diary/UserDiary" +import { CalendarDateUserDto, CalendarDatePetDto, CalendarInfoResDto, CalendarResDto } from "../../dto/calendar/calendarResDto" +import User from "../../models/user/User" +import Book from "../../models/book/Book" +const dateMethod = require("../../modules/dateMethod") + +require('../../models/tableContents/FirstPartTableContents') +require('../../models/tableContents/SecondPartTableContent') +require('../../models/diary/PetDiary') +require('../../models/diary/UserDiary') +require('../../models/diary/PetEmotions') +require('../../models/book/Book') + +module.exports = { + getDiaryPerDate: async (year, month, part) => { + try { + const user = (await User.find().populate({path : "book"}))[0] + const author = user.book.author + const calendarResDto = new CalendarResDto(author, part) + if(part == 1){ + const calendarDiary = await PetDiary.find({ + date:{ + $gte : new Date(year, month-1, 1), + $lt : new Date(year, month, 1) + } + }).populate({ + path : "petEmotions pets", + }) + console.log('calendarDiary : '+calendarDiary) + const thisMonthLength = await dateMethod.getLastDateOfMonth(year,month) + + const calendarInfoResDto = new CalendarInfoResDto(year,month) + for(let i = 0;i diary.date.getDate() == i) + if(diariesPerMonth.length < 1){ + calendarInfoResDto.setDate(null) + }else{ + calendarInfoResDto.setDate(new CalendarDatePetDto(i+1,diariesPerMonth)) + } + //CalendarDiary에 각 일에 해당하는 일기를 만들어서 넣어주면된다 + } + calendarResDto.setCalendar(calendarInfoResDto) + }else if(part == 2){ + const calendarDiary = await UserDiary.find({ + date:{ + $gte : new Date(year, month-1, 1), + $lt : new Date(year, month, 1) + } + }).populate({ + path : "petEmotions pets" + }) + console.log('calendarDiary : '+calendarDiary) + const thisMonthLength = await dateMethod.getLastDateOfMonth(year,month) + + const calendarInfoResDto = new CalendarInfoResDto(year,month) + for(let i = 0;i diary.date.getDate() == i) + if(diariesPerMonth.length < 1){ + calendarInfoResDto.setDate(null) + }else{ + calendarInfoResDto.setDate(new CalendarDateUserDto(i+1,diariesPerMonth,user)) + } + //CalendarDiary에 각 일에 해당하는 일기를 만들어서 넣어주면된다 + } + calendarResDto.setCalendar(calendarInfoResDto) + } + return calendarResDto + } catch (err) { + throw err + } + }, + + getYearDiary: async (year, month, part) => { + + } +} \ No newline at end of file diff --git a/src/dto/calendar/calendarResDto.ts b/src/dto/calendar/calendarResDto.ts new file mode 100644 index 0000000..689c59a --- /dev/null +++ b/src/dto/calendar/calendarResDto.ts @@ -0,0 +1,75 @@ +import { IPetDiary } from "../../interfaces/diary/IPetDiary" +import { IUserDiary } from "../../interfaces/diary/IUserDiary" +import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents" +import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" +import { IUser } from "../../interfaces/user/IUser" + +const IPet = require("../../interfaces/pet/IPet") + +export class CalendarResDto{ + private name = null + private part = null + private nextEpilogue = null + private calendar = null + + constructor(name, part){ + this.name = name + this.part = part + } + + setCalendar(calendar : CalendarInfoResDto){ + this.calendar = calendar + } +} + +export class CalendarInfoResDto{ + private year = null + private month = null + private date = [] + + constructor(year ,month){ + this.year = year + this.month = month + } + + setDate(calendarDateDto : CalendarDatePetDto | CalendarDateUserDto){ + this.date.push(calendarDateDto) + } +} + +export class CalendarDatePetDto{ + private days = null + private kind = null + private id = [] + private feeling = null + + constructor(days, petDiaries : IPetDiary[] ){ + this.days = days + this.kind = petDiaries[0].pets[0].kind + this.id = petDiaries.map(diary=>diary._id) + this.feeling = petDiaries[0].petEmotions[0].feeling + } +} + +export class CalendarDateUserDto{ + private days = null + private kind = null + private diaryId = [] + private feeling = null + + constructor(days, userDiaries : IUserDiary[], user : IUser){ + this.days = days + this.kind = this.getUsersPet(user) + this.diaryId = userDiaries.map(diary => diary._id) + this.feeling = userDiaries[0].feeling + } + + getUsersPet(user : IUser){ + const pets = user.pets + let petsKind = null + for(let i = pets.length-1 ; i >=0 ; i--){ + if(pets[i].rainbow) petsKind = pets[i].kind + } + return petsKind + } +} \ No newline at end of file diff --git a/src/interfaces/diary/IUserDiary.ts b/src/interfaces/diary/IUserDiary.ts index 0119515..cfc78e8 100644 --- a/src/interfaces/diary/IUserDiary.ts +++ b/src/interfaces/diary/IUserDiary.ts @@ -8,6 +8,7 @@ export interface IUserDiary extends Document{ imgs : Array; feeling : Number; tableContents : ISecondPartTableContents; + episode : Number date : Date; } diff --git a/src/models/diary/UserDiary.ts b/src/models/diary/UserDiary.ts index 7a8b4be..05a35e1 100644 --- a/src/models/diary/UserDiary.ts +++ b/src/models/diary/UserDiary.ts @@ -16,6 +16,10 @@ const UserDiarySchema : Schema = new mongoose.Schema({ type : mongoose.SchemaTypes.ObjectId, ref : "SecondPartTableContents" }, + episode : { + type : Number, + default : 0 + }, date : { type : Date, default : Date.now() diff --git a/src/modules/dateMethod.ts b/src/modules/dateMethod.ts index 1ec28ad..220d619 100644 --- a/src/modules/dateMethod.ts +++ b/src/modules/dateMethod.ts @@ -27,5 +27,10 @@ module.exports = { const elapsedDay = elapsedMs / (1000*60*60*24) return elapsedDay + }, + + getLastDateOfMonth : async(year, month)=>{ + const lastDate = new Date(year,month-1,0) + return lastDate.getDate() } } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 3a14c14..751e492 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -24,6 +24,9 @@ module.exports = { SUCCESS_POST_EPILOGUE : "1부 끝 작가의말 - 에필로그 작성 성공", SUCCESS_GET_RAINBOW_SUB_PAGE : "무지개 서브뷰 불러오기 성공", + /**캘린더 */ + SUCCESS_GET_MONTH_CALENDAR : "해당 월의 캘린더 가져오기 성공", + SUCCESS_GET_YEAR_CALENDAR : "해당 년의 캘린더 가져오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", } \ No newline at end of file From 9b9f92f46e13c054edbc8553edac83f6398035a9 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 9 Jul 2021 02:34:20 +0900 Subject: [PATCH 041/168] =?UTF-8?q?feat=20:=20=EC=BA=98=EB=A6=B0=EB=8D=94?= =?UTF-8?q?=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/calendarController.ts | 11 ----------- src/api/router/calendar/index.ts | 3 +-- src/api/service/calendarService.ts | 4 ---- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/api/controller/calendarController.ts b/src/api/controller/calendarController.ts index 3c9cf94..2ffb34a 100644 --- a/src/api/controller/calendarController.ts +++ b/src/api/controller/calendarController.ts @@ -15,15 +15,4 @@ module.exports={ return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, - - yearCalendar:async(req,res)=>{ - const {year,month,part} = req.params - try{ - const result = await calendarService.getYearDiary(year,month,part) - return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_YEAR_CALENDAR,result)) - }catch(err){ - console.error(err) - return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) - } - } } \ No newline at end of file diff --git a/src/api/router/calendar/index.ts b/src/api/router/calendar/index.ts index 7cfaa94..8220b7f 100644 --- a/src/api/router/calendar/index.ts +++ b/src/api/router/calendar/index.ts @@ -2,7 +2,6 @@ var express = require('express') var router = express.Router() const calendarController = require('../../controller/calendarController') -router.get('/:year/:month/:part',calendarController.getCalendar)//월 캘린더 -// router.get('/year/:year/:moth/:part',calendarController.yearCalendar)//년 캘린더 +router.get('/:year/:month/:part',calendarController.getCalendar)//캘린더 module.exports = router \ No newline at end of file diff --git a/src/api/service/calendarService.ts b/src/api/service/calendarService.ts index e339b02..08541df 100644 --- a/src/api/service/calendarService.ts +++ b/src/api/service/calendarService.ts @@ -72,8 +72,4 @@ module.exports = { throw err } }, - - getYearDiary: async (year, month, part) => { - - } } \ No newline at end of file From 139d9a2d03834be0a131fa7632617805ddce42d7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 9 Jul 2021 02:56:43 +0900 Subject: [PATCH 042/168] =?UTF-8?q?refactor=20:=20getLastDateMonth=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/dateMethod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/dateMethod.ts b/src/modules/dateMethod.ts index 220d619..b31990b 100644 --- a/src/modules/dateMethod.ts +++ b/src/modules/dateMethod.ts @@ -30,7 +30,7 @@ module.exports = { }, getLastDateOfMonth : async(year, month)=>{ - const lastDate = new Date(year,month-1,0) + const lastDate = new Date(year,month,0) return lastDate.getDate() } } \ No newline at end of file From 044f330ab23c01437ea99e20be849b46b88df835 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 9 Jul 2021 18:14:51 +0900 Subject: [PATCH 043/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=ED=99=94=EB=A9=B4=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 17 ++++++++++++++++ src/api/router/index.ts | 1 + src/api/router/secondPart/index.ts | 7 +++++++ src/api/service/secondPartService.ts | 23 ++++++++++++++++++++++ src/modules/responseMessage.ts | 4 ++++ 5 files changed, 52 insertions(+) create mode 100644 src/api/controller/secondPartController.ts create mode 100644 src/api/router/secondPart/index.ts create mode 100644 src/api/service/secondPartService.ts diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts new file mode 100644 index 0000000..b3f67df --- /dev/null +++ b/src/api/controller/secondPartController.ts @@ -0,0 +1,17 @@ +var util = require('../../modules/util') +var responseMessage = require('../../modules/responseMessage') +var statusCode = require('../../modules/statusCode') +const secondPartService = require('../service/secondPartService') + +module.exports={ + getMainPage:async(req,res)=>{ + const {userId} = req.params + try{ + const result = await secondPartService.getMainPage(userId) + return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_SECOND_PART_MAIN_PAGE,result)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + } +} \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 8b121f2..c4bc01d 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -3,5 +3,6 @@ const router = express.Router() router.use('/rainbow',require('./rainbow')) //무지개\ router.use('/calendar',require('./calendar')) //캘린더 +router.use('/secondPart',require('./secondPart'))//2부 module.exports = router; \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts new file mode 100644 index 0000000..80077cf --- /dev/null +++ b/src/api/router/secondPart/index.ts @@ -0,0 +1,7 @@ +var express = require('express') +var router = express.Router() +const secondPartController = require('../../controller/secondPartController') + +router.get('/main/:userId',secondPartController.getMainPage) + +module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts new file mode 100644 index 0000000..5e117c0 --- /dev/null +++ b/src/api/service/secondPartService.ts @@ -0,0 +1,23 @@ +import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" +import PetDiary from "../../models/diary/PetDiary" +import UserDiary from "../../models/diary/UserDiary" +import User from "../../models/user/User" +import Book from "../../models/book/Book" +const dateMethod = require("../../modules/dateMethod") + +require('../../models/tableContents/FirstPartTableContents') +require('../../models/tableContents/SecondPartTableContent') +require('../../models/diary/PetDiary') +require('../../models/diary/UserDiary') +require('../../models/diary/PetEmotions') +require('../../models/book/Book') + +module.exports = { + getMainPage: async (userId) => { + try{ + + }catch(err){ + throw err + } + } +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 751e492..f6f6a29 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -27,6 +27,10 @@ module.exports = { /**캘린더 */ SUCCESS_GET_MONTH_CALENDAR : "해당 월의 캘린더 가져오기 성공", SUCCESS_GET_YEAR_CALENDAR : "해당 년의 캘린더 가져오기 성공", + + /**2부 */ + SUCCESS_GET_SECOND_PART_MAIN_PAGE : "2부 메인페이지 불러오기 성공", + /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", } \ No newline at end of file From 426d2fa358af7fc67664842b1a88d55512989cae Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 10 Jul 2021 00:50:54 +0900 Subject: [PATCH 044/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EB=B7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/secondPartService.ts | 43 +++++++++- .../secondPart/SecondPartMainPageResDto.ts | 81 +++++++++++++++++++ src/interfaces/book/IBook.ts | 1 + src/interfaces/diary/IPetDiary.ts | 2 +- src/interfaces/diary/IUserDiary.ts | 2 +- .../tableContents/ISecondPartTableContents.ts | 2 +- src/models/book/Book.ts | 4 + 7 files changed, 130 insertions(+), 5 deletions(-) create mode 100644 src/dto/secondPart/SecondPartMainPageResDto.ts diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 5e117c0..c8eecb6 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -3,6 +3,7 @@ import PetDiary from "../../models/diary/PetDiary" import UserDiary from "../../models/diary/UserDiary" import User from "../../models/user/User" import Book from "../../models/book/Book" +import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" const dateMethod = require("../../modules/dateMethod") require('../../models/tableContents/FirstPartTableContents') @@ -14,9 +15,47 @@ require('../../models/book/Book') module.exports = { getMainPage: async (userId) => { - try{ + try { + const user = await User.findById(userId).populate({ + path: "book", + populate: ({ + path: "tableContents", + populate: ({ + path: "secondPartTableContents", + populate: ({ + path: "userDiary" + }) + }) + }) + }) - }catch(err){ + const epilogue = user.book.tableContents.secondPartTableContents[0] + const checkFirst = user.book.tableContents.secondPartTableContents.map(tableContents => tableContents.userDiary) + let check = false + checkFirst.forEach(x => { + if (x.length > 1) check = true + }) + + let sortSecondPartTableContents = [] + if (check) { + sortSecondPartTableContents = user.book.tableContents.secondPartTableContents.filter(secondPartTableContents => + secondPartTableContents.userDiary.length > 1).sort((a, b) => + b.chapter - a.chapter + )[0].userDiary.sort((a, b) => + b.episode - a.episode + ) + }else{ + sortSecondPartTableContents.push({ + nextEpisode : 1, + episode : 0, + title : epilogue.title, + contents : epilogue.contents, + date : user.book.tableContents.secondPartStartDate + }) + } + + return new SecondPartMainPageResDto(user, sortSecondPartTableContents[0]) + } catch (err) { throw err } } diff --git a/src/dto/secondPart/SecondPartMainPageResDto.ts b/src/dto/secondPart/SecondPartMainPageResDto.ts new file mode 100644 index 0000000..cda4e18 --- /dev/null +++ b/src/dto/secondPart/SecondPartMainPageResDto.ts @@ -0,0 +1,81 @@ +import { IBook } from "../../interfaces/book/IBook" +import { IUserDiary } from "../../interfaces/diary/IUserDiary" +import { IPet } from "../../interfaces/pet/IPet" +import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" +import { IUser } from "../../interfaces/user/IUser" +const dateMethod = require('../../modules/dateMethod') + +export class SecondPartMainPageResDto{ + private part = null + private author = null + private bookImg = null + private memory : SecondPartMainPageMemory = null + private tableContents : SecondPartMainPageTableContents[] = null + private firstPartBook : SecondPartMainPageFirstPartBook = null + + constructor(user : IUser, sortUserDiary : IUserDiary){ + this.part = 2 + this.author = user.book.author + this.bookImg = user.book.imgs + this.memory = new SecondPartMainPageMemory(sortUserDiary) + this.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents=> + new SecondPartMainPageTableContents(secondPartTableContents)) + this.firstPartBook = new SecondPartMainPageFirstPartBook(user.book) + } +} + +export class SecondPartMainPageMemory{ + private diary : SecondPartMainPageDiary= null + private nextEpisode = null + + constructor(sortUserDiary : IUserDiary){ + this.diary = new SecondPartMainPageDiary(sortUserDiary) + this.nextEpisode = sortUserDiary.episode+1 + } +} + +export class SecondPartMainPageDiary{ + private episode = null + private title = null + private contents = null + private date = null + + constructor(sortUserDiary : IUserDiary){ + this.init(sortUserDiary) + } + + async init(sortUserDiary){ + this.episode = sortUserDiary.episode + this.title = sortUserDiary.title + this.contents = sortUserDiary.contents + this.date = await dateMethod.toStringByFormatting(sortUserDiary.date) + } +} + +export class SecondPartMainPageTableContents{ + private chapter = null + private title = null + private episodePerChapterCount = null + private _id = null + + constructor(secondPartTableContents : ISecondPartTableContents){ + this.chapter = secondPartTableContents.chapter + this.title = secondPartTableContents.title + this._id = secondPartTableContents._id + this.episodePerChapterCount = secondPartTableContents.userDiary.length + } +} + +export class SecondPartMainPageFirstPartBook{ + private _id = null + private bookImg = null + private author = null + private date = null + + constructor(book : IBook){ + this._id = book._id + this.bookImg = book.imgs + this.author = book.author + this.date = book.date + } +} \ No newline at end of file diff --git a/src/interfaces/book/IBook.ts b/src/interfaces/book/IBook.ts index bd3fa59..fc61f8b 100644 --- a/src/interfaces/book/IBook.ts +++ b/src/interfaces/book/IBook.ts @@ -7,6 +7,7 @@ export interface IBook extends Document { author: String; imgs: String; tableContents: ITableContents; + date : Date } export interface IBookDocument extends IBook { diff --git a/src/interfaces/diary/IPetDiary.ts b/src/interfaces/diary/IPetDiary.ts index 4e0cfdb..ae867e9 100644 --- a/src/interfaces/diary/IPetDiary.ts +++ b/src/interfaces/diary/IPetDiary.ts @@ -12,7 +12,7 @@ export interface IPetDiary extends Document{ contents : String; imgs : Array; petEmotions : Array; - episode : Number; + episode : number; date : Date; } diff --git a/src/interfaces/diary/IUserDiary.ts b/src/interfaces/diary/IUserDiary.ts index cfc78e8..1beba72 100644 --- a/src/interfaces/diary/IUserDiary.ts +++ b/src/interfaces/diary/IUserDiary.ts @@ -8,7 +8,7 @@ export interface IUserDiary extends Document{ imgs : Array; feeling : Number; tableContents : ISecondPartTableContents; - episode : Number + episode : number date : Date; } diff --git a/src/interfaces/tableContents/ISecondPartTableContents.ts b/src/interfaces/tableContents/ISecondPartTableContents.ts index 6e0cc49..40589c9 100644 --- a/src/interfaces/tableContents/ISecondPartTableContents.ts +++ b/src/interfaces/tableContents/ISecondPartTableContents.ts @@ -3,7 +3,7 @@ import {IUserDiary} from "../diary/IUserDiary" export interface ISecondPartTableContents extends Document{ _id : mongoose.Types.ObjectId; - chapter : Number; + chapter : number; title : String; contents : String; userDiary : Array; diff --git a/src/models/book/Book.ts b/src/models/book/Book.ts index ca1fd92..9fcd9d7 100644 --- a/src/models/book/Book.ts +++ b/src/models/book/Book.ts @@ -9,6 +9,10 @@ const BookSchema: Schema = new mongoose.Schema({ tableContents: { type: mongoose.SchemaTypes.ObjectId, ref: "TableContents" + }, + date : { + type : Date, + default : Date.now() } }) From 9aea7b859b1c2fb1a54e53dc9e14be6b9917517d Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 10 Jul 2021 01:42:28 +0900 Subject: [PATCH 045/168] =?UTF-8?q?=EB=AA=A9=EC=B0=A8=EB=B3=84=20=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 22 +++++++++++ src/api/router/chapter/index.ts | 8 ++++ src/api/router/diary/index.ts | 11 ------ src/api/router/index.ts | 3 +- src/api/service/chapterService.ts | 42 ++++++++++++++++++++ src/dto/petChapter/PetChapterDiary.ts | 51 +++++++++++++++++++++++++ src/dto/petDiary/PetDiaryPageResDto.ts | 21 ++++------ 7 files changed, 131 insertions(+), 27 deletions(-) create mode 100644 src/api/controller/chapterController.ts create mode 100644 src/api/router/chapter/index.ts delete mode 100644 src/api/router/diary/index.ts create mode 100644 src/api/service/chapterService.ts create mode 100644 src/dto/petChapter/PetChapterDiary.ts diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts new file mode 100644 index 0000000..9b68715 --- /dev/null +++ b/src/api/controller/chapterController.ts @@ -0,0 +1,22 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const diaryService = require('../service/diaryService') + +module.exports = { + getChapterDiary: async (req, res) => { + const chapterId = req.parms.id; + try { + const result = await diaryService.getChapterDiary(chapterId) + res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } +} +export{} \ No newline at end of file diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts new file mode 100644 index 0000000..c24c1ee --- /dev/null +++ b/src/api/router/chapter/index.ts @@ -0,0 +1,8 @@ +const express = require('express') +const router = express.Router() +const diaryController = require('../../controller/diaryController') + +router.get('/diaries/:id',diaryController.getChapterDiary) //1부 목차별 일기 조회 + +module.exports = router; +export{}; \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts deleted file mode 100644 index 71de7d5..0000000 --- a/src/api/router/diary/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -const express = require('express') -const router = express.Router() -const diaryController = require('../../controller/diaryController') - -router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 -router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 -router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 -router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 -router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 -module.exports = router; -export{}; \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 186c9f6..11e9db8 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,5 @@ import express from "express" const router = express.Router() -//router.use('/book',require('./book')) //1부,2부 책 -router.use('/diary',require('./diary'));//1부 일기 +router.use('/chapter',require('./chapter'));//1부 목차 module.exports = router; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts new file mode 100644 index 0000000..471d812 --- /dev/null +++ b/src/api/service/chapterService.ts @@ -0,0 +1,42 @@ +import Book from "../../models/book/Book" +import TableContents from "../../models/tableContents/TableContents" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import Pet from "../../models/pet/Pet" +import { response } from "express" +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +module.exports = { + getChapterDiary: async (chapterId) => { + try { + //챕터 id로 1부 목차 + //findFirstTableContents + const findFirstTableContents= await FirstPartTableContents.findById(chapterId).populate('petDiary'); + //for 문으로 1장부터 + for(let i=0;i Date: Sat, 10 Jul 2021 03:19:21 +0900 Subject: [PATCH 046/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=EB=B3=84=20=EC=9D=BC=EA=B8=B0=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 23 +++++--- src/api/router/index.ts | 6 +-- src/api/router/secondPart/index.ts | 3 +- src/api/service/secondPartService.ts | 37 ++++++++++--- .../SecondPartDiariesOfMonthResDto.ts | 52 +++++++++++++++++++ src/modules/responseMessage.ts | 1 + 6 files changed, 106 insertions(+), 16 deletions(-) create mode 100644 src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index b3f67df..bbe364c 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -3,13 +3,24 @@ var responseMessage = require('../../modules/responseMessage') var statusCode = require('../../modules/statusCode') const secondPartService = require('../service/secondPartService') -module.exports={ - getMainPage:async(req,res)=>{ - const {userId} = req.params - try{ +module.exports = { + getMainPage: async (req, res) => { + const { userId } = req.params + try { const result = await secondPartService.getMainPage(userId) - return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_SECOND_PART_MAIN_PAGE,result)) - }catch(err){ + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_MAIN_PAGE, result)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + getDiaryOfTableContents: async (req, res) => { + const { tableContentsId } = req.params + try { + const result = await secondPartService.getDiaryOfTableContents(tableContentsId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS, result)) + } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } diff --git a/src/api/router/index.ts b/src/api/router/index.ts index c4bc01d..21b7ac2 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,8 +1,8 @@ import express from "express" const router = express.Router() -router.use('/rainbow',require('./rainbow')) //무지개\ -router.use('/calendar',require('./calendar')) //캘린더 -router.use('/secondPart',require('./secondPart'))//2부 +router.use('/rainbow', require('./rainbow')) //무지개\ +router.use('/calendar', require('./calendar')) //캘린더 +router.use('/secondPart', require('./secondPart'))//2부 module.exports = router; \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index 80077cf..1ef5c6d 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -2,6 +2,7 @@ var express = require('express') var router = express.Router() const secondPartController = require('../../controller/secondPartController') -router.get('/main/:userId',secondPartController.getMainPage) +router.get('/main/:userId', secondPartController.getMainPage) +router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents) module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index c8eecb6..a295064 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -4,6 +4,7 @@ import UserDiary from "../../models/diary/UserDiary" import User from "../../models/user/User" import Book from "../../models/book/Book" import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" +import { SecondPartDiariesOfMonth, SecondPartDiariesOfMonthResDto } from "../../dto/secondPart/SecondPartDiariesOfMonthResDto" const dateMethod = require("../../modules/dateMethod") require('../../models/tableContents/FirstPartTableContents') @@ -44,13 +45,13 @@ module.exports = { )[0].userDiary.sort((a, b) => b.episode - a.episode ) - }else{ + } else { sortSecondPartTableContents.push({ - nextEpisode : 1, - episode : 0, - title : epilogue.title, - contents : epilogue.contents, - date : user.book.tableContents.secondPartStartDate + nextEpisode: 1, + episode: 0, + title: epilogue.title, + contents: epilogue.contents, + date: user.book.tableContents.secondPartStartDate }) } @@ -58,5 +59,29 @@ module.exports = { } catch (err) { throw err } + }, + + getDiaryOfTableContents: async (tableContentsId) => { + try{ + const tableContents = await SecondPartTableContent.findById(tableContentsId).populate({ + path : "userDiary" + }) + const test = tableContents.userDiary.filter( userDiary => + userDiary.date.getMonth() == 6 + ) + + const secondPartDiariesOfMonth : SecondPartDiariesOfMonth[]= [] + for(let i = 12 ; i >0 ;i--){ + if((tableContents.userDiary.map(diary=>diary.date.getMonth() == i)).includes(true)){ + const filteringDiaries = tableContents.userDiary.filter(userDiary=> + userDiary.date.getMonth() == i) + secondPartDiariesOfMonth.push(new SecondPartDiariesOfMonth(i+1,filteringDiaries)) + } + } + + return new SecondPartDiariesOfMonthResDto(tableContents, secondPartDiariesOfMonth) + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts new file mode 100644 index 0000000..173829a --- /dev/null +++ b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts @@ -0,0 +1,52 @@ +import { IUserDiary } from "../../interfaces/diary/IUserDiary" +import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" + +export class SecondPartDiariesOfMonthResDto{ + private _id = null + private chapter = null + private chapterTitle = null + private diariesOfMonth = [] + + constructor(tableContents : ISecondPartTableContents, secondPartyDiariesOfMonth : SecondPartDiariesOfMonth[]){ + this._id = tableContents._id + this.chapter = tableContents.chapter + this.chapterTitle = tableContents.title + this.diariesOfMonth = secondPartyDiariesOfMonth + } +} + +export class SecondPartDiariesOfMonth{ + private month = null + private diaryCountOfTableContents = null + private diaries = [] + + constructor(month : number, userDiaries : IUserDiary[]){ + this.month = month + this.diaryCountOfTableContents = userDiaries.length + this.diaries.push(userDiaries.sort((a,b)=> + b.date.getDate() - a.date.getDate() + ).map(diary=> new SecondPartDiaries(diary))) + } +} + +export class SecondPartDiaries{ + private days = null + private weekdays = null + private feeling = null + private kind = null + private title = null + private contents = null + private img = null + + constructor(userDiary : IUserDiary){ + const weeks = ["일","월","화","수","목","금","토"] + + this.days = userDiary.date.getDate() + this.weekdays = weeks[userDiary.date.getDay()] + this.feeling = userDiary.feeling + this.kind = 0 + this.title = userDiary.title + this.contents = userDiary.contents + this.img = userDiary.imgs[0] + } +} \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index f6f6a29..38bcf49 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -30,6 +30,7 @@ module.exports = { /**2부 */ SUCCESS_GET_SECOND_PART_MAIN_PAGE : "2부 메인페이지 불러오기 성공", + SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS : "2부 목차별 일기 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From c44025311a625e42cad853dffef562675b4b3adb Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 10 Jul 2021 03:36:05 +0900 Subject: [PATCH 047/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=97=90=20feeling=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 6 ++-- src/api/router/chapter/index.ts | 4 +-- src/api/service/chapterService.ts | 33 ++++++++++++------- src/dto/petChapter/PetChapterDiary.ts | 42 +++++++++++++++++++------ 4 files changed, 59 insertions(+), 26 deletions(-) diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts index 9b68715..a4f3796 100644 --- a/src/api/controller/chapterController.ts +++ b/src/api/controller/chapterController.ts @@ -1,13 +1,13 @@ const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') -const diaryService = require('../service/diaryService') +const chapterService = require('../service/chapterService') module.exports = { getChapterDiary: async (req, res) => { - const chapterId = req.parms.id; + const chapterId=req.params.id;//id를 뺴면 객체를 보내줌 try { - const result = await diaryService.getChapterDiary(chapterId) + const result = await chapterService.getChapterDiary(chapterId) res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) } catch (err) { console.error(err) diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts index c24c1ee..59c1204 100644 --- a/src/api/router/chapter/index.ts +++ b/src/api/router/chapter/index.ts @@ -1,8 +1,8 @@ const express = require('express') const router = express.Router() -const diaryController = require('../../controller/diaryController') +const chapterController = require('../../controller/chapterController') -router.get('/diaries/:id',diaryController.getChapterDiary) //1부 목차별 일기 조회 +router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 조회 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 471d812..7c9f689 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -5,13 +5,14 @@ import Pet from "../../models/pet/Pet" import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" -import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" +import { DiariesResDto, MonthlyDiaryResDto, PetChapterDiaryResDto } from "../../dto/petChapter/PetChapterDiary" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') require('../../models/diary/PetDiary') +require('../../models/diary/PetEmotions') const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -21,19 +22,29 @@ module.exports = { try { //챕터 id로 1부 목차 //findFirstTableContents - const findFirstTableContents= await FirstPartTableContents.findById(chapterId).populate('petDiary'); - //for 문으로 1장부터 - for(let i=0;i Date: Sat, 10 Jul 2021 13:04:13 +0900 Subject: [PATCH 048/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 10 +++++++++ src/api/router/secondPart/index.ts | 1 + src/api/service/secondPartService.ts | 10 +++++++++ .../secondPart/SecondPartChapterListResDto.ts | 22 +++++++++++++++++++ .../SecondPartDiariesOfMonthResDto.ts | 4 ++-- src/modules/responseMessage.ts | 1 + 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/dto/secondPart/SecondPartChapterListResDto.ts diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index bbe364c..c001341 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -24,5 +24,15 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + getSecondPartChapterList:async(req,res)=>{ + try{ + const result = await secondPartService.getSecondPartChapterList() + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_CHAPTER_LIST, result)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index 1ef5c6d..dd65dc0 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -4,5 +4,6 @@ const secondPartController = require('../../controller/secondPartController') router.get('/main/:userId', secondPartController.getMainPage) router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents) +router.get('/chapter/list',secondPartController.getSecondPartChapterList) module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index a295064..4f023c5 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -5,6 +5,7 @@ import User from "../../models/user/User" import Book from "../../models/book/Book" import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" import { SecondPartDiariesOfMonth, SecondPartDiariesOfMonthResDto } from "../../dto/secondPart/SecondPartDiariesOfMonthResDto" +import { SecondPartChapterListResDto } from "../../dto/secondPart/SecondPartChapterListResDto" const dateMethod = require("../../modules/dateMethod") require('../../models/tableContents/FirstPartTableContents') @@ -83,5 +84,14 @@ module.exports = { }catch(err){ throw err } + }, + + getSecondPartChapterList:async()=>{ + try{ + const chapterList = await SecondPartTableContent.find() + return new SecondPartChapterListResDto(chapterList) + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/dto/secondPart/SecondPartChapterListResDto.ts b/src/dto/secondPart/SecondPartChapterListResDto.ts new file mode 100644 index 0000000..baa21a2 --- /dev/null +++ b/src/dto/secondPart/SecondPartChapterListResDto.ts @@ -0,0 +1,22 @@ +import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" + +export class SecondPartChapterListResDto{ + private tableContents : SecondPartChapterList[] = [] + + constructor(secondPartChapterList : ISecondPartTableContents[]){ + this.tableContents = secondPartChapterList.map(chapter=> + new SecondPartChapterList(chapter)) + } +} + +export class SecondPartChapterList{ + private _id = null + private chapter = null + private title = null + + constructor(chapter : ISecondPartTableContents){ + this._id = chapter._id + this.chapter = chapter.chapter + this.title = chapter.title + } +} \ No newline at end of file diff --git a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts index 173829a..7a643a9 100644 --- a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts +++ b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts @@ -31,7 +31,7 @@ export class SecondPartDiariesOfMonth{ export class SecondPartDiaries{ private days = null - private weekdays = null + private dayOfWeek = null private feeling = null private kind = null private title = null @@ -42,7 +42,7 @@ export class SecondPartDiaries{ const weeks = ["일","월","화","수","목","금","토"] this.days = userDiary.date.getDate() - this.weekdays = weeks[userDiary.date.getDay()] + this.dayOfWeek = weeks[userDiary.date.getDay()] this.feeling = userDiary.feeling this.kind = 0 this.title = userDiary.title diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 38bcf49..d88c4ae 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -31,6 +31,7 @@ module.exports = { /**2부 */ SUCCESS_GET_SECOND_PART_MAIN_PAGE : "2부 메인페이지 불러오기 성공", SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS : "2부 목차별 일기 불러오기 성공", + SUCCESS_GET_SECOND_PART_CHAPTER_LIST : "2부 목차 리스트 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 274917e246f887c8b0c17f4939d54f659e225849 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 10 Jul 2021 13:38:54 +0900 Subject: [PATCH 049/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 11 ++++++++++ src/api/router/secondPart/index.ts | 1 + src/api/service/secondPartService.ts | 25 ++++++++++++++++++++++ src/modules/responseMessage.ts | 1 + 4 files changed, 38 insertions(+) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index c001341..f0f8337 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -34,5 +34,16 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + addSecondPartChapter:async(req,res)=>{ + const chapterData = req.body + try{ + await secondPartService.addSecondPartChapter(chapterData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index dd65dc0..e1c0165 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -5,5 +5,6 @@ const secondPartController = require('../../controller/secondPartController') router.get('/main/:userId', secondPartController.getMainPage) router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents) router.get('/chapter/list',secondPartController.getSecondPartChapterList) +router.post('/chapter',secondPartController.addSecondPartChapter) module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 4f023c5..4fcb051 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -6,6 +6,7 @@ import Book from "../../models/book/Book" import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" import { SecondPartDiariesOfMonth, SecondPartDiariesOfMonthResDto } from "../../dto/secondPart/SecondPartDiariesOfMonthResDto" import { SecondPartChapterListResDto } from "../../dto/secondPart/SecondPartChapterListResDto" +import TableContents from "../../models/tableContents/TableContents" const dateMethod = require("../../modules/dateMethod") require('../../models/tableContents/FirstPartTableContents') @@ -93,5 +94,29 @@ module.exports = { }catch(err){ throw err } + }, + + addSecondPartChapter:async(chapterData)=>{ + try{ + let newChapter = new SecondPartTableContent({ + title : chapterData.title, + chapter : await getNextChapter() + }) + await newChapter.save() + + const tableContents = (await TableContents.find())[0] + await tableContents.setSecondPartTableContents(newChapter) + await tableContents.save() + + }catch(err){ + throw err + } + + async function getNextChapter(){ + const secondPartTableContents = (await SecondPartTableContent.find()) + const secondPartLength = secondPartTableContents.length + + return secondPartTableContents[secondPartLength-1].chapter +1 + } } } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index d88c4ae..543d990 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -32,6 +32,7 @@ module.exports = { SUCCESS_GET_SECOND_PART_MAIN_PAGE : "2부 메인페이지 불러오기 성공", SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS : "2부 목차별 일기 불러오기 성공", SUCCESS_GET_SECOND_PART_CHAPTER_LIST : "2부 목차 리스트 불러오기 성공", + SUCCESS_POST_SECOND_PART_ADD_CHAPTER : "2부 목차 추가 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 0d1fee8b7a09f29fa2b4d3bc6a192c5d9b1c8a1c Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 10 Jul 2021 13:41:46 +0900 Subject: [PATCH 050/168] =?UTF-8?q?refactor=20:=20=EB=AA=A9=EC=B0=A8?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20body=20=ED=95=84=EB=93=9C=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/secondPartService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 4fcb051..cd69e75 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -99,7 +99,7 @@ module.exports = { addSecondPartChapter:async(chapterData)=>{ try{ let newChapter = new SecondPartTableContent({ - title : chapterData.title, + title : chapterData.chapterTitle, chapter : await getNextChapter() }) await newChapter.save() From 4188886b310e1c023fa5dee6b9a6a2e8d2484178 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 10 Jul 2021 14:17:29 +0900 Subject: [PATCH 051/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 12 ++++++++++++ src/api/router/secondPart/index.ts | 1 + src/api/service/secondPartService.ts | 11 +++++++++++ src/modules/responseMessage.ts | 1 + 4 files changed, 25 insertions(+) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index f0f8337..ae2eab0 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -45,5 +45,17 @@ module.exports = { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + modifySecondPartChapterInfo:async(req,res)=>{ + const {chapterId} = req.params + const modifyChapterData = req.body + try{ + await secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER)) + }catch(err){ + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } } \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index e1c0165..2bd1e4c 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -6,5 +6,6 @@ router.get('/main/:userId', secondPartController.getMainPage) router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents) router.get('/chapter/list',secondPartController.getSecondPartChapterList) router.post('/chapter',secondPartController.addSecondPartChapter) +router.put('/chapter/:chapterId',secondPartController.modifySecondPartChapterInfo) module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index cd69e75..b7afee1 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -118,5 +118,16 @@ module.exports = { return secondPartTableContents[secondPartLength-1].chapter +1 } + }, + + modifySecondPartChapterInfo:async(chapterId,modifyChapterData)=>{ + try{ + const findSecondPartTableContents = await SecondPartTableContent.update( + {_id : chapterId}, + {$set : {title : modifyChapterData.chapterTitle}} + ) + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 543d990..f165cfe 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -33,6 +33,7 @@ module.exports = { SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS : "2부 목차별 일기 불러오기 성공", SUCCESS_GET_SECOND_PART_CHAPTER_LIST : "2부 목차 리스트 불러오기 성공", SUCCESS_POST_SECOND_PART_ADD_CHAPTER : "2부 목차 추가 성공", + SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER: "2부 목차 수정 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 6e13ecf2dc560b184173d9a2e377eb7acce1e2f2 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 10 Jul 2021 13:20:56 +0900 Subject: [PATCH 052/168] =?UTF-8?q?feat=20:=20=EB=AA=A9=EC=B0=A8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 16 ++++++++++++- src/api/router/chapter/index.ts | 1 + src/api/service/chapterService.ts | 16 +++++++++++-- src/dto/petChapter/ChapterList.ts | 32 +++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 src/dto/petChapter/ChapterList.ts diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts index a4f3796..46aea17 100644 --- a/src/api/controller/chapterController.ts +++ b/src/api/controller/chapterController.ts @@ -8,7 +8,21 @@ module.exports = { const chapterId=req.params.id;//id를 뺴면 객체를 보내줌 try { const result = await chapterService.getChapterDiary(chapterId) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTER_PETDIARY , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + getChapterList:async(req,res)=>{ + const userId=req.params.id; + try { + const result = await chapterService.getChapterList(userId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTER_PETDIARY , result)) } catch (err) { console.error(err) if (err.statusCode == null) { diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts index 59c1204..00c8c26 100644 --- a/src/api/router/chapter/index.ts +++ b/src/api/router/chapter/index.ts @@ -3,6 +3,7 @@ const router = express.Router() const chapterController = require('../../controller/chapterController') router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 조회 +router.get('/:id',chapterController.getChapterList)//목차리스트 조회 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 7c9f689..5f82e5c 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -6,6 +6,8 @@ import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" import { DiariesResDto, MonthlyDiaryResDto, PetChapterDiaryResDto } from "../../dto/petChapter/PetChapterDiary" +import User from "../../models/user/User" +import { ChapterListResDto, ChapterResDto } from "../../dto/petChapter/ChapterList" require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -22,7 +24,7 @@ module.exports = { try { //챕터 id로 1부 목차 //findFirstTableContents - const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({path:"petDiary",populate:({path:"petEmotions"})}); + const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions" }) }); //.populate({path:"petDiary",populate:({path:"petEmotions"})}) let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) //월별로 자르기 @@ -35,7 +37,7 @@ module.exports = { cnt++; let newDiary = new DiariesResDto(findFirstTableContents.petDiary[i])//diary monthly.setDiaries(newDiary) - console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) + //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } } monthly.setMonthCount(cnt) @@ -49,5 +51,15 @@ module.exports = { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } + }, + getChapterList: async (userId) => { + const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + let chapterList = new ChapterListResDto() + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + let newChapter = new ChapterResDto(new FirstPartTableContents(findUserChapter.book.tableContents.firstPartTableContents[i])) + chapterList.setChapterList(newChapter) + } + console.log(chapterList) + return chapterList } } diff --git a/src/dto/petChapter/ChapterList.ts b/src/dto/petChapter/ChapterList.ts new file mode 100644 index 0000000..b97fc58 --- /dev/null +++ b/src/dto/petChapter/ChapterList.ts @@ -0,0 +1,32 @@ +import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; +import { IPetEmotions } from "../../interfaces/diary/IPetEmotions"; +import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents"; +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +const dateMethod = require('../../modules/dateMethod') + +export class ChapterListResDto{ + public tableContents = [ ] + + setChapterList(chapter:ChapterResDto){ + this.tableContents.push(chapter) + } +} +export class ChapterResDto{ + public chapterId=null + public chapter=null + public chapterTitle=null + + constructor(firstPartTableContents:IFirstPartTableContents){ + this.chapterId=firstPartTableContents._id + this.chapter=firstPartTableContents.chapter + this.chapterTitle=firstPartTableContents.title + } +} + +export{} \ No newline at end of file From 1a6a8a0fcfb5d2988b6e460847c9075000a71ea0 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 10 Jul 2021 15:26:46 +0900 Subject: [PATCH 053/168] =?UTF-8?q?feat=20:=20=EB=AA=A9=EC=B0=A8=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 17 ++++++++++++++++- src/api/router/chapter/index.ts | 1 + src/api/service/chapterService.ts | 24 ++++++++++++++++++++++++ src/dto/petChapter/ChapterList.ts | 3 +-- src/modules/responseMessage.ts | 5 +++++ 5 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts index 46aea17..6954708 100644 --- a/src/api/controller/chapterController.ts +++ b/src/api/controller/chapterController.ts @@ -22,7 +22,22 @@ module.exports = { const userId=req.params.id; try { const result = await chapterService.getChapterList(userId) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTER_PETDIARY , result)) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + postChapterList:async(req,res)=>{ + const userId=req.params.id + const chapterTitle=req.body.chapterTitle; + try { + const result = await chapterService.postChapterList(userId,chapterTitle) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_CHAPTERLIST , result)) } catch (err) { console.error(err) if (err.statusCode == null) { diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts index 00c8c26..85a5520 100644 --- a/src/api/router/chapter/index.ts +++ b/src/api/router/chapter/index.ts @@ -4,6 +4,7 @@ const chapterController = require('../../controller/chapterController') router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 조회 router.get('/:id',chapterController.getChapterList)//목차리스트 조회 +router.post('/:id',chapterController.postChapterList)//목차리스트 추가 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 5f82e5c..ecc3a45 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -61,5 +61,29 @@ module.exports = { } console.log(chapterList) return chapterList + }, + postChapterList:async(userId,chapterTitle)=>{ + const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + const newFirstPartTable=new FirstPartTableContents();//chapter,title + console.log(findUserChapter) + console.log(chapterTitle) + let max=0 + + for (let i=0;i Date: Sat, 10 Jul 2021 17:30:46 +0900 Subject: [PATCH 054/168] =?UTF-8?q?feat=20:=20=EB=AA=A9=EC=B0=A8=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 15 +++++++ src/api/router/chapter/index.ts | 2 +- src/api/service/chapterService.ts | 58 +++++++++++++++++-------- src/modules/responseMessage.ts | 2 + 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts index 6954708..a317b0b 100644 --- a/src/api/controller/chapterController.ts +++ b/src/api/controller/chapterController.ts @@ -46,6 +46,21 @@ module.exports = { } return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } + }, + putChapterList:async(req,res)=>{ + const chapterId=req.params.id + const chapterTitle=req.body.chapterTitle; + try { + const result = await chapterService.putChapterList(chapterId,chapterTitle) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_EDIT_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } } } export{} \ No newline at end of file diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts index 85a5520..9836afc 100644 --- a/src/api/router/chapter/index.ts +++ b/src/api/router/chapter/index.ts @@ -5,6 +5,6 @@ const chapterController = require('../../controller/chapterController') router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 조회 router.get('/:id',chapterController.getChapterList)//목차리스트 조회 router.post('/:id',chapterController.postChapterList)//목차리스트 추가 - +router.put('/:id',chapterController.putChapterList)//목차리스트 수정 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index ecc3a45..6727afd 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -62,28 +62,48 @@ module.exports = { console.log(chapterList) return chapterList }, - postChapterList:async(userId,chapterTitle)=>{ - const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); - const newFirstPartTable=new FirstPartTableContents();//chapter,title - console.log(findUserChapter) - console.log(chapterTitle) - let max=0 - - for (let i=0;i { + try { + const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + const newFirstPartTable = new FirstPartTableContents();//chapter,title + console.log(findUserChapter) + console.log(chapterTitle) + let max = 0 + + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + if (max < findUserChapter.book.tableContents.firstPartTableContents[i].chapter) { + max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter) + } } - } - newFirstPartTable.chapter=max+1 - newFirstPartTable.title=chapterTitle + newFirstPartTable.chapter = max + newFirstPartTable.title = chapterTitle + + await newFirstPartTable.save() + findUserChapter.book.tableContents.firstPartTableContents.push(newFirstPartTable) + let newTableContents = new TableContents(findUserChapter.book.tableContents) + await newTableContents.save() - await newFirstPartTable.save() - findUserChapter.book.tableContents.firstPartTableContents.push(newFirstPartTable) - let newTableContents=new TableContents(findUserChapter.book.tableContents) - await newTableContents.save() + console.log(newTableContents) - console.log(newTableContents) + return responseMessage.SUCCESS_POST_CHAPTERLIST; + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } + }, + putChapterList: async (chapterId, chapterTitle) => { + try { + const findChapter = await FirstPartTableContents.findById(chapterId); + findChapter.title = chapterTitle + const editFirstPartTableContents = new FirstPartTableContents(findChapter) + await editFirstPartTableContents.save() + console.log(editFirstPartTableContents) - return responseMessage.SUCCESS_POST_CHAPTERLIST; + return responseMessage.SUCCESS_PUT_CHAPTERLIST; + } + catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } } } diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 56f5483..1cab4ff 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -16,6 +16,7 @@ module.exports = { /*1부(by.sol) */ NO_BOOK:"존재하지 않는 책 id입니다.", NO_DIARY:"존재하지 않는 다이어리 id입니다.", + NO_CONTENTS:"존재하지 않는 정보입니다.", SUCCESS_POST_PETDIARY:"반려동물 다이어리 작성 성공", SUCCESS_EDIT_PETDIARY:"반려동물 다이어리 수정 성공", SUCCESS_DELETE_PETDIARY:"반려동물 다이어리 삭제 성공", @@ -25,6 +26,7 @@ module.exports = { SUCCESS_EDIT_CHAPTERLIST: "목차 리스트 수정 성공", SUCCESS_DELETE_CHAPTERLIST: "목차 리스트 삭제 성공", + /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", SUCCESS_GET_RAINBOW_PET : "무지개 건넌 동물 불러오기 성공", From 8aba5ca14bd498e00f41d104de064f1c3a155e45 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 10 Jul 2021 17:57:08 +0900 Subject: [PATCH 055/168] =?UTF-8?q?feat=20:=20=EB=AA=A9=EC=B0=A8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/chapterController.ts | 14 +++++++++++++ src/api/router/chapter/index.ts | 1 + src/api/service/chapterService.ts | 26 +++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts index a317b0b..8398888 100644 --- a/src/api/controller/chapterController.ts +++ b/src/api/controller/chapterController.ts @@ -61,6 +61,20 @@ module.exports = { } return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } + }, + deleteChapterList:async(req,res)=>{ + const chapterId=req.params.id + try { + const result = await chapterService.deleteChapterList(chapterId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_DELETE_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } } } export{} \ No newline at end of file diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts index 9836afc..cf544ab 100644 --- a/src/api/router/chapter/index.ts +++ b/src/api/router/chapter/index.ts @@ -6,5 +6,6 @@ router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 router.get('/:id',chapterController.getChapterList)//목차리스트 조회 router.post('/:id',chapterController.postChapterList)//목차리스트 추가 router.put('/:id',chapterController.putChapterList)//목차리스트 수정 +router.delete('/:id',chapterController.deleteChapterList)//목차리스트 삭제 module.exports = router; export{}; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 6727afd..95187c1 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -105,5 +105,31 @@ module.exports = { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } } + }, + deleteChapterList: async (chapterId) => { + try { + let findChapter = await FirstPartTableContents.findById(chapterId); + const curChapter = findChapter.chapter + const allFirstTableContents = await FirstPartTableContents.find({}); + let updateFTC=new FirstPartTableContents() + //해당 목차보다 큰 목차 -=1 + for (let i = 0; i < allFirstTableContents.length; i++) { + if (allFirstTableContents[i].chapter > curChapter) { + allFirstTableContents[i].chapter = Number(allFirstTableContents[i].chapter) - 1; + } + //db save + updateFTC=allFirstTableContents[i] + await updateFTC.save() + } + console.log(allFirstTableContents) + + //해당 목차 삭제 + findChapter=null; + return responseMessage.SUCCESS_DELETE_CHAPTERLIST; + } + catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } } } From 8e3554277c37e2946e2738920402c80847a020ed Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sun, 11 Jul 2021 03:10:10 +0900 Subject: [PATCH 056/168] =?UTF-8?q?refactor=20:=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 45 +++++++++++++------------- src/dto/petDiary/PetDiaryPageResDto.ts | 21 ++++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 982cfdc..3f01074 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -7,7 +7,6 @@ import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" -import { isNull } from "util" import { TIMEOUT } from "dns" require("../../models/user/User") require("../../models/book/Book") @@ -23,12 +22,11 @@ module.exports = { postPrologue: async (bookData) => { try { // add book info - let book = await new Book(); - book = await Book.findById(bookData._id); - book.title = await bookData.title; - book.imgs = await bookData.image; - book.author = await bookData.userName; - + let book = await Book.findById(bookData._id); + book.title = bookData.title; + book.imgs = bookData.image; + book.author = bookData.userName; + console.log(book) //add tableContents info let tc = await new TableContents(); let ftc = await new FirstPartTableContents({ @@ -41,6 +39,7 @@ module.exports = { await book.setTableContents(tc); //save db await book.save() + return responseMessage.SUCCESS_POST_PROLOGUE; //error handling @@ -53,7 +52,7 @@ module.exports = { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) - const temp = await FirstPartTableContents.findById(diaryData._id) + const temp = await FirstPartTableContents.findById(diaryData._id).populate('petDiary') //console.log("temp:",temp,"end") let newPetDiary = new PetDiary({ tableContents: diaryData._id, @@ -108,13 +107,8 @@ module.exports = { }, putPetDiary: async (petDiaryId, diaryData) => { try { - const findPetDiary = PetDiary.findById(petDiaryId); - console.log(findPetDiary) - // const writeDate = new Date(diaryData.date) - //writeDate.setDate(writeDate.getDate() + 1); - // console.log(FirstPartTableContents.findById(diaryData._id)) + let findPetDiary = await PetDiary.findById(petDiaryId); const ftc = await FirstPartTableContents.findById(diaryData._id) - //const episodeN=ftc.petDiary.length let newPetDiary = new PetDiary({ tableContents: (await findPetDiary).tableContents, @@ -124,21 +118,25 @@ module.exports = { title: diaryData.title, contents: diaryData.contents }) + //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { - const petData = await Pet.findById(diaryData.character[0]._id).populate('_id') + const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') newPetDiary.setPet(petData) //save emotions - const petEmotion = new PetEmotions({ - pet: diaryData.character[0]._id, - feeling: diaryData.character[0].feeling - }) - newPetDiary.setPetEmotions(petEmotion) + let emotion = new PetEmotions() + emotion.pet = diaryData.character[i]._id + emotion.feeling = diaryData.character[i].feeling + emotion.setPetDiary(findPetDiary) + newPetDiary.setPetEmotions(emotion) + await emotion.save() } - console.log(newPetDiary) - newPetDiary.save() + //newPetDiary._id=findPetDiary._id + findPetDiary = newPetDiary + //await newPetDiary.save() + await findPetDiary.save() return responseMessage.SUCCESS_EDIT_PETDIARY; } catch (err) { @@ -163,7 +161,8 @@ module.exports = { await temp.save() } } - findPetDiary=null; + findPetDiary = null; + return responseMessage.SUCCESS_DELETE_PETDIARY; } catch (err) { console.log(err) diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts index ff5d219..cebbb2e 100644 --- a/src/dto/petDiary/PetDiaryPageResDto.ts +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -9,7 +9,7 @@ require('../../models/tableContents/FirstPartTableContents') const dateMethod = require('../../modules/dateMethod') export class PetDiaryPageResDto{ - public petDiaryPage = { + public petDiary = { _id:null, chapter:null, episode:null, @@ -17,7 +17,8 @@ export class PetDiaryPageResDto{ bookImg : [], date:null, contents:null, - timeTogether:null + timeTogether:null, + kind:null } @@ -26,15 +27,15 @@ export class PetDiaryPageResDto{ this.init(petDiary) } async init(petDiary:IPetDiary){ - const temp= petDiary.populate('_id') - this.petDiaryPage._id=petDiary._id + this.petDiary._id=petDiary._id //this.petDiaryPage.chapter=temp.chapter - this.petDiaryPage.title=petDiary.title - this.petDiaryPage.bookImg=petDiary.imgs - this.petDiaryPage.date=petDiary.date - this.petDiaryPage.episode=petDiary.episode - this.petDiaryPage.contents=petDiary.contents - this.petDiaryPage.timeTogether= await dateMethod.getElapsedDay(petDiary.pets[0].startDate) + this.petDiary.title=petDiary.title + this.petDiary.bookImg=petDiary.imgs + this.petDiary.date=petDiary.date + this.petDiary.episode=petDiary.episode + this.petDiary.contents=petDiary.contents + this.petDiary.kind=petDiary.pets[0].kind + this.petDiary.timeTogether= await dateMethod.getElapsedDay(petDiary.pets[0].startDate) } } From e17522161fc0c28f5e84c7bf3e4be7f370203e36 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sun, 11 Jul 2021 04:27:07 +0900 Subject: [PATCH 057/168] =?UTF-8?q?refactor=20:=20=EC=9D=BC=EA=B8=B0=20API?= =?UTF-8?q?=20=EC=B6=9C=EB=A0=A5=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/diaryController.ts | 10 ++--- src/api/service/diaryService.ts | 10 ++--- src/dto/petDiary/PetDiaryPageResDto.ts | 52 +++++++++++++------------- src/models/diary/PetDiary.ts | 2 + src/modules/dateMethod.ts | 14 +++++++ 5 files changed, 53 insertions(+), 35 deletions(-) diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 4e7223a..b940029 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -7,7 +7,7 @@ module.exports = { const bookData = req.body; try { const result = await diaryService.postPrologue(bookData) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PROLOGUE, "")) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -21,7 +21,7 @@ module.exports = { const diaryData = req.body; try { const result = await diaryService.postPetDiary(diaryData) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PETDIARY, "")) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -35,7 +35,7 @@ module.exports = { const petDiaryId=req.params.id;//id를 뺴면 객체를 보내줌 try { const result = await diaryService.getPetDiary(petDiaryId) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_PETDIARY,result)) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -50,7 +50,7 @@ module.exports = { const diaryData=req.body; try { const result = await diaryService.putPetDiary(petDiaryId,diaryData) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_PUT_PETDIARY,"")) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -64,7 +64,7 @@ module.exports = { const petDiaryId=req.params.id; try{ const result = await diaryService.deletePetDiary(petDiaryId,) - res.status(statusCode.OK).send(util.success(statusCode.OK, result, "")) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_DELETE_PETDIARY, result)) } catch (err) { console.error(err) if (err.statusCode == null) { diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 3f01074..d531cd6 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -39,7 +39,7 @@ module.exports = { await book.setTableContents(tc); //save db await book.save() - + return responseMessage.SUCCESS_POST_PROLOGUE; //error handling @@ -93,11 +93,11 @@ module.exports = { }, getPetDiary: async (petDiaryId) => { try { - //console.log(petDiaryId); - const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents'); - //console.log(findPetDiary) + const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 - //console.log(petDiaryPageResDto) + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { + petDiaryPageResDto.setFeelingList(findPetDiary.petEmotions[i]) + } return petDiaryPageResDto } catch (err) { diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts index cebbb2e..5c0461c 100644 --- a/src/dto/petDiary/PetDiaryPageResDto.ts +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -1,6 +1,5 @@ import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; -import PetDiary from "../../models/diary/PetDiary" -import PetEmotions from "../../models/diary/PetEmotions" +import { IPetEmotions } from "../../interfaces/diary/IPetEmotions"; require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -8,35 +7,38 @@ require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') const dateMethod = require('../../modules/dateMethod') -export class PetDiaryPageResDto{ +export class PetDiaryPageResDto { public petDiary = { - _id:null, - chapter:null, - episode:null, - title : null, - bookImg : [], - date:null, - contents:null, - timeTogether:null, - kind:null + _id: null, + //chapter:null, + episode: null, + title: null, + bookImg: [], + date: null, + contents: null, + timeTogether: null, + kind: null, + feelingList: [] } - - constructor(petDiary : IPetDiary){ - //가장 먼저 있는 애 기준 날짜 정리 + + constructor(petDiary: IPetDiary) { this.init(petDiary) } - async init(petDiary:IPetDiary){ - this.petDiary._id=petDiary._id + async init(petDiary: IPetDiary) { + this.petDiary._id = petDiary._id //this.petDiaryPage.chapter=temp.chapter - this.petDiary.title=petDiary.title - this.petDiary.bookImg=petDiary.imgs - this.petDiary.date=petDiary.date - this.petDiary.episode=petDiary.episode - this.petDiary.contents=petDiary.contents - this.petDiary.kind=petDiary.pets[0].kind - this.petDiary.timeTogether= await dateMethod.getElapsedDay(petDiary.pets[0].startDate) + this.petDiary.title = petDiary.title + this.petDiary.bookImg = petDiary.imgs + this.petDiary.date = await dateMethod.toKoreanByFormatting(petDiary.date) + this.petDiary.episode = petDiary.episode + this.petDiary.contents = petDiary.contents + this.petDiary.kind = petDiary.pets[0].kind + this.petDiary.timeTogether = await dateMethod.getElapsedDay(petDiary.pets[0].startDate) + } + setFeelingList(emotion: IPetEmotions) { + this.petDiary.feelingList.push(emotion.feeling) } } -export{} \ No newline at end of file +export { } \ No newline at end of file diff --git a/src/models/diary/PetDiary.ts b/src/models/diary/PetDiary.ts index 8f6df6e..dbbc0d1 100644 --- a/src/models/diary/PetDiary.ts +++ b/src/models/diary/PetDiary.ts @@ -54,4 +54,6 @@ PetDiarySchema.methods.setPetEmotions = async function(petEmotions : IPetEmotion this.petEmotions.push(petEmotions) } + + export default mongoose.model("PetDiary", PetDiarySchema, "petDiaries") \ No newline at end of file diff --git a/src/modules/dateMethod.ts b/src/modules/dateMethod.ts index 1ec28ad..2a0ea59 100644 --- a/src/modules/dateMethod.ts +++ b/src/modules/dateMethod.ts @@ -13,6 +13,20 @@ module.exports = { return `0${value}` } }, + toKoreanByFormatting : async(source) => { + const year = source.getFullYear() + const month = leftPad(source.getMonth() + 1); + const day = leftPad(source.getDate()) + + return year+"년 "+month+"월 "+day+"일" + + function leftPad(value){ + if(value >= 10){ + return value + } + return `0${value}` + } + }, getElapsedDay : async(startDate : Date) => { const now = new Date() From eee1bdd6068f4594ff9796eb109304abe01ca2b2 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sun, 11 Jul 2021 05:28:45 +0900 Subject: [PATCH 058/168] =?UTF-8?q?refactor=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EB=B6=84=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/userController.ts | 11 +++++++++-- src/api/service/userService.ts | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 92eb64f..752ad6f 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -25,7 +25,12 @@ module.exports = { const { email, password } = req.body; try { const result = await userService.login(email, password); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGN_IN_SUCCESS, "")) + if (result) { + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS, "")) + } else { + return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.MISS_MATCH_PW)) + } + } catch (err) { if (err.statusCode == null) { err.statusCode = statusCode.INTERNAL_SERVER_ERROR; @@ -35,4 +40,6 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } } -} \ No newline at end of file +} + +//return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.MISS_MATCH_PW)) \ No newline at end of file diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index ae14580..f114cfe 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -44,10 +44,10 @@ module.exports = { const book = new Book() //Create tableContents object - const tableContents=new TableContents() + const tableContents = new TableContents() //Create firstPartTableContents object - const firstPart =new FirstPartTableContents() + const firstPart = new FirstPartTableContents() tableContents.setFirstPartTableContents(firstPart) book.setTableContents(tableContents) user.setBook(book); @@ -55,7 +55,7 @@ module.exports = { //db save await user.save(); - return {bookId:book._id}; + return { bookId: book._id }; }, login: async (email, password) => { const errors = validationResult(email); @@ -68,15 +68,17 @@ module.exports = { throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; } bcrypt.compare(password, user.password, function (err, isMatch) { - if (err) { - return console.log(err) - } else if (!isMatch) { + if (!isMatch&& !err) { //return fail - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.MISS_MATCH_PW }; - } else { + console.log("wrong password") + return false; + }else if(isMatch &&!err){ //result==true - console.log("password matches"); - return responseMessage.SIGN_IN_SUCCESS; + console.log("password matches") + return true; + }else { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } }) } From 35fa17a68301c84a39481a189b351a8878cd923c Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sun, 11 Jul 2021 05:53:14 +0900 Subject: [PATCH 059/168] =?UTF-8?q?refactor=20:=EB=AA=A9=EC=B0=A8=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=A2=85=EB=A5=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/chapterService.ts | 6 ++- src/dto/petChapter/PetChapterDiary.ts | 60 +++++++++++++-------------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 95187c1..d36cffc 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -23,10 +23,12 @@ module.exports = { getChapterDiary: async (chapterId) => { try { //챕터 id로 1부 목차 - //findFirstTableContents - const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions" }) }); + + const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); //.populate({path:"petDiary",populate:({path:"petEmotions"})}) + let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) + //월별로 자르기 for (let m = 1; m <= 12; m++) { let cnt = 0; diff --git a/src/dto/petChapter/PetChapterDiary.ts b/src/dto/petChapter/PetChapterDiary.ts index 68aca82..5857cc2 100644 --- a/src/dto/petChapter/PetChapterDiary.ts +++ b/src/dto/petChapter/PetChapterDiary.ts @@ -15,7 +15,7 @@ export class PetChapterDiaryResDto{ chapterId:null, chapter:null, chapterTitle:null, - monthly:[] + monthly:[], } constructor(firstPartTableContents:IFirstPartTableContents){ @@ -29,45 +29,45 @@ export class PetChapterDiaryResDto{ } export class MonthlyDiaryResDto{ - public monthly={ - episodePerMonthCount:null, - month:null, - diaries:[] - } + episodePerMonthCount=null + month=null + diaries=[] + constructor(){ } - setMonthCount(monthCount:Number){this.monthly.episodePerMonthCount=monthCount} - setMonth(month:Number){ this.monthly.month=month} + setMonthCount(monthCount:Number){this.episodePerMonthCount=monthCount} + setMonth(month:Number){ this.month=month} setDiaries(diary:DiariesResDto){ - this.monthly.diaries.push(diary) + this.diaries.push(diary) } } export class DiariesResDto{ - public diary={ - diaryId:null, - title:null, - contents:null, - episode:null, - image:null, - feelingCount:null, - feeling:null, - date:null, - weekday:null - } + diaryId=null + title=null + contents=null + episode=null + image=null + feelingCount=null + feeling=null + date=null + weekday=null + kind=null + constructor(diary : IPetDiary){ const week=new Array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'); - this.diary.diaryId=diary._id - this.diary.title=diary.title - this.diary.contents=diary.contents - this.diary.episode=diary.episode - this.diary.image=diary.imgs[0]//가장 첫번째 사진 - this.diary.feelingCount=diary.petEmotions.length - this.diary.feeling=diary.petEmotions[0].feeling - this.diary.date=diary.date.getDate()+"일" - this.diary.weekday= week[diary.date.getDate()] + this.diaryId=diary._id + this.title=diary.title + this.contents=diary.contents + this.episode=diary.episode + this.image=diary.imgs[0]//가장 첫번째 사진 + this.feelingCount=diary.petEmotions.length + this.feeling=diary.petEmotions[0].feeling + this.date=diary.date.getDate()+"일" + this.weekday= week[diary.date.getDate()] + this.kind=diary.pets[0].kind } setFeeling(petEmotion:Number){ - this.diary.feeling=petEmotion + this.feeling=petEmotion } } export{} \ No newline at end of file From d8b576764909c5e4eb87dee63a71f54d90266541 Mon Sep 17 00:00:00 2001 From: sol Date: Sun, 11 Jul 2021 17:48:47 +0900 Subject: [PATCH 060/168] .. --- src/api/controller/chapterController.ts | 80 ++++++++++++++ src/api/router/chapter/index.ts | 11 ++ src/api/router/diary/index.ts | 11 -- src/api/router/index.ts | 3 +- src/api/service/chapterService.ts | 137 ++++++++++++++++++++++++ src/dto/petChapter/ChapterList.ts | 31 ++++++ src/dto/petChapter/PetChapterDiary.ts | 73 +++++++++++++ src/dto/petDiary/PetDiaryPageResDto.ts | 23 ++++ src/modules/responseMessage.ts | 7 ++ 9 files changed, 363 insertions(+), 13 deletions(-) create mode 100644 src/api/controller/chapterController.ts create mode 100644 src/api/router/chapter/index.ts delete mode 100644 src/api/router/diary/index.ts create mode 100644 src/api/service/chapterService.ts create mode 100644 src/dto/petChapter/ChapterList.ts create mode 100644 src/dto/petChapter/PetChapterDiary.ts diff --git a/src/api/controller/chapterController.ts b/src/api/controller/chapterController.ts new file mode 100644 index 0000000..8398888 --- /dev/null +++ b/src/api/controller/chapterController.ts @@ -0,0 +1,80 @@ +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') +const chapterService = require('../service/chapterService') + +module.exports = { + getChapterDiary: async (req, res) => { + const chapterId=req.params.id;//id를 뺴면 객체를 보내줌 + try { + const result = await chapterService.getChapterDiary(chapterId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTER_PETDIARY , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + getChapterList:async(req,res)=>{ + const userId=req.params.id; + try { + const result = await chapterService.getChapterList(userId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + postChapterList:async(req,res)=>{ + const userId=req.params.id + const chapterTitle=req.body.chapterTitle; + try { + const result = await chapterService.postChapterList(userId,chapterTitle) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + putChapterList:async(req,res)=>{ + const chapterId=req.params.id + const chapterTitle=req.body.chapterTitle; + try { + const result = await chapterService.putChapterList(chapterId,chapterTitle) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_EDIT_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + }, + deleteChapterList:async(req,res)=>{ + const chapterId=req.params.id + try { + const result = await chapterService.deleteChapterList(chapterId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_DELETE_CHAPTERLIST , result)) + } catch (err) { + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } +} +export{} \ No newline at end of file diff --git a/src/api/router/chapter/index.ts b/src/api/router/chapter/index.ts new file mode 100644 index 0000000..cf544ab --- /dev/null +++ b/src/api/router/chapter/index.ts @@ -0,0 +1,11 @@ +const express = require('express') +const router = express.Router() +const chapterController = require('../../controller/chapterController') + +router.get('/pet/:id',chapterController.getChapterDiary) //1부 목차별 일기 조회 +router.get('/:id',chapterController.getChapterList)//목차리스트 조회 +router.post('/:id',chapterController.postChapterList)//목차리스트 추가 +router.put('/:id',chapterController.putChapterList)//목차리스트 수정 +router.delete('/:id',chapterController.deleteChapterList)//목차리스트 삭제 +module.exports = router; +export{}; \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts deleted file mode 100644 index 71de7d5..0000000 --- a/src/api/router/diary/index.ts +++ /dev/null @@ -1,11 +0,0 @@ -const express = require('express') -const router = express.Router() -const diaryController = require('../../controller/diaryController') - -router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 -router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 -router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 -router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 -router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 -module.exports = router; -export{}; \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 186c9f6..11e9db8 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,6 +1,5 @@ import express from "express" const router = express.Router() -//router.use('/book',require('./book')) //1부,2부 책 -router.use('/diary',require('./diary'));//1부 일기 +router.use('/chapter',require('./chapter'));//1부 목차 module.exports = router; \ No newline at end of file diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts new file mode 100644 index 0000000..d36cffc --- /dev/null +++ b/src/api/service/chapterService.ts @@ -0,0 +1,137 @@ +import Book from "../../models/book/Book" +import TableContents from "../../models/tableContents/TableContents" +import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" +import Pet from "../../models/pet/Pet" +import { response } from "express" +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +import { DiariesResDto, MonthlyDiaryResDto, PetChapterDiaryResDto } from "../../dto/petChapter/PetChapterDiary" +import User from "../../models/user/User" +import { ChapterListResDto, ChapterResDto } from "../../dto/petChapter/ChapterList" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +require('../../models/diary/PetDiary') +require('../../models/diary/PetEmotions') +const util = require('../../modules/util') +const responseMessage = require('../../modules/responseMessage') +const statusCode = require('../../modules/statusCode') + +module.exports = { + getChapterDiary: async (chapterId) => { + try { + //챕터 id로 1부 목차 + + const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); + //.populate({path:"petDiary",populate:({path:"petEmotions"})}) + + let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) + + //월별로 자르기 + for (let m = 1; m <= 12; m++) { + let cnt = 0; + //1화부터 + let monthly = new MonthlyDiaryResDto() + for (let i = 0; i < findFirstTableContents.petDiary.length; i++) { + if (m == findFirstTableContents.petDiary[i].date.getMonth()) { + cnt++; + let newDiary = new DiariesResDto(findFirstTableContents.petDiary[i])//diary + monthly.setDiaries(newDiary) + //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) + } + } + monthly.setMonthCount(cnt) + monthly.setMonth(m) + newChapterDiary.setMonthly(monthly) + } + console.log(newChapterDiary) + return newChapterDiary + + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } + }, + getChapterList: async (userId) => { + const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + let chapterList = new ChapterListResDto() + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + let newChapter = new ChapterResDto(new FirstPartTableContents(findUserChapter.book.tableContents.firstPartTableContents[i])) + chapterList.setChapterList(newChapter) + } + console.log(chapterList) + return chapterList + }, + postChapterList: async (userId, chapterTitle) => { + try { + const findUserChapter = await User.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + const newFirstPartTable = new FirstPartTableContents();//chapter,title + console.log(findUserChapter) + console.log(chapterTitle) + let max = 0 + + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + if (max < findUserChapter.book.tableContents.firstPartTableContents[i].chapter) { + max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter) + } + } + newFirstPartTable.chapter = max + newFirstPartTable.title = chapterTitle + + await newFirstPartTable.save() + findUserChapter.book.tableContents.firstPartTableContents.push(newFirstPartTable) + let newTableContents = new TableContents(findUserChapter.book.tableContents) + await newTableContents.save() + + console.log(newTableContents) + + return responseMessage.SUCCESS_POST_CHAPTERLIST; + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } + }, + putChapterList: async (chapterId, chapterTitle) => { + try { + const findChapter = await FirstPartTableContents.findById(chapterId); + findChapter.title = chapterTitle + const editFirstPartTableContents = new FirstPartTableContents(findChapter) + await editFirstPartTableContents.save() + console.log(editFirstPartTableContents) + + return responseMessage.SUCCESS_PUT_CHAPTERLIST; + } + catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } + }, + deleteChapterList: async (chapterId) => { + try { + let findChapter = await FirstPartTableContents.findById(chapterId); + const curChapter = findChapter.chapter + const allFirstTableContents = await FirstPartTableContents.find({}); + let updateFTC=new FirstPartTableContents() + //해당 목차보다 큰 목차 -=1 + for (let i = 0; i < allFirstTableContents.length; i++) { + if (allFirstTableContents[i].chapter > curChapter) { + allFirstTableContents[i].chapter = Number(allFirstTableContents[i].chapter) - 1; + } + //db save + updateFTC=allFirstTableContents[i] + await updateFTC.save() + } + console.log(allFirstTableContents) + + //해당 목차 삭제 + findChapter=null; + return responseMessage.SUCCESS_DELETE_CHAPTERLIST; + } + catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } + } + } +} diff --git a/src/dto/petChapter/ChapterList.ts b/src/dto/petChapter/ChapterList.ts new file mode 100644 index 0000000..5b6cb06 --- /dev/null +++ b/src/dto/petChapter/ChapterList.ts @@ -0,0 +1,31 @@ +import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; +import { IPetEmotions } from "../../interfaces/diary/IPetEmotions"; +import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents"; +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +const dateMethod = require('../../modules/dateMethod') + +export class ChapterListResDto{ + public tableContents = [ ] + setChapterList(chapter:ChapterResDto){ + this.tableContents.push(chapter) + } +} +export class ChapterResDto{ + public chapterId=null + public chapter=null + public chapterTitle=null + + constructor(firstPartTableContents:IFirstPartTableContents){ + this.chapterId=firstPartTableContents._id + this.chapter=firstPartTableContents.chapter + this.chapterTitle=firstPartTableContents.title + } +} + +export{} \ No newline at end of file diff --git a/src/dto/petChapter/PetChapterDiary.ts b/src/dto/petChapter/PetChapterDiary.ts new file mode 100644 index 0000000..5857cc2 --- /dev/null +++ b/src/dto/petChapter/PetChapterDiary.ts @@ -0,0 +1,73 @@ +import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; +import { IPetEmotions } from "../../interfaces/diary/IPetEmotions"; +import { IFirstPartTableContents } from "../../interfaces/tableContents/IFirstPartTableContents"; +import PetDiary from "../../models/diary/PetDiary" +import PetEmotions from "../../models/diary/PetEmotions" +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/FirstPartTableContents') +const dateMethod = require('../../modules/dateMethod') + +export class PetChapterDiaryResDto{ + public petChapterDiary = { + chapterId:null, + chapter:null, + chapterTitle:null, + monthly:[], + } + + constructor(firstPartTableContents:IFirstPartTableContents){ + this.petChapterDiary.chapterId=firstPartTableContents._id + this.petChapterDiary.chapter=firstPartTableContents.chapter + this.petChapterDiary.chapterTitle=firstPartTableContents.title + } + setMonthly(monthly:MonthlyDiaryResDto){ + this.petChapterDiary.monthly.push(monthly) + } +} + +export class MonthlyDiaryResDto{ + episodePerMonthCount=null + month=null + diaries=[] + + constructor(){ } + setMonthCount(monthCount:Number){this.episodePerMonthCount=monthCount} + setMonth(month:Number){ this.month=month} + setDiaries(diary:DiariesResDto){ + this.diaries.push(diary) + } + +} +export class DiariesResDto{ + diaryId=null + title=null + contents=null + episode=null + image=null + feelingCount=null + feeling=null + date=null + weekday=null + kind=null + + constructor(diary : IPetDiary){ + const week=new Array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'); + this.diaryId=diary._id + this.title=diary.title + this.contents=diary.contents + this.episode=diary.episode + this.image=diary.imgs[0]//가장 첫번째 사진 + this.feelingCount=diary.petEmotions.length + this.feeling=diary.petEmotions[0].feeling + this.date=diary.date.getDate()+"일" + this.weekday= week[diary.date.getDate()] + this.kind=diary.pets[0].kind + } + setFeeling(petEmotion:Number){ + this.feeling=petEmotion + } +} +export{} \ No newline at end of file diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts index 5c0461c..7c4d7b4 100644 --- a/src/dto/petDiary/PetDiaryPageResDto.ts +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -7,6 +7,7 @@ require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') const dateMethod = require('../../modules/dateMethod') +<<<<<<< HEAD export class PetDiaryPageResDto { public petDiary = { _id: null, @@ -38,6 +39,28 @@ export class PetDiaryPageResDto { } setFeelingList(emotion: IPetEmotions) { this.petDiary.feelingList.push(emotion.feeling) +======= +export class PetDiaryPageResDto{ + public petDiaryPage = { + _id:null, + chapter:null, + title : null, + bookImg : [], + date:null, + contents:null, + timeTogether:null + } + + constructor(petDiary : IPetDiary){ + _id:petDiary._id + chapter:petDiary.tableContents.chapter + title:petDiary.title + bookImg:petDiary.imgs + date:petDiary.date + contents:petDiary.contents + //가장 먼저 있는 애 기준 날짜 정리 + timeTogether: dateMethod.getElapsedDay(petDiary.pets[0].startDate) +>>>>>>> 35fa17a68301c84a39481a189b351a8878cd923c } } diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 3a8e63a..1cab4ff 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -16,9 +16,16 @@ module.exports = { /*1부(by.sol) */ NO_BOOK:"존재하지 않는 책 id입니다.", NO_DIARY:"존재하지 않는 다이어리 id입니다.", + NO_CONTENTS:"존재하지 않는 정보입니다.", SUCCESS_POST_PETDIARY:"반려동물 다이어리 작성 성공", SUCCESS_EDIT_PETDIARY:"반려동물 다이어리 수정 성공", SUCCESS_DELETE_PETDIARY:"반려동물 다이어리 삭제 성공", + SUCCESS_GET_CHAPTER_PETDIARY:"목차별 다이어리 조회 성공", + SUCCESS_GET_CHAPTERLIST: "목차 리스트 조회 성공", + SUCCESS_POST_CHAPTERLIST: "목차 리스트 추가 성공", + SUCCESS_EDIT_CHAPTERLIST: "목차 리스트 수정 성공", + SUCCESS_DELETE_CHAPTERLIST: "목차 리스트 삭제 성공", + /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", From 0d1d34a373e205f00c0d8e405d710bd44c77ef72 Mon Sep 17 00:00:00 2001 From: sol Date: Sun, 11 Jul 2021 21:43:04 +0900 Subject: [PATCH 061/168] =?UTF-8?q?refactor=20:=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=EC=82=AD=EC=A0=9C=20api=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 6 +++--- package.json | 2 +- src/api/service/diaryService.ts | 28 +++++++++------------------- yarn.lock | 8 ++++---- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index b5c620d..cebfa37 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "win32-x64-72", + "systemParams": "win32-x64-83", "modulesFolders": [ "node_modules" ], @@ -12,7 +12,7 @@ "dotenv@^10.0.0", "express@^4.17.1", "mongoose@^5.13.0", - "nodemon@^2.0.9", + "nodemon@^2.0.12", "ts-node@^10.0.0", "typescript@^4.3.4" ], @@ -169,7 +169,7 @@ "ms@2.1.2": "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009", "ms@^2.1.1": "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2", "negotiator@0.6.2": "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb", - "nodemon@^2.0.9": "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.9.tgz#f5cd550ba215da3c1081459ae2c1c8da2c353165", + "nodemon@^2.0.12": "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5", "nopt@~1.0.10": "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee", "normalize-path@^3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", "normalize-path@~3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", diff --git a/package.json b/package.json index 37f2a53..8b7b01f 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,6 @@ "dotenv": "^10.0.0", "express": "^4.17.1", "mongoose": "^5.13.0", - "nodemon": "^2.0.9" + "nodemon": "^2.0.12" } } diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index d531cd6..4dfc3d2 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -108,34 +108,24 @@ module.exports = { putPetDiary: async (petDiaryId, diaryData) => { try { let findPetDiary = await PetDiary.findById(petDiaryId); - const ftc = await FirstPartTableContents.findById(diaryData._id) - - let newPetDiary = new PetDiary({ - tableContents: (await findPetDiary).tableContents, - episode: (await findPetDiary).episode, - date: (await findPetDiary).date, - imgs: diaryData.diaryImages, - title: diaryData.title, - contents: diaryData.contents - }) - + findPetDiary.tableContents = findPetDiary.tableContents + findPetDiary.episode = findPetDiary.episode + findPetDiary.date = findPetDiary.date + findPetDiary.imgs = diaryData.diaryImages + findPetDiary.title = diaryData.title + findPetDiary.contents = diaryData.contents //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') - newPetDiary.setPet(petData) + findPetDiary.setPet(petData) //save emotions let emotion = new PetEmotions() emotion.pet = diaryData.character[i]._id emotion.feeling = diaryData.character[i].feeling emotion.setPetDiary(findPetDiary) - newPetDiary.setPetEmotions(emotion) await emotion.save() } - console.log(newPetDiary) - //newPetDiary._id=findPetDiary._id - findPetDiary = newPetDiary - //await newPetDiary.save() await findPetDiary.save() return responseMessage.SUCCESS_EDIT_PETDIARY; @@ -161,8 +151,8 @@ module.exports = { await temp.save() } } - findPetDiary = null; - + await PetDiary.deleteOne({ _id: findPetDiary }) + console.log(findPetDiary) return responseMessage.SUCCESS_DELETE_PETDIARY; } catch (err) { console.log(err) diff --git a/yarn.lock b/yarn.lock index beeff29..b4a2923 100644 --- a/yarn.lock +++ b/yarn.lock @@ -961,10 +961,10 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -nodemon@^2.0.9: - version "2.0.9" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.9.tgz#f5cd550ba215da3c1081459ae2c1c8da2c353165" - integrity sha512-6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg== +nodemon@^2.0.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5" + integrity sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA== dependencies: chokidar "^3.2.2" debug "^3.2.6" From 58fbbedca94b90fbf3decffe0c2b58d0bcecc3fc Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sun, 11 Jul 2021 23:15:50 +0900 Subject: [PATCH 062/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 32 +++++--- src/api/router/secondPart/index.ts | 7 +- src/api/service/secondPartService.ts | 93 ++++++++++++++++------ src/modules/responseMessage.ts | 2 + 4 files changed, 96 insertions(+), 38 deletions(-) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index ae2eab0..cd2ed7a 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -26,35 +26,49 @@ module.exports = { } }, - getSecondPartChapterList:async(req,res)=>{ - try{ + getSecondPartChapterList: async (req, res) => { + try { const result = await secondPartService.getSecondPartChapterList() return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_CHAPTER_LIST, result)) - }catch(err){ + } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, - addSecondPartChapter:async(req,res)=>{ + addSecondPartChapter: async (req, res) => { const chapterData = req.body - try{ + try { await secondPartService.addSecondPartChapter(chapterData) return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER)) - }catch(err){ + } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, - modifySecondPartChapterInfo:async(req,res)=>{ - const {chapterId} = req.params + modifySecondPartChapterInfo: async (req, res) => { + const { chapterId } = req.params const modifyChapterData = req.body - try{ + try { await secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData) return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER)) + } catch (err) { + console.error(err) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + + deleteSecondPartChapter: async(req,res)=>{ + const {chapterId} = req.params + try{ + await secondPartService.deleteSecondPartChapter(chapterId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) }catch(err){ console.error(err) + if(err.statusCode === 400){ + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } } diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index 2bd1e4c..b67b791 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -4,8 +4,9 @@ const secondPartController = require('../../controller/secondPartController') router.get('/main/:userId', secondPartController.getMainPage) router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents) -router.get('/chapter/list',secondPartController.getSecondPartChapterList) -router.post('/chapter',secondPartController.addSecondPartChapter) -router.put('/chapter/:chapterId',secondPartController.modifySecondPartChapterInfo) +router.get('/chapter/list', secondPartController.getSecondPartChapterList) +router.post('/chapter', secondPartController.addSecondPartChapter) +router.put('/chapter/:chapterId', secondPartController.modifySecondPartChapterInfo) +router.delete('/chapter/:chapterId', secondPartController.deleteSecondPartChapter) module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index b7afee1..6aceacc 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -64,43 +64,43 @@ module.exports = { }, getDiaryOfTableContents: async (tableContentsId) => { - try{ + try { const tableContents = await SecondPartTableContent.findById(tableContentsId).populate({ - path : "userDiary" + path: "userDiary" }) - const test = tableContents.userDiary.filter( userDiary => + const test = tableContents.userDiary.filter(userDiary => userDiary.date.getMonth() == 6 ) - const secondPartDiariesOfMonth : SecondPartDiariesOfMonth[]= [] - for(let i = 12 ; i >0 ;i--){ - if((tableContents.userDiary.map(diary=>diary.date.getMonth() == i)).includes(true)){ - const filteringDiaries = tableContents.userDiary.filter(userDiary=> + const secondPartDiariesOfMonth: SecondPartDiariesOfMonth[] = [] + for (let i = 12; i > 0; i--) { + if ((tableContents.userDiary.map(diary => diary.date.getMonth() == i)).includes(true)) { + const filteringDiaries = tableContents.userDiary.filter(userDiary => userDiary.date.getMonth() == i) - secondPartDiariesOfMonth.push(new SecondPartDiariesOfMonth(i+1,filteringDiaries)) + secondPartDiariesOfMonth.push(new SecondPartDiariesOfMonth(i + 1, filteringDiaries)) } } return new SecondPartDiariesOfMonthResDto(tableContents, secondPartDiariesOfMonth) - }catch(err){ + } catch (err) { throw err } }, - getSecondPartChapterList:async()=>{ - try{ + getSecondPartChapterList: async () => { + try { const chapterList = await SecondPartTableContent.find() return new SecondPartChapterListResDto(chapterList) - }catch(err){ + } catch (err) { throw err } }, - addSecondPartChapter:async(chapterData)=>{ - try{ + addSecondPartChapter: async (chapterData) => { + try { let newChapter = new SecondPartTableContent({ - title : chapterData.chapterTitle, - chapter : await getNextChapter() + title: chapterData.chapterTitle, + chapter: await getNextChapter() }) await newChapter.save() @@ -108,25 +108,66 @@ module.exports = { await tableContents.setSecondPartTableContents(newChapter) await tableContents.save() - }catch(err){ + } catch (err) { throw err } - async function getNextChapter(){ + async function getNextChapter() { const secondPartTableContents = (await SecondPartTableContent.find()) const secondPartLength = secondPartTableContents.length - return secondPartTableContents[secondPartLength-1].chapter +1 + return secondPartTableContents[secondPartLength - 1].chapter + 1 + } + }, + + modifySecondPartChapterInfo: async (chapterId, modifyChapterData) => { + try { + await SecondPartTableContent.update( + { _id: chapterId }, + { $set: { title: modifyChapterData.chapterTitle } } + ) + } catch (err) { + throw err } }, - modifySecondPartChapterInfo:async(chapterId,modifyChapterData)=>{ - try{ - const findSecondPartTableContents = await SecondPartTableContent.update( - {_id : chapterId}, - {$set : {title : modifyChapterData.chapterTitle}} - ) - }catch(err){ + deleteSecondPartChapter: async (chapterId) => { + try { + //삭제하고자하는 2부 목차 + const findSecondPartChapter = await SecondPartTableContent.findById(chapterId).populate({ + path: "userDiary" + }) + if(findSecondPartChapter === null){ + throw { statusCode : 400 } + } + //전체 2부 목차 + const tableContents = (await TableContents.find().populate({ + path: "secondPartTableContents" + }))[0] + + //삭제할 2부 목차의 chapter보다 큰 챕터 배열 & chapter -1씩 줄임 & 저장 + tableContents.secondPartTableContents.filter(secondPartTable => + secondPartTable.chapter > findSecondPartChapter.chapter).forEach(async secondPartTable => { + secondPartTable.chapter -= 1 + await secondPartTable.save() + }) + + + //2부 목차에서 해당 목차 삭제 + await SecondPartTableContent.deleteOne({_id: `${chapterId}`}) + + //2부 목차에 들어있던 userDiary 삭제 + const userDiaries = findSecondPartChapter.userDiary; + + userDiaries.forEach(async userDiary => { + await UserDiary.deleteOne({_id:`${userDiary._id}`}) + }) + + //총 목차(1부,2부)에서 해당 목차 secondPartTableContents배열에서 삭제 + const idx = tableContents.secondPartTableContents.findIndex(secondPartTable => secondPartTable._id == chapterId) + tableContents.secondPartTableContents.splice(idx,1) + await tableContents.save() + } catch (err) { throw err } } diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index f165cfe..39b4e46 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -34,6 +34,8 @@ module.exports = { SUCCESS_GET_SECOND_PART_CHAPTER_LIST : "2부 목차 리스트 불러오기 성공", SUCCESS_POST_SECOND_PART_ADD_CHAPTER : "2부 목차 추가 성공", SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER: "2부 목차 수정 성공", + SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER : "2부 목차 삭제 성공", + FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS : "잘못된 2부 목차의 ID입니다.", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 2d6b39fc17dbe6516ed10d1cf02d8f7f939c3d11 Mon Sep 17 00:00:00 2001 From: sol Date: Mon, 12 Jul 2021 00:04:00 +0900 Subject: [PATCH 063/168] =?UTF-8?q?refactor=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/userController.ts | 12 +++----- src/api/router/index.ts | 7 ++--- src/api/service/userService.ts | 41 +++++++++++++--------------- tsconfig.json | 2 +- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 752ad6f..3f93a7d 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -25,21 +25,17 @@ module.exports = { const { email, password } = req.body; try { const result = await userService.login(email, password); - if (result) { - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS, "")) - } else { - return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.MISS_MATCH_PW)) - } + console.log('얘가나오면 안되는데 : ', result) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS)) } catch (err) { + console.log('bbbbb : ' + err.statusCode) if (err.statusCode == null) { err.statusCode = statusCode.INTERNAL_SERVER_ERROR; err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; } - console.error(err) + console.error('!!!!!' + err) res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } } } - -//return res.status(statusCode.UNAUTHORIZED).send(util.fail(statusCode.UNAUTHORIZED, responseMessage.MISS_MATCH_PW)) \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index 33c080b..3e68509 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,9 +1,8 @@ import express from "express" const router = express.Router(); -router.use('/rainbow',require('./rainbow')) //무지개 -router.use('/user',require('./user'))//user -router.use('/pet',require('./pet'))//pet -//router.use('/book',require('./book'));//book +// router.use('/rainbow',require('./rainbow')) //무지개 +router.use('/user', require('./user'))//user +router.use('/pet', require('./pet'))//pet module.exports = router; \ No newline at end of file diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index f114cfe..161a012 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -1,4 +1,4 @@ -import { Request, Response, NextFunction } from 'express' +import { Request, Response, NextFunction, response } from 'express' import User from '../../models/user/User' import Book from '../../models/book/Book' import Pet from '../../models/pet/Pet' @@ -58,28 +58,25 @@ module.exports = { return { bookId: book._id }; }, login: async (email, password) => { - const errors = validationResult(email); - if (!errors.isEmpty()) { - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; - } - let user = await User.findOne({ email }); - if (!user) { - //등록되지 않은 email - throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; - } - bcrypt.compare(password, user.password, function (err, isMatch) { - if (!isMatch&& !err) { - //return fail - console.log("wrong password") - return false; - }else if(isMatch &&!err){ - //result==true - console.log("password matches") - return true; - }else { - console.log(err) + try { + const errors = validationResult(email); + if (!errors.isEmpty()) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; + } + let user = await User.findOne({ email }); + if (!user) { + //등록되지 않은 email + throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; + } + + const test = await bcrypt.compare(password, user.password) + console.log('asdada' + test) + if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } - }) + + } catch (err) { + throw err + } } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index ef3d107..e6b0bd3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,7 @@ "allowJs": true, "noEmit": false, "esModuleInterop": true, - "typeRoots": ["./src/types/express.d.ts", "./node_modules/@types"] + "typeRoots": ["./src/types/express.d.ts", "./node_modules/@types"], "lib":["es6"] }, "include": ["./src/**/*"], From 04f73b98069becfe0c95763044128ac304f597f3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 12 Jul 2021 02:52:10 +0900 Subject: [PATCH 064/168] feat : config.test --- .gitignore | 4 +- node_modules/.yarn-integrity | 46 +- node_modules/readable-stream/.travis.yml | 34 - node_modules/readable-stream/CONTRIBUTING.md | 38 - node_modules/readable-stream/GOVERNANCE.md | 136 --- node_modules/readable-stream/LICENSE | 29 - node_modules/readable-stream/README.md | 55 +- .../doc/wg-meetings/2015-01-30.md | 60 -- .../readable-stream/duplex-browser.js | 1 - node_modules/readable-stream/duplex.js | 2 +- .../readable-stream/lib/_stream_duplex.js | 90 +- .../lib/_stream_passthrough.js | 11 +- .../readable-stream/lib/_stream_readable.js | 812 ++++++++---------- .../readable-stream/lib/_stream_transform.js | 125 ++- .../readable-stream/lib/_stream_writable.js | 526 ++++-------- .../lib/internal/streams/BufferList.js | 79 -- .../lib/internal/streams/destroy.js | 74 -- .../lib/internal/streams/stream-browser.js | 1 - .../lib/internal/streams/stream.js | 1 - node_modules/readable-stream/package.json | 40 +- node_modules/readable-stream/passthrough.js | 2 +- .../readable-stream/readable-browser.js | 7 - node_modules/readable-stream/readable.js | 27 +- node_modules/readable-stream/transform.js | 2 +- .../readable-stream/writable-browser.js | 1 - node_modules/readable-stream/writable.js | 9 +- node_modules/string_decoder/.travis.yml | 50 -- node_modules/string_decoder/LICENSE | 68 +- node_modules/string_decoder/README.md | 48 +- .../string_decoder/lib/string_decoder.js | 296 ------- node_modules/string_decoder/package.json | 18 +- package.json | 3 + src/api/service/secondPartService.ts | 1 + yarn.lock | 247 +++++- 34 files changed, 966 insertions(+), 1977 deletions(-) delete mode 100644 node_modules/readable-stream/.travis.yml delete mode 100644 node_modules/readable-stream/CONTRIBUTING.md delete mode 100644 node_modules/readable-stream/GOVERNANCE.md delete mode 100644 node_modules/readable-stream/doc/wg-meetings/2015-01-30.md delete mode 100644 node_modules/readable-stream/duplex-browser.js delete mode 100644 node_modules/readable-stream/lib/internal/streams/BufferList.js delete mode 100644 node_modules/readable-stream/lib/internal/streams/destroy.js delete mode 100644 node_modules/readable-stream/lib/internal/streams/stream-browser.js delete mode 100644 node_modules/readable-stream/lib/internal/streams/stream.js delete mode 100644 node_modules/readable-stream/readable-browser.js delete mode 100644 node_modules/readable-stream/writable-browser.js delete mode 100644 node_modules/string_decoder/.travis.yml delete mode 100644 node_modules/string_decoder/lib/string_decoder.js diff --git a/.gitignore b/.gitignore index b7cd2a6..d5a7a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ yarn-debug.log* yarn-error.log* yarn.lock -.env \ No newline at end of file +.env + +src/config \ No newline at end of file diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 89c66f6..94bf2c7 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "win32-x64-83", + "systemParams": "win32-x64-72", "modulesFolders": [ "node_modules" ], @@ -8,11 +8,14 @@ "topLevelPatterns": [ "@types/express@^4.17.12", "@types/node@^15.12.5", + "aws-sdk@^2.943.0", "bcryptjs@^2.4.3", "dotenv@^10.0.0", "express-validator@^6.12.0", "express@^4.17.1", "mongoose@^5.13.0", + "multer-s3@^2.9.0", + "multer@^1.4.2", "nodemon@^2.0.12", "ts-node@^10.0.0", "typescript@^4.3.4" @@ -43,9 +46,12 @@ "ansi-regex@^5.0.0": "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75", "ansi-styles@^4.1.0": "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937", "anymatch@~3.1.2": "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716", + "append-field@^1.0.0": "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56", "arg@^4.1.0": "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089", "array-flatten@1.1.1": "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2", + "aws-sdk@^2.943.0": "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.943.0.tgz#6bda506cc33f5e7ec14e58ca4847e9abbab05c13", "balanced-match@^1.0.0": "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee", + "base64-js@^1.0.2": "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a", "bcryptjs@^2.4.3": "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb", "binary-extensions@^2.0.0": "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d", "bl@^2.2.1": "https://registry.yarnpkg.com/bl/-/bl-2.2.1.tgz#8c11a7b730655c5d56898cdc871224f40fd901d5", @@ -56,6 +62,8 @@ "braces@~3.0.2": "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107", "bson@^1.1.4": "https://registry.yarnpkg.com/bson/-/bson-1.1.6.tgz#fb819be9a60cd677e0853aee4ca712a785d6618a", "buffer-from@^1.0.0": "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef", + "buffer@4.9.2": "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8", + "busboy@^0.2.11": "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453", "bytes@3.1.0": "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6", "cacheable-request@^6.0.0": "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912", "camelcase@^5.3.1": "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320", @@ -67,6 +75,7 @@ "color-convert@^2.0.1": "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3", "color-name@~1.1.4": "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2", "concat-map@0.0.1": "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b", + "concat-stream@^1.5.2": "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34", "configstore@^5.0.1": "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96", "content-disposition@0.5.3": "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd", "content-type@~1.0.4": "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b", @@ -85,6 +94,7 @@ "denque@^1.4.1": "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de", "depd@~1.1.2": "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9", "destroy@~1.0.4": "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80", + "dicer@0.2.5": "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f", "diff@^4.0.1": "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d", "dot-prop@^5.2.0": "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88", "dotenv@^10.0.0": "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81", @@ -97,8 +107,10 @@ "escape-goat@^2.0.0": "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675", "escape-html@~1.0.3": "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988", "etag@~1.8.1": "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887", + "events@1.1.1": "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924", "express-validator@^6.12.0": "https://registry.yarnpkg.com/express-validator/-/express-validator-6.12.0.tgz#a9cd49b3fe4c470abb615ae2e7dd111053c25f66", "express@^4.17.1": "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134", + "file-type@^3.3.0": "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9", "fill-range@^7.0.1": "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40", "finalhandler@~1.1.2": "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d", "forwarded@0.2.0": "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811", @@ -113,15 +125,20 @@ "has-flag@^3.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd", "has-flag@^4.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b", "has-yarn@^2.1.0": "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77", + "html-comment-regex@^1.1.0": "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7", "http-cache-semantics@^4.0.0": "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390", "http-errors@1.7.2": "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f", "http-errors@~1.7.2": "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06", "iconv-lite@0.4.24": "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b", + "ieee754@1.1.13": "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84", + "ieee754@^1.1.4": "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352", "ignore-by-default@^1.0.1": "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09", "import-lazy@^2.1.0": "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43", "imurmurhash@^0.1.4": "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea", "inherits@2.0.3": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de", "inherits@2.0.4": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", + "inherits@^2.0.3": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", + "inherits@~2.0.1": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", "inherits@~2.0.3": "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c", "ini@1.3.7": "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84", "ini@~1.3.0": "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c", @@ -138,9 +155,13 @@ "is-number@^7.0.0": "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b", "is-obj@^2.0.0": "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982", "is-path-inside@^3.0.1": "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283", + "is-svg@^2.1.0": "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9", "is-typedarray@^1.0.0": "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a", "is-yarn-global@^0.3.0": "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232", + "isarray@0.0.1": "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf", + "isarray@^1.0.0": "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11", "isarray@~1.0.0": "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11", + "jmespath@0.15.0": "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217", "json-buffer@3.0.0": "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898", "kareem@2.3.2": "https://registry.yarnpkg.com/kareem/-/kareem-2.3.2.tgz#78c4508894985b8d38a0dc15e1a8e11078f2ca93", "keyv@^3.0.0": "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9", @@ -162,6 +183,8 @@ "mimic-response@^1.0.1": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083", "minimist@^1.2.0": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", + "minimist@^1.2.5": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", + "mkdirp@^0.5.1": "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def", "mongodb@3.6.8": "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407", "mongoose-legacy-pluralize@1.0.2": "https://registry.yarnpkg.com/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz#3ba9f91fa507b5186d399fb40854bff18fb563e4", "mongoose@^5.13.0": "https://registry.yarnpkg.com/mongoose/-/mongoose-5.13.0.tgz#3d5241991261681a913696d5b7c88f76b31aedb0", @@ -171,12 +194,16 @@ "ms@2.1.1": "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a", "ms@2.1.2": "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009", "ms@^2.1.1": "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2", + "multer-s3@^2.9.0": "https://registry.yarnpkg.com/multer-s3/-/multer-s3-2.9.0.tgz#a946fd8c01c9726076f11949b84943259f8ca8c3", + "multer@^1.4.2": "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a", "negotiator@0.6.2": "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb", "nodemon@^2.0.12": "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5", "nopt@~1.0.10": "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee", "normalize-path@^3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", "normalize-path@~3.0.0": "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65", "normalize-url@^4.1.0": "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a", + "object-assign@^4.1.1": "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863", + "on-finished@^2.3.0": "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947", "on-finished@~2.3.0": "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947", "once@^1.3.1": "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1", "once@^1.4.0": "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1", @@ -192,11 +219,16 @@ "proxy-addr@~2.0.5": "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025", "pstree.remy@^1.1.7": "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a", "pump@^3.0.0": "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64", + "punycode@1.3.2": "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d", "pupa@^2.0.1": "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62", "qs@6.7.0": "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc", + "querystring@0.2.0": "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620", + "queue-microtask@^1.2.2": "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243", "range-parser@~1.2.1": "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031", "raw-body@2.4.0": "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332", "rc@^1.2.8": "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed", + "readable-stream@1.1.x": "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9", + "readable-stream@^2.2.2": "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57", "readable-stream@^2.3.5": "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57", "readdirp@~3.6.0": "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7", "regexp-clone@1.0.0": "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63", @@ -204,6 +236,7 @@ "registry-auth-token@^4.0.0": "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250", "registry-url@^5.0.0": "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009", "responselike@^1.0.2": "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7", + "run-parallel@^1.1.6": "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee", "safe-buffer@5.1.2": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d", "safe-buffer@5.2.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6", "safe-buffer@^5.1.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6", @@ -212,6 +245,8 @@ "safe-buffer@~5.1.1": "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d", "safer-buffer@>= 2.1.2 < 3": "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a", "saslprep@^1.0.0": "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226", + "sax@1.2.1": "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a", + "sax@>=0.6.0": "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9", "semver-diff@^3.1.1": "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b", "semver@^5.7.1": "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7", "semver@^6.0.0": "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d", @@ -228,9 +263,11 @@ "sparse-bitfield@^3.0.3": "https://registry.yarnpkg.com/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz#ff4ae6e68656056ba4b3e792ab3334d38273ca11", "statuses@>= 1.5.0 < 2": "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c", "statuses@~1.5.0": "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c", + "streamsearch@0.1.2": "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a", "string-width@^3.0.0": "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961", "string-width@^4.0.0": "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5", "string-width@^4.1.0": "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5", + "string_decoder@~0.10.x": "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94", "string_decoder@~1.1.1": "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8", "strip-ansi@^5.1.0": "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae", "strip-ansi@^6.0.0": "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532", @@ -244,9 +281,11 @@ "touch@^3.1.0": "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b", "ts-node@^10.0.0": "https://registry.yarnpkg.com/ts-node/-/ts-node-10.0.0.tgz#05f10b9a716b0b624129ad44f0ea05dac84ba3be", "type-fest@^0.8.1": "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d", + "type-is@^1.6.4": "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131", "type-is@~1.6.17": "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131", "type-is@~1.6.18": "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131", "typedarray-to-buffer@^3.1.5": "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080", + "typedarray@^0.0.6": "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777", "typescript@^4.3.4": "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc", "undefsafe@^2.0.3": "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.3.tgz#6b166e7094ad46313b2202da7ecc2cd7cc6e7aae", "unique-string@^2.0.0": "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d", @@ -254,14 +293,19 @@ "unpipe@~1.0.0": "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec", "update-notifier@^4.1.0": "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3", "url-parse-lax@^3.0.0": "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c", + "url@0.10.3": "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64", "util-deprecate@~1.0.1": "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf", "utils-merge@1.0.1": "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713", + "uuid@3.3.2": "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131", "validator@^13.5.2": "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059", "vary@~1.1.2": "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc", "widest-line@^3.1.0": "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca", "wrappy@1": "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f", "write-file-atomic@^3.0.0": "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8", "xdg-basedir@^4.0.0": "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13", + "xml2js@0.4.19": "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7", + "xmlbuilder@~9.0.1": "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d", + "xtend@^4.0.0": "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54", "yn@3.1.1": "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" }, "files": [], diff --git a/node_modules/readable-stream/.travis.yml b/node_modules/readable-stream/.travis.yml deleted file mode 100644 index f62cdac..0000000 --- a/node_modules/readable-stream/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -sudo: false -language: node_js -before_install: - - (test $NPM_LEGACY && npm install -g npm@2 && npm install -g npm@3) || true -notifications: - email: false -matrix: - fast_finish: true - include: - - node_js: '0.8' - env: NPM_LEGACY=true - - node_js: '0.10' - env: NPM_LEGACY=true - - node_js: '0.11' - env: NPM_LEGACY=true - - node_js: '0.12' - env: NPM_LEGACY=true - - node_js: 1 - env: NPM_LEGACY=true - - node_js: 2 - env: NPM_LEGACY=true - - node_js: 3 - env: NPM_LEGACY=true - - node_js: 4 - - node_js: 5 - - node_js: 6 - - node_js: 7 - - node_js: 8 - - node_js: 9 -script: "npm run test" -env: - global: - - secure: rE2Vvo7vnjabYNULNyLFxOyt98BoJexDqsiOnfiD6kLYYsiQGfr/sbZkPMOFm9qfQG7pjqx+zZWZjGSswhTt+626C0t/njXqug7Yps4c3dFblzGfreQHp7wNX5TFsvrxd6dAowVasMp61sJcRnB2w8cUzoe3RAYUDHyiHktwqMc= - - secure: g9YINaKAdMatsJ28G9jCGbSaguXCyxSTy+pBO6Ch0Cf57ZLOTka3HqDj8p3nV28LUIHZ3ut5WO43CeYKwt4AUtLpBS3a0dndHdY6D83uY6b2qh5hXlrcbeQTq2cvw2y95F7hm4D1kwrgZ7ViqaKggRcEupAL69YbJnxeUDKWEdI= diff --git a/node_modules/readable-stream/CONTRIBUTING.md b/node_modules/readable-stream/CONTRIBUTING.md deleted file mode 100644 index f478d58..0000000 --- a/node_modules/readable-stream/CONTRIBUTING.md +++ /dev/null @@ -1,38 +0,0 @@ -# Developer's Certificate of Origin 1.1 - -By making a contribution to this project, I certify that: - -* (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - -* (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - -* (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - -* (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - -## Moderation Policy - -The [Node.js Moderation Policy] applies to this WG. - -## Code of Conduct - -The [Node.js Code of Conduct][] applies to this WG. - -[Node.js Code of Conduct]: -https://github.com/nodejs/node/blob/master/CODE_OF_CONDUCT.md -[Node.js Moderation Policy]: -https://github.com/nodejs/TSC/blob/master/Moderation-Policy.md diff --git a/node_modules/readable-stream/GOVERNANCE.md b/node_modules/readable-stream/GOVERNANCE.md deleted file mode 100644 index 16ffb93..0000000 --- a/node_modules/readable-stream/GOVERNANCE.md +++ /dev/null @@ -1,136 +0,0 @@ -### Streams Working Group - -The Node.js Streams is jointly governed by a Working Group -(WG) -that is responsible for high-level guidance of the project. - -The WG has final authority over this project including: - -* Technical direction -* Project governance and process (including this policy) -* Contribution policy -* GitHub repository hosting -* Conduct guidelines -* Maintaining the list of additional Collaborators - -For the current list of WG members, see the project -[README.md](./README.md#current-project-team-members). - -### Collaborators - -The readable-stream GitHub repository is -maintained by the WG and additional Collaborators who are added by the -WG on an ongoing basis. - -Individuals making significant and valuable contributions are made -Collaborators and given commit-access to the project. These -individuals are identified by the WG and their addition as -Collaborators is discussed during the WG meeting. - -_Note:_ If you make a significant contribution and are not considered -for commit-access log an issue or contact a WG member directly and it -will be brought up in the next WG meeting. - -Modifications of the contents of the readable-stream repository are -made on -a collaborative basis. Anybody with a GitHub account may propose a -modification via pull request and it will be considered by the project -Collaborators. All pull requests must be reviewed and accepted by a -Collaborator with sufficient expertise who is able to take full -responsibility for the change. In the case of pull requests proposed -by an existing Collaborator, an additional Collaborator is required -for sign-off. Consensus should be sought if additional Collaborators -participate and there is disagreement around a particular -modification. See _Consensus Seeking Process_ below for further detail -on the consensus model used for governance. - -Collaborators may opt to elevate significant or controversial -modifications, or modifications that have not found consensus to the -WG for discussion by assigning the ***WG-agenda*** tag to a pull -request or issue. The WG should serve as the final arbiter where -required. - -For the current list of Collaborators, see the project -[README.md](./README.md#members). - -### WG Membership - -WG seats are not time-limited. There is no fixed size of the WG. -However, the expected target is between 6 and 12, to ensure adequate -coverage of important areas of expertise, balanced with the ability to -make decisions efficiently. - -There is no specific set of requirements or qualifications for WG -membership beyond these rules. - -The WG may add additional members to the WG by unanimous consensus. - -A WG member may be removed from the WG by voluntary resignation, or by -unanimous consensus of all other WG members. - -Changes to WG membership should be posted in the agenda, and may be -suggested as any other agenda item (see "WG Meetings" below). - -If an addition or removal is proposed during a meeting, and the full -WG is not in attendance to participate, then the addition or removal -is added to the agenda for the subsequent meeting. This is to ensure -that all members are given the opportunity to participate in all -membership decisions. If a WG member is unable to attend a meeting -where a planned membership decision is being made, then their consent -is assumed. - -No more than 1/3 of the WG members may be affiliated with the same -employer. If removal or resignation of a WG member, or a change of -employment by a WG member, creates a situation where more than 1/3 of -the WG membership shares an employer, then the situation must be -immediately remedied by the resignation or removal of one or more WG -members affiliated with the over-represented employer(s). - -### WG Meetings - -The WG meets occasionally on a Google Hangout On Air. A designated moderator -approved by the WG runs the meeting. Each meeting should be -published to YouTube. - -Items are added to the WG agenda that are considered contentious or -are modifications of governance, contribution policy, WG membership, -or release process. - -The intention of the agenda is not to approve or review all patches; -that should happen continuously on GitHub and be handled by the larger -group of Collaborators. - -Any community member or contributor can ask that something be added to -the next meeting's agenda by logging a GitHub Issue. Any Collaborator, -WG member or the moderator can add the item to the agenda by adding -the ***WG-agenda*** tag to the issue. - -Prior to each WG meeting the moderator will share the Agenda with -members of the WG. WG members can add any items they like to the -agenda at the beginning of each meeting. The moderator and the WG -cannot veto or remove items. - -The WG may invite persons or representatives from certain projects to -participate in a non-voting capacity. - -The moderator is responsible for summarizing the discussion of each -agenda item and sends it as a pull request after the meeting. - -### Consensus Seeking Process - -The WG follows a -[Consensus -Seeking](http://en.wikipedia.org/wiki/Consensus-seeking_decision-making) -decision-making model. - -When an agenda item has appeared to reach a consensus the moderator -will ask "Does anyone object?" as a final call for dissent from the -consensus. - -If an agenda item cannot reach a consensus a WG member can call for -either a closing vote or a vote to table the issue to the next -meeting. The call for a vote must be seconded by a majority of the WG -or else the discussion will continue. Simple majority wins. - -Note that changes to WG membership require a majority consensus. See -"WG Membership" above. diff --git a/node_modules/readable-stream/LICENSE b/node_modules/readable-stream/LICENSE index 2873b3b..e3d4e69 100644 --- a/node_modules/readable-stream/LICENSE +++ b/node_modules/readable-stream/LICENSE @@ -1,31 +1,3 @@ -Node.js is licensed for use as follows: - -""" -Copyright Node.js contributors. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. -""" - -This license applies to parts of Node.js originating from the -https://github.com/joyent/node repository: - -""" Copyright Joyent, Inc. and other Node contributors. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to @@ -44,4 +16,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -""" diff --git a/node_modules/readable-stream/README.md b/node_modules/readable-stream/README.md index 23fe3f3..e46b823 100644 --- a/node_modules/readable-stream/README.md +++ b/node_modules/readable-stream/README.md @@ -1,58 +1,15 @@ # readable-stream -***Node-core v8.11.1 streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream) - - -[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/) -[![NPM](https://nodei.co/npm-dl/readable-stream.png?&months=6&height=3)](https://nodei.co/npm/readable-stream/) - - -[![Sauce Test Status](https://saucelabs.com/browser-matrix/readable-stream.svg)](https://saucelabs.com/u/readable-stream) - -```bash -npm install --save readable-stream -``` - ***Node-core streams for userland*** -This package is a mirror of the Streams2 and Streams3 implementations in -Node-core. - -Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v8.11.1/docs/api/stream.html). - -If you want to guarantee a stable streams base, regardless of what version of -Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *"stream"* module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html). - -As of version 2.0.0 **readable-stream** uses semantic versioning. +[![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/) +[![NPM](https://nodei.co/npm-dl/readable-stream.png&months=6&height=3)](https://nodei.co/npm/readable-stream/) -# Streams Working Group +This package is a mirror of the Streams2 and Streams3 implementations in Node-core. -`readable-stream` is maintained by the Streams Working Group, which -oversees the development and maintenance of the Streams API within -Node.js. The responsibilities of the Streams Working Group include: +If you want to guarantee a stable streams base, regardless of what version of Node you, or the users of your libraries are using, use **readable-stream** *only* and avoid the *"stream"* module in Node-core. -* Addressing stream issues on the Node.js issue tracker. -* Authoring and editing stream documentation within the Node.js project. -* Reviewing changes to stream subclasses within the Node.js project. -* Redirecting changes to streams from the Node.js project to this - project. -* Assisting in the implementation of stream providers within Node.js. -* Recommending versions of `readable-stream` to be included in Node.js. -* Messaging about the future of streams to give the community advance - notice of changes. +**readable-stream** comes in two major versions, v1.0.x and v1.1.x. The former tracks the Streams2 implementation in Node 0.10, including bug-fixes and minor improvements as they are added. The latter tracks Streams3 as it develops in Node 0.11; we will likely see a v1.2.x branch for Node 0.12. - -## Team Members +**readable-stream** uses proper patch-level versioning so if you pin to `"~1.0.0"` you’ll get the latest Node 0.10 Streams2 implementation, including any fixes and minor non-breaking improvements. The patch-level versions of 1.0.x and 1.1.x should mirror the patch-level versions of Node-core releases. You should prefer the **1.0.x** releases for now and when you’re ready to start using Streams3, pin to `"~1.1.0"` -* **Chris Dickinson** ([@chrisdickinson](https://github.com/chrisdickinson)) <christopher.s.dickinson@gmail.com> - - Release GPG key: 9554F04D7259F04124DE6B476D5A82AC7E37093B -* **Calvin Metcalf** ([@calvinmetcalf](https://github.com/calvinmetcalf)) <calvin.metcalf@gmail.com> - - Release GPG key: F3EF5F62A87FC27A22E643F714CE4FF5015AA242 -* **Rod Vagg** ([@rvagg](https://github.com/rvagg)) <rod@vagg.org> - - Release GPG key: DD8F2338BAE7501E3DD5AC78C273792F7D83545D -* **Sam Newman** ([@sonewman](https://github.com/sonewman)) <newmansam@outlook.com> -* **Mathias Buus** ([@mafintosh](https://github.com/mafintosh)) <mathiasbuus@gmail.com> -* **Domenic Denicola** ([@domenic](https://github.com/domenic)) <d@domenic.me> -* **Matteo Collina** ([@mcollina](https://github.com/mcollina)) <matteo.collina@gmail.com> - - Release GPG key: 3ABC01543F22DD2239285CDD818674489FBC127E -* **Irina Shestak** ([@lrlna](https://github.com/lrlna)) <shestak.irina@gmail.com> diff --git a/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md b/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md deleted file mode 100644 index 83275f1..0000000 --- a/node_modules/readable-stream/doc/wg-meetings/2015-01-30.md +++ /dev/null @@ -1,60 +0,0 @@ -# streams WG Meeting 2015-01-30 - -## Links - -* **Google Hangouts Video**: http://www.youtube.com/watch?v=I9nDOSGfwZg -* **GitHub Issue**: https://github.com/iojs/readable-stream/issues/106 -* **Original Minutes Google Doc**: https://docs.google.com/document/d/17aTgLnjMXIrfjgNaTUnHQO7m3xgzHR2VXBTmi03Qii4/ - -## Agenda - -Extracted from https://github.com/iojs/readable-stream/labels/wg-agenda prior to meeting. - -* adopt a charter [#105](https://github.com/iojs/readable-stream/issues/105) -* release and versioning strategy [#101](https://github.com/iojs/readable-stream/issues/101) -* simpler stream creation [#102](https://github.com/iojs/readable-stream/issues/102) -* proposal: deprecate implicit flowing of streams [#99](https://github.com/iojs/readable-stream/issues/99) - -## Minutes - -### adopt a charter - -* group: +1's all around - -### What versioning scheme should be adopted? -* group: +1’s 3.0.0 -* domenic+group: pulling in patches from other sources where appropriate -* mikeal: version independently, suggesting versions for io.js -* mikeal+domenic: work with TC to notify in advance of changes -simpler stream creation - -### streamline creation of streams -* sam: streamline creation of streams -* domenic: nice simple solution posted - but, we lose the opportunity to change the model - may not be backwards incompatible (double check keys) - - **action item:** domenic will check - -### remove implicit flowing of streams on(‘data’) -* add isFlowing / isPaused -* mikeal: worrying that we’re documenting polyfill methods – confuses users -* domenic: more reflective API is probably good, with warning labels for users -* new section for mad scientists (reflective stream access) -* calvin: name the “third state” -* mikeal: maybe borrow the name from whatwg? -* domenic: we’re missing the “third state” -* consensus: kind of difficult to name the third state -* mikeal: figure out differences in states / compat -* mathias: always flow on data – eliminates third state - * explore what it breaks - -**action items:** -* ask isaac for ability to list packages by what public io.js APIs they use (esp. Stream) -* ask rod/build for infrastructure -* **chris**: explore the “flow on data” approach -* add isPaused/isFlowing -* add new docs section -* move isPaused to that section - - diff --git a/node_modules/readable-stream/duplex-browser.js b/node_modules/readable-stream/duplex-browser.js deleted file mode 100644 index f8b2db8..0000000 --- a/node_modules/readable-stream/duplex-browser.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./lib/_stream_duplex.js'); diff --git a/node_modules/readable-stream/duplex.js b/node_modules/readable-stream/duplex.js index 46924cb..ca807af 100644 --- a/node_modules/readable-stream/duplex.js +++ b/node_modules/readable-stream/duplex.js @@ -1 +1 @@ -module.exports = require('./readable').Duplex +module.exports = require("./lib/_stream_duplex.js") diff --git a/node_modules/readable-stream/lib/_stream_duplex.js b/node_modules/readable-stream/lib/_stream_duplex.js index 57003c3..b513d61 100644 --- a/node_modules/readable-stream/lib/_stream_duplex.js +++ b/node_modules/readable-stream/lib/_stream_duplex.js @@ -24,26 +24,19 @@ // prototypally inherits from Readable, and then parasitically from // Writable. -'use strict'; - -/**/ - -var pna = require('process-nextick-args'); -/**/ +module.exports = Duplex; /**/ var objectKeys = Object.keys || function (obj) { var keys = []; - for (var key in obj) { - keys.push(key); - }return keys; -}; + for (var key in obj) keys.push(key); + return keys; +} /**/ -module.exports = Duplex; /**/ -var util = Object.create(require('core-util-is')); +var util = require('core-util-is'); util.inherits = require('inherits'); /**/ @@ -52,80 +45,45 @@ var Writable = require('./_stream_writable'); util.inherits(Duplex, Readable); -{ - // avoid scope creep, the keys array can then be collected - var keys = objectKeys(Writable.prototype); - for (var v = 0; v < keys.length; v++) { - var method = keys[v]; - if (!Duplex.prototype[method]) Duplex.prototype[method] = Writable.prototype[method]; - } -} +forEach(objectKeys(Writable.prototype), function(method) { + if (!Duplex.prototype[method]) + Duplex.prototype[method] = Writable.prototype[method]; +}); function Duplex(options) { - if (!(this instanceof Duplex)) return new Duplex(options); + if (!(this instanceof Duplex)) + return new Duplex(options); Readable.call(this, options); Writable.call(this, options); - if (options && options.readable === false) this.readable = false; + if (options && options.readable === false) + this.readable = false; - if (options && options.writable === false) this.writable = false; + if (options && options.writable === false) + this.writable = false; this.allowHalfOpen = true; - if (options && options.allowHalfOpen === false) this.allowHalfOpen = false; + if (options && options.allowHalfOpen === false) + this.allowHalfOpen = false; this.once('end', onend); } -Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._writableState.highWaterMark; - } -}); - // the no-half-open enforcer function onend() { // if we allow half-open state, or if the writable side ended, // then we're ok. - if (this.allowHalfOpen || this._writableState.ended) return; + if (this.allowHalfOpen || this._writableState.ended) + return; // no more data can be written. // But allow more writes to happen in this tick. - pna.nextTick(onEndNT, this); -} - -function onEndNT(self) { - self.end(); + process.nextTick(this.end.bind(this)); } -Object.defineProperty(Duplex.prototype, 'destroyed', { - get: function () { - if (this._readableState === undefined || this._writableState === undefined) { - return false; - } - return this._readableState.destroyed && this._writableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (this._readableState === undefined || this._writableState === undefined) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._readableState.destroyed = value; - this._writableState.destroyed = value; +function forEach (xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); } -}); - -Duplex.prototype._destroy = function (err, cb) { - this.push(null); - this.end(); - - pna.nextTick(cb, err); -}; \ No newline at end of file +} diff --git a/node_modules/readable-stream/lib/_stream_passthrough.js b/node_modules/readable-stream/lib/_stream_passthrough.js index 612edb4..895ca50 100644 --- a/node_modules/readable-stream/lib/_stream_passthrough.js +++ b/node_modules/readable-stream/lib/_stream_passthrough.js @@ -23,25 +23,24 @@ // basically just the most minimal sort of Transform stream. // Every written chunk gets output as-is. -'use strict'; - module.exports = PassThrough; var Transform = require('./_stream_transform'); /**/ -var util = Object.create(require('core-util-is')); +var util = require('core-util-is'); util.inherits = require('inherits'); /**/ util.inherits(PassThrough, Transform); function PassThrough(options) { - if (!(this instanceof PassThrough)) return new PassThrough(options); + if (!(this instanceof PassThrough)) + return new PassThrough(options); Transform.call(this, options); } -PassThrough.prototype._transform = function (chunk, encoding, cb) { +PassThrough.prototype._transform = function(chunk, encoding, cb) { cb(null, chunk); -}; \ No newline at end of file +}; diff --git a/node_modules/readable-stream/lib/_stream_readable.js b/node_modules/readable-stream/lib/_stream_readable.js index 0f80764..19ab358 100644 --- a/node_modules/readable-stream/lib/_stream_readable.js +++ b/node_modules/readable-stream/lib/_stream_readable.js @@ -19,118 +19,64 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -'use strict'; - -/**/ - -var pna = require('process-nextick-args'); -/**/ - module.exports = Readable; /**/ var isArray = require('isarray'); /**/ + /**/ -var Duplex; +var Buffer = require('buffer').Buffer; /**/ Readable.ReadableState = ReadableState; -/**/ var EE = require('events').EventEmitter; -var EElistenerCount = function (emitter, type) { +/**/ +if (!EE.listenerCount) EE.listenerCount = function(emitter, type) { return emitter.listeners(type).length; }; /**/ -/**/ -var Stream = require('./internal/streams/stream'); -/**/ +var Stream = require('stream'); /**/ - -var Buffer = require('safe-buffer').Buffer; -var OurUint8Array = global.Uint8Array || function () {}; -function _uint8ArrayToBuffer(chunk) { - return Buffer.from(chunk); -} -function _isUint8Array(obj) { - return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; -} - -/**/ - -/**/ -var util = Object.create(require('core-util-is')); +var util = require('core-util-is'); util.inherits = require('inherits'); /**/ +var StringDecoder; + + /**/ -var debugUtil = require('util'); -var debug = void 0; -if (debugUtil && debugUtil.debuglog) { - debug = debugUtil.debuglog('stream'); +var debug = require('util'); +if (debug && debug.debuglog) { + debug = debug.debuglog('stream'); } else { debug = function () {}; } /**/ -var BufferList = require('./internal/streams/BufferList'); -var destroyImpl = require('./internal/streams/destroy'); -var StringDecoder; util.inherits(Readable, Stream); -var kProxyEvents = ['error', 'close', 'destroy', 'pause', 'resume']; - -function prependListener(emitter, event, fn) { - // Sadly this is not cacheable as some libraries bundle their own - // event emitter implementation with them. - if (typeof emitter.prependListener === 'function') return emitter.prependListener(event, fn); - - // This is a hack to make sure that our error handler is attached before any - // userland ones. NEVER DO THIS. This is here only because this code needs - // to continue to work with older versions of Node.js that do not include - // the prependListener() method. The goal is to eventually remove this hack. - if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);else if (isArray(emitter._events[event])) emitter._events[event].unshift(fn);else emitter._events[event] = [fn, emitter._events[event]]; -} - function ReadableState(options, stream) { - Duplex = Duplex || require('./_stream_duplex'); + var Duplex = require('./_stream_duplex'); options = options || {}; - // Duplex streams are both readable and writable, but share - // the same options object. - // However, some cases require setting options to different - // values for the readable and the writable sides of the duplex stream. - // These options can be provided separately as readableXXX and writableXXX. - var isDuplex = stream instanceof Duplex; - - // object stream flag. Used to make read(n) ignore n and to - // make all the buffer merging and length checks go away - this.objectMode = !!options.objectMode; - - if (isDuplex) this.objectMode = this.objectMode || !!options.readableObjectMode; - // the point at which it stops calling _read() to fill the buffer // Note: 0 is a valid value, means "don't call _read preemptively ever" var hwm = options.highWaterMark; - var readableHwm = options.readableHighWaterMark; - var defaultHwm = this.objectMode ? 16 : 16 * 1024; - - if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (readableHwm || readableHwm === 0)) this.highWaterMark = readableHwm;else this.highWaterMark = defaultHwm; + var defaultHwm = options.objectMode ? 16 : 16 * 1024; + this.highWaterMark = (hwm || hwm === 0) ? hwm : defaultHwm; // cast to ints. - this.highWaterMark = Math.floor(this.highWaterMark); + this.highWaterMark = ~~this.highWaterMark; - // A linked list is used to store data chunks instead of an array because the - // linked list can remove elements from the beginning faster than - // array.shift() - this.buffer = new BufferList(); + this.buffer = []; this.length = 0; this.pipes = null; this.pipesCount = 0; @@ -139,10 +85,10 @@ function ReadableState(options, stream) { this.endEmitted = false; this.reading = false; - // a flag to be able to tell if the event 'readable'/'data' is emitted - // immediately, or on a later tick. We set this to true at first, because - // any actions that shouldn't happen until "later" should generally also - // not happen before the first read call. + // a flag to be able to tell if the onwrite cb is called immediately, + // or on a later tick. We set this to true at first, because any + // actions that shouldn't happen until "later" should generally also + // not happen before the first write call. this.sync = true; // whenever we return null, then we set a flag to say @@ -150,16 +96,24 @@ function ReadableState(options, stream) { this.needReadable = false; this.emittedReadable = false; this.readableListening = false; - this.resumeScheduled = false; - // has it been destroyed - this.destroyed = false; + + // object stream flag. Used to make read(n) ignore n and to + // make all the buffer merging and length checks go away + this.objectMode = !!options.objectMode; + + if (stream instanceof Duplex) + this.objectMode = this.objectMode || !!options.readableObjectMode; // Crypto is kind of old and crusty. Historically, its default string // encoding is 'binary' so we have to make this configurable. // Everything else in the universe uses 'utf8', though. this.defaultEncoding = options.defaultEncoding || 'utf8'; + // when piping, we only care about 'readable' events that happen + // after read()ing all the bytes and not getting any pushback. + this.ranOut = false; + // the number of writers that are awaiting a drain event in .pipe()s this.awaitDrain = 0; @@ -169,144 +123,99 @@ function ReadableState(options, stream) { this.decoder = null; this.encoding = null; if (options.encoding) { - if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; + if (!StringDecoder) + StringDecoder = require('string_decoder/').StringDecoder; this.decoder = new StringDecoder(options.encoding); this.encoding = options.encoding; } } function Readable(options) { - Duplex = Duplex || require('./_stream_duplex'); + var Duplex = require('./_stream_duplex'); - if (!(this instanceof Readable)) return new Readable(options); + if (!(this instanceof Readable)) + return new Readable(options); this._readableState = new ReadableState(options, this); // legacy this.readable = true; - if (options) { - if (typeof options.read === 'function') this._read = options.read; - - if (typeof options.destroy === 'function') this._destroy = options.destroy; - } - Stream.call(this); } -Object.defineProperty(Readable.prototype, 'destroyed', { - get: function () { - if (this._readableState === undefined) { - return false; - } - return this._readableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (!this._readableState) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._readableState.destroyed = value; - } -}); - -Readable.prototype.destroy = destroyImpl.destroy; -Readable.prototype._undestroy = destroyImpl.undestroy; -Readable.prototype._destroy = function (err, cb) { - this.push(null); - cb(err); -}; - // Manually shove something into the read() buffer. // This returns true if the highWaterMark has not been hit yet, // similar to how Writable.write() returns true if you should // write() some more. -Readable.prototype.push = function (chunk, encoding) { +Readable.prototype.push = function(chunk, encoding) { var state = this._readableState; - var skipChunkCheck; - - if (!state.objectMode) { - if (typeof chunk === 'string') { - encoding = encoding || state.defaultEncoding; - if (encoding !== state.encoding) { - chunk = Buffer.from(chunk, encoding); - encoding = ''; - } - skipChunkCheck = true; + + if (util.isString(chunk) && !state.objectMode) { + encoding = encoding || state.defaultEncoding; + if (encoding !== state.encoding) { + chunk = new Buffer(chunk, encoding); + encoding = ''; } - } else { - skipChunkCheck = true; } - return readableAddChunk(this, chunk, encoding, false, skipChunkCheck); + return readableAddChunk(this, state, chunk, encoding, false); }; // Unshift should *always* be something directly out of read() -Readable.prototype.unshift = function (chunk) { - return readableAddChunk(this, chunk, null, true, false); +Readable.prototype.unshift = function(chunk) { + var state = this._readableState; + return readableAddChunk(this, state, chunk, '', true); }; -function readableAddChunk(stream, chunk, encoding, addToFront, skipChunkCheck) { - var state = stream._readableState; - if (chunk === null) { +function readableAddChunk(stream, state, chunk, encoding, addToFront) { + var er = chunkInvalid(state, chunk); + if (er) { + stream.emit('error', er); + } else if (util.isNullOrUndefined(chunk)) { state.reading = false; - onEofChunk(stream, state); - } else { - var er; - if (!skipChunkCheck) er = chunkInvalid(state, chunk); - if (er) { - stream.emit('error', er); - } else if (state.objectMode || chunk && chunk.length > 0) { - if (typeof chunk !== 'string' && !state.objectMode && Object.getPrototypeOf(chunk) !== Buffer.prototype) { - chunk = _uint8ArrayToBuffer(chunk); - } + if (!state.ended) + onEofChunk(stream, state); + } else if (state.objectMode || chunk && chunk.length > 0) { + if (state.ended && !addToFront) { + var e = new Error('stream.push() after EOF'); + stream.emit('error', e); + } else if (state.endEmitted && addToFront) { + var e = new Error('stream.unshift() after end event'); + stream.emit('error', e); + } else { + if (state.decoder && !addToFront && !encoding) + chunk = state.decoder.write(chunk); + + if (!addToFront) + state.reading = false; - if (addToFront) { - if (state.endEmitted) stream.emit('error', new Error('stream.unshift() after end event'));else addChunk(stream, state, chunk, true); - } else if (state.ended) { - stream.emit('error', new Error('stream.push() after EOF')); + // if we want the data now, just emit it. + if (state.flowing && state.length === 0 && !state.sync) { + stream.emit('data', chunk); + stream.read(0); } else { - state.reading = false; - if (state.decoder && !encoding) { - chunk = state.decoder.write(chunk); - if (state.objectMode || chunk.length !== 0) addChunk(stream, state, chunk, false);else maybeReadMore(stream, state); - } else { - addChunk(stream, state, chunk, false); - } + // update the buffer info. + state.length += state.objectMode ? 1 : chunk.length; + if (addToFront) + state.buffer.unshift(chunk); + else + state.buffer.push(chunk); + + if (state.needReadable) + emitReadable(stream); } - } else if (!addToFront) { - state.reading = false; + + maybeReadMore(stream, state); } + } else if (!addToFront) { + state.reading = false; } return needMoreData(state); } -function addChunk(stream, state, chunk, addToFront) { - if (state.flowing && state.length === 0 && !state.sync) { - stream.emit('data', chunk); - stream.read(0); - } else { - // update the buffer info. - state.length += state.objectMode ? 1 : chunk.length; - if (addToFront) state.buffer.unshift(chunk);else state.buffer.push(chunk); - - if (state.needReadable) emitReadable(stream); - } - maybeReadMore(stream, state); -} -function chunkInvalid(state, chunk) { - var er; - if (!_isUint8Array(chunk) && typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { - er = new TypeError('Invalid non-string/buffer chunk'); - } - return er; -} // if it's past the high water mark, we can push in some more. // Also, if we have no data yet, we can stand some @@ -316,75 +225,92 @@ function chunkInvalid(state, chunk) { // needReadable was set, then we ought to push more, so that another // 'readable' event will be triggered. function needMoreData(state) { - return !state.ended && (state.needReadable || state.length < state.highWaterMark || state.length === 0); + return !state.ended && + (state.needReadable || + state.length < state.highWaterMark || + state.length === 0); } -Readable.prototype.isPaused = function () { - return this._readableState.flowing === false; -}; - // backwards compatibility. -Readable.prototype.setEncoding = function (enc) { - if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder; +Readable.prototype.setEncoding = function(enc) { + if (!StringDecoder) + StringDecoder = require('string_decoder/').StringDecoder; this._readableState.decoder = new StringDecoder(enc); this._readableState.encoding = enc; return this; }; -// Don't raise the hwm > 8MB +// Don't raise the hwm > 128MB var MAX_HWM = 0x800000; -function computeNewHighWaterMark(n) { +function roundUpToNextPowerOf2(n) { if (n >= MAX_HWM) { n = MAX_HWM; } else { - // Get the next highest power of 2 to prevent increasing hwm excessively in - // tiny amounts + // Get the next highest power of 2 n--; - n |= n >>> 1; - n |= n >>> 2; - n |= n >>> 4; - n |= n >>> 8; - n |= n >>> 16; + for (var p = 1; p < 32; p <<= 1) n |= n >> p; n++; } return n; } -// This function is designed to be inlinable, so please take care when making -// changes to the function body. function howMuchToRead(n, state) { - if (n <= 0 || state.length === 0 && state.ended) return 0; - if (state.objectMode) return 1; - if (n !== n) { - // Only flow one buffer at a time - if (state.flowing && state.length) return state.buffer.head.data.length;else return state.length; - } - // If we're asking for more than the current hwm, then raise the hwm. - if (n > state.highWaterMark) state.highWaterMark = computeNewHighWaterMark(n); - if (n <= state.length) return n; - // Don't have enough - if (!state.ended) { - state.needReadable = true; + if (state.length === 0 && state.ended) return 0; + + if (state.objectMode) + return n === 0 ? 0 : 1; + + if (isNaN(n) || util.isNull(n)) { + // only flow one buffer at a time + if (state.flowing && state.buffer.length) + return state.buffer[0].length; + else + return state.length; + } + + if (n <= 0) + return 0; + + // If we're asking for more than the target buffer level, + // then raise the water mark. Bump up to the next highest + // power of 2, to prevent increasing it excessively in tiny + // amounts. + if (n > state.highWaterMark) + state.highWaterMark = roundUpToNextPowerOf2(n); + + // don't have that much. return null, unless we've ended. + if (n > state.length) { + if (!state.ended) { + state.needReadable = true; + return 0; + } else + return state.length; } - return state.length; + + return n; } // you can override either this method, or the async _read(n) below. -Readable.prototype.read = function (n) { +Readable.prototype.read = function(n) { debug('read', n); - n = parseInt(n, 10); var state = this._readableState; var nOrig = n; - if (n !== 0) state.emittedReadable = false; + if (!util.isNumber(n) || n > 0) + state.emittedReadable = false; // if we're doing read(0) to trigger a readable event, but we // already have a bunch of data in the buffer, then just trigger // the 'readable' event and move on. - if (n === 0 && state.needReadable && (state.length >= state.highWaterMark || state.ended)) { + if (n === 0 && + state.needReadable && + (state.length >= state.highWaterMark || state.ended)) { debug('read: emitReadable', state.length, state.ended); - if (state.length === 0 && state.ended) endReadable(this);else emitReadable(this); + if (state.length === 0 && state.ended) + endReadable(this); + else + emitReadable(this); return null; } @@ -392,7 +318,8 @@ Readable.prototype.read = function (n) { // if we've ended, and we're now clear, then finish it up. if (n === 0 && state.ended) { - if (state.length === 0) endReadable(this); + if (state.length === 0) + endReadable(this); return null; } @@ -433,47 +360,67 @@ Readable.prototype.read = function (n) { if (state.ended || state.reading) { doRead = false; debug('reading or ended', doRead); - } else if (doRead) { + } + + if (doRead) { debug('do read'); state.reading = true; state.sync = true; // if the length is currently zero, then we *need* a readable event. - if (state.length === 0) state.needReadable = true; + if (state.length === 0) + state.needReadable = true; // call internal read method this._read(state.highWaterMark); state.sync = false; - // If _read pushed data synchronously, then `reading` will be false, - // and we need to re-evaluate how much data we can return to the user. - if (!state.reading) n = howMuchToRead(nOrig, state); } + // If _read pushed data synchronously, then `reading` will be false, + // and we need to re-evaluate how much data we can return to the user. + if (doRead && !state.reading) + n = howMuchToRead(nOrig, state); + var ret; - if (n > 0) ret = fromList(n, state);else ret = null; + if (n > 0) + ret = fromList(n, state); + else + ret = null; - if (ret === null) { + if (util.isNull(ret)) { state.needReadable = true; n = 0; - } else { - state.length -= n; } - if (state.length === 0) { - // If we have nothing in the buffer, then we want to know - // as soon as we *do* get something into the buffer. - if (!state.ended) state.needReadable = true; + state.length -= n; - // If we tried to read() past the EOF, then emit end on the next tick. - if (nOrig !== n && state.ended) endReadable(this); - } + // If we have nothing in the buffer, then we want to know + // as soon as we *do* get something into the buffer. + if (state.length === 0 && !state.ended) + state.needReadable = true; + + // If we tried to read() past the EOF, then emit end on the next tick. + if (nOrig !== n && state.ended && state.length === 0) + endReadable(this); - if (ret !== null) this.emit('data', ret); + if (!util.isNull(ret)) + this.emit('data', ret); return ret; }; +function chunkInvalid(state, chunk) { + var er = null; + if (!util.isBuffer(chunk) && + !util.isString(chunk) && + !util.isNullOrUndefined(chunk) && + !state.objectMode) { + er = new TypeError('Invalid non-string/buffer chunk'); + } + return er; +} + + function onEofChunk(stream, state) { - if (state.ended) return; - if (state.decoder) { + if (state.decoder && !state.ended) { var chunk = state.decoder.end(); if (chunk && chunk.length) { state.buffer.push(chunk); @@ -495,7 +442,12 @@ function emitReadable(stream) { if (!state.emittedReadable) { debug('emitReadable', state.flowing); state.emittedReadable = true; - if (state.sync) pna.nextTick(emitReadable_, stream);else emitReadable_(stream); + if (state.sync) + process.nextTick(function() { + emitReadable_(stream); + }); + else + emitReadable_(stream); } } @@ -505,6 +457,7 @@ function emitReadable_(stream) { flow(stream); } + // at this point, the user has presumably seen the 'readable' event, // and called read() to consume some data. that may have triggered // in turn another _read(n) call, in which case reading = true if @@ -514,18 +467,23 @@ function emitReadable_(stream) { function maybeReadMore(stream, state) { if (!state.readingMore) { state.readingMore = true; - pna.nextTick(maybeReadMore_, stream, state); + process.nextTick(function() { + maybeReadMore_(stream, state); + }); } } function maybeReadMore_(stream, state) { var len = state.length; - while (!state.reading && !state.flowing && !state.ended && state.length < state.highWaterMark) { + while (!state.reading && !state.flowing && !state.ended && + state.length < state.highWaterMark) { debug('maybeReadMore read 0'); stream.read(0); if (len === state.length) // didn't get any data, stop spinning. - break;else len = state.length; + break; + else + len = state.length; } state.readingMore = false; } @@ -534,11 +492,11 @@ function maybeReadMore_(stream, state) { // call cb(er, data) where data is <= n in length. // for virtual (non-string, non-buffer) streams, "length" is somewhat // arbitrary, and perhaps not very meaningful. -Readable.prototype._read = function (n) { - this.emit('error', new Error('_read() is not implemented')); +Readable.prototype._read = function(n) { + this.emit('error', new Error('not implemented')); }; -Readable.prototype.pipe = function (dest, pipeOpts) { +Readable.prototype.pipe = function(dest, pipeOpts) { var src = this; var state = this._readableState; @@ -556,19 +514,21 @@ Readable.prototype.pipe = function (dest, pipeOpts) { state.pipesCount += 1; debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); - var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; + var doEnd = (!pipeOpts || pipeOpts.end !== false) && + dest !== process.stdout && + dest !== process.stderr; - var endFn = doEnd ? onend : unpipe; - if (state.endEmitted) pna.nextTick(endFn);else src.once('end', endFn); + var endFn = doEnd ? onend : cleanup; + if (state.endEmitted) + process.nextTick(endFn); + else + src.once('end', endFn); dest.on('unpipe', onunpipe); - function onunpipe(readable, unpipeInfo) { + function onunpipe(readable) { debug('onunpipe'); if (readable === src) { - if (unpipeInfo && unpipeInfo.hasUnpiped === false) { - unpipeInfo.hasUnpiped = true; - cleanup(); - } + cleanup(); } } @@ -584,7 +544,6 @@ Readable.prototype.pipe = function (dest, pipeOpts) { var ondrain = pipeOnDrain(src); dest.on('drain', ondrain); - var cleanedUp = false; function cleanup() { debug('cleanup'); // cleanup event handlers once the pipe is broken @@ -594,39 +553,27 @@ Readable.prototype.pipe = function (dest, pipeOpts) { dest.removeListener('error', onerror); dest.removeListener('unpipe', onunpipe); src.removeListener('end', onend); - src.removeListener('end', unpipe); + src.removeListener('end', cleanup); src.removeListener('data', ondata); - cleanedUp = true; - // if the reader is waiting for a drain event from this // specific writer, then it would cause it to never start // flowing again. // So, if this is awaiting a drain, then we just call it now. // If we don't know, then assume that we are waiting for one. - if (state.awaitDrain && (!dest._writableState || dest._writableState.needDrain)) ondrain(); + if (state.awaitDrain && + (!dest._writableState || dest._writableState.needDrain)) + ondrain(); } - // If the user pushes more data while we're writing to dest then we'll end up - // in ondata again. However, we only want to increase awaitDrain once because - // dest will only emit one 'drain' event for the multiple writes. - // => Introduce a guard on increasing awaitDrain. - var increasedAwaitDrain = false; src.on('data', ondata); function ondata(chunk) { debug('ondata'); - increasedAwaitDrain = false; var ret = dest.write(chunk); - if (false === ret && !increasedAwaitDrain) { - // If the user unpiped during `dest.write()`, it is possible - // to get stuck in a permanently paused state if that write - // also returned false. - // => Check whether `dest` is still a piping destination. - if ((state.pipesCount === 1 && state.pipes === dest || state.pipesCount > 1 && indexOf(state.pipes, dest) !== -1) && !cleanedUp) { - debug('false write response, pause', src._readableState.awaitDrain); - src._readableState.awaitDrain++; - increasedAwaitDrain = true; - } + if (false === ret) { + debug('false write response, pause', + src._readableState.awaitDrain); + src._readableState.awaitDrain++; src.pause(); } } @@ -637,11 +584,19 @@ Readable.prototype.pipe = function (dest, pipeOpts) { debug('onerror', er); unpipe(); dest.removeListener('error', onerror); - if (EElistenerCount(dest, 'error') === 0) dest.emit('error', er); + if (EE.listenerCount(dest, 'error') === 0) + dest.emit('error', er); } + // This is a brutally ugly hack to make sure that our error handler + // is attached before any userland ones. NEVER DO THIS. + if (!dest._events || !dest._events.error) + dest.on('error', onerror); + else if (isArray(dest._events.error)) + dest._events.error.unshift(onerror); + else + dest._events.error = [onerror, dest._events.error]; + - // Make sure our error handler is attached before userland ones. - prependListener(dest, 'error', onerror); // Both close and finish should trigger unpipe, but only once. function onclose() { @@ -674,36 +629,41 @@ Readable.prototype.pipe = function (dest, pipeOpts) { }; function pipeOnDrain(src) { - return function () { + return function() { var state = src._readableState; debug('pipeOnDrain', state.awaitDrain); - if (state.awaitDrain) state.awaitDrain--; - if (state.awaitDrain === 0 && EElistenerCount(src, 'data')) { + if (state.awaitDrain) + state.awaitDrain--; + if (state.awaitDrain === 0 && EE.listenerCount(src, 'data')) { state.flowing = true; flow(src); } }; } -Readable.prototype.unpipe = function (dest) { + +Readable.prototype.unpipe = function(dest) { var state = this._readableState; - var unpipeInfo = { hasUnpiped: false }; // if we're not piping anywhere, then do nothing. - if (state.pipesCount === 0) return this; + if (state.pipesCount === 0) + return this; // just one destination. most common case. if (state.pipesCount === 1) { // passed in one, but it's not the right one. - if (dest && dest !== state.pipes) return this; + if (dest && dest !== state.pipes) + return this; - if (!dest) dest = state.pipes; + if (!dest) + dest = state.pipes; // got a match. state.pipes = null; state.pipesCount = 0; state.flowing = false; - if (dest) dest.emit('unpipe', this, unpipeInfo); + if (dest) + dest.emit('unpipe', this); return this; } @@ -717,41 +677,51 @@ Readable.prototype.unpipe = function (dest) { state.pipesCount = 0; state.flowing = false; - for (var i = 0; i < len; i++) { - dests[i].emit('unpipe', this, unpipeInfo); - }return this; + for (var i = 0; i < len; i++) + dests[i].emit('unpipe', this); + return this; } // try to find the right one. - var index = indexOf(state.pipes, dest); - if (index === -1) return this; + var i = indexOf(state.pipes, dest); + if (i === -1) + return this; - state.pipes.splice(index, 1); + state.pipes.splice(i, 1); state.pipesCount -= 1; - if (state.pipesCount === 1) state.pipes = state.pipes[0]; + if (state.pipesCount === 1) + state.pipes = state.pipes[0]; - dest.emit('unpipe', this, unpipeInfo); + dest.emit('unpipe', this); return this; }; // set up data events if they are asked for // Ensure readable listeners eventually get something -Readable.prototype.on = function (ev, fn) { +Readable.prototype.on = function(ev, fn) { var res = Stream.prototype.on.call(this, ev, fn); - if (ev === 'data') { - // Start flowing on next tick if stream isn't explicitly paused - if (this._readableState.flowing !== false) this.resume(); - } else if (ev === 'readable') { + // If listening to data, and it has not explicitly been paused, + // then call resume to start the flow of data on the next tick. + if (ev === 'data' && false !== this._readableState.flowing) { + this.resume(); + } + + if (ev === 'readable' && this.readable) { var state = this._readableState; - if (!state.endEmitted && !state.readableListening) { - state.readableListening = state.needReadable = true; + if (!state.readableListening) { + state.readableListening = true; state.emittedReadable = false; + state.needReadable = true; if (!state.reading) { - pna.nextTick(nReadingNextTick, this); + var self = this; + process.nextTick(function() { + debug('readable nexttick read 0'); + self.read(0); + }); } else if (state.length) { - emitReadable(this); + emitReadable(this, state); } } } @@ -760,18 +730,17 @@ Readable.prototype.on = function (ev, fn) { }; Readable.prototype.addListener = Readable.prototype.on; -function nReadingNextTick(self) { - debug('readable nexttick read 0'); - self.read(0); -} - // pause() and resume() are remnants of the legacy readable stream API // If the user uses them, then switch into old mode. -Readable.prototype.resume = function () { +Readable.prototype.resume = function() { var state = this._readableState; if (!state.flowing) { debug('resume'); state.flowing = true; + if (!state.reading) { + debug('resume read 0'); + this.read(0); + } resume(this, state); } return this; @@ -780,24 +749,21 @@ Readable.prototype.resume = function () { function resume(stream, state) { if (!state.resumeScheduled) { state.resumeScheduled = true; - pna.nextTick(resume_, stream, state); + process.nextTick(function() { + resume_(stream, state); + }); } } function resume_(stream, state) { - if (!state.reading) { - debug('resume read 0'); - stream.read(0); - } - state.resumeScheduled = false; - state.awaitDrain = 0; stream.emit('resume'); flow(stream); - if (state.flowing && !state.reading) stream.read(0); + if (state.flowing && !state.reading) + stream.read(0); } -Readable.prototype.pause = function () { +Readable.prototype.pause = function() { debug('call pause flowing=%j', this._readableState.flowing); if (false !== this._readableState.flowing) { debug('pause'); @@ -810,36 +776,40 @@ Readable.prototype.pause = function () { function flow(stream) { var state = stream._readableState; debug('flow', state.flowing); - while (state.flowing && stream.read() !== null) {} + if (state.flowing) { + do { + var chunk = stream.read(); + } while (null !== chunk && state.flowing); + } } // wrap an old-style stream as the async data source. // This is *not* part of the readable stream interface. // It is an ugly unfortunate mess of history. -Readable.prototype.wrap = function (stream) { - var _this = this; - +Readable.prototype.wrap = function(stream) { var state = this._readableState; var paused = false; - stream.on('end', function () { + var self = this; + stream.on('end', function() { debug('wrapped end'); if (state.decoder && !state.ended) { var chunk = state.decoder.end(); - if (chunk && chunk.length) _this.push(chunk); + if (chunk && chunk.length) + self.push(chunk); } - _this.push(null); + self.push(null); }); - stream.on('data', function (chunk) { + stream.on('data', function(chunk) { debug('wrapped data'); - if (state.decoder) chunk = state.decoder.write(chunk); - - // don't skip over falsy values in objectMode - if (state.objectMode && (chunk === null || chunk === undefined)) return;else if (!state.objectMode && (!chunk || !chunk.length)) return; + if (state.decoder) + chunk = state.decoder.write(chunk); + if (!chunk || !state.objectMode && !chunk.length) + return; - var ret = _this.push(chunk); + var ret = self.push(chunk); if (!ret) { paused = true; stream.pause(); @@ -849,23 +819,22 @@ Readable.prototype.wrap = function (stream) { // proxy all the other methods. // important when wrapping filters and duplexes. for (var i in stream) { - if (this[i] === undefined && typeof stream[i] === 'function') { - this[i] = function (method) { - return function () { - return stream[method].apply(stream, arguments); - }; - }(i); + if (util.isFunction(stream[i]) && util.isUndefined(this[i])) { + this[i] = function(method) { return function() { + return stream[method].apply(stream, arguments); + }}(i); } } // proxy certain important events. - for (var n = 0; n < kProxyEvents.length; n++) { - stream.on(kProxyEvents[n], this.emit.bind(this, kProxyEvents[n])); - } + var events = ['error', 'close', 'destroy', 'pause', 'resume']; + forEach(events, function(ev) { + stream.on(ev, self.emit.bind(self, ev)); + }); // when we try to consume some more bytes, simply unpause the // underlying stream. - this._read = function (n) { + self._read = function(n) { debug('wrapped _read', n); if (paused) { paused = false; @@ -873,119 +842,77 @@ Readable.prototype.wrap = function (stream) { } }; - return this; + return self; }; -Object.defineProperty(Readable.prototype, 'readableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._readableState.highWaterMark; - } -}); + // exposed for testing purposes only. Readable._fromList = fromList; // Pluck off n bytes from an array of buffers. // Length is the combined lengths of all the buffers in the list. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. function fromList(n, state) { - // nothing buffered - if (state.length === 0) return null; - + var list = state.buffer; + var length = state.length; + var stringMode = !!state.decoder; + var objectMode = !!state.objectMode; var ret; - if (state.objectMode) ret = state.buffer.shift();else if (!n || n >= state.length) { - // read it all, truncate the list - if (state.decoder) ret = state.buffer.join('');else if (state.buffer.length === 1) ret = state.buffer.head.data;else ret = state.buffer.concat(state.length); - state.buffer.clear(); - } else { - // read part of list - ret = fromListPartial(n, state.buffer, state.decoder); - } - return ret; -} + // nothing in the list, definitely empty. + if (list.length === 0) + return null; -// Extracts only enough buffered data to satisfy the amount requested. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function fromListPartial(n, list, hasStrings) { - var ret; - if (n < list.head.data.length) { - // slice is the same for buffers and strings - ret = list.head.data.slice(0, n); - list.head.data = list.head.data.slice(n); - } else if (n === list.head.data.length) { - // first chunk is a perfect match + if (length === 0) + ret = null; + else if (objectMode) ret = list.shift(); + else if (!n || n >= length) { + // read it all, truncate the array. + if (stringMode) + ret = list.join(''); + else + ret = Buffer.concat(list, length); + list.length = 0; } else { - // result spans more than one buffer - ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list); - } - return ret; -} - -// Copies a specified amount of characters from the list of buffered data -// chunks. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function copyFromBufferString(n, list) { - var p = list.head; - var c = 1; - var ret = p.data; - n -= ret.length; - while (p = p.next) { - var str = p.data; - var nb = n > str.length ? str.length : n; - if (nb === str.length) ret += str;else ret += str.slice(0, n); - n -= nb; - if (n === 0) { - if (nb === str.length) { - ++c; - if (p.next) list.head = p.next;else list.head = list.tail = null; - } else { - list.head = p; - p.data = str.slice(nb); + // read just some of it. + if (n < list[0].length) { + // just take a part of the first list item. + // slice is the same for buffers and strings. + var buf = list[0]; + ret = buf.slice(0, n); + list[0] = buf.slice(n); + } else if (n === list[0].length) { + // first list is a perfect match + ret = list.shift(); + } else { + // complex case. + // we have enough to cover it, but it spans past the first buffer. + if (stringMode) + ret = ''; + else + ret = new Buffer(n); + + var c = 0; + for (var i = 0, l = list.length; i < l && c < n; i++) { + var buf = list[0]; + var cpy = Math.min(n - c, buf.length); + + if (stringMode) + ret += buf.slice(0, cpy); + else + buf.copy(ret, c, 0, cpy); + + if (cpy < buf.length) + list[0] = buf.slice(cpy); + else + list.shift(); + + c += cpy; } - break; } - ++c; } - list.length -= c; - return ret; -} -// Copies a specified amount of bytes from the list of buffered data chunks. -// This function is designed to be inlinable, so please take care when making -// changes to the function body. -function copyFromBuffer(n, list) { - var ret = Buffer.allocUnsafe(n); - var p = list.head; - var c = 1; - p.data.copy(ret); - n -= p.data.length; - while (p = p.next) { - var buf = p.data; - var nb = n > buf.length ? buf.length : n; - buf.copy(ret, ret.length - n, 0, nb); - n -= nb; - if (n === 0) { - if (nb === buf.length) { - ++c; - if (p.next) list.head = p.next;else list.head = list.tail = null; - } else { - list.head = p; - p.data = buf.slice(nb); - } - break; - } - ++c; - } - list.length -= c; return ret; } @@ -994,26 +921,31 @@ function endReadable(stream) { // If we get here before consuming all the bytes, then that is a // bug in node. Should never happen. - if (state.length > 0) throw new Error('"endReadable()" called on non-empty stream'); + if (state.length > 0) + throw new Error('endReadable called on non-empty stream'); if (!state.endEmitted) { state.ended = true; - pna.nextTick(endReadableNT, state, stream); + process.nextTick(function() { + // Check that we didn't get one last unshift. + if (!state.endEmitted && state.length === 0) { + state.endEmitted = true; + stream.readable = false; + stream.emit('end'); + } + }); } } -function endReadableNT(state, stream) { - // Check that we didn't get one last unshift. - if (!state.endEmitted && state.length === 0) { - state.endEmitted = true; - stream.readable = false; - stream.emit('end'); +function forEach (xs, f) { + for (var i = 0, l = xs.length; i < l; i++) { + f(xs[i], i); } } -function indexOf(xs, x) { +function indexOf (xs, x) { for (var i = 0, l = xs.length; i < l; i++) { if (xs[i] === x) return i; } return -1; -} \ No newline at end of file +} diff --git a/node_modules/readable-stream/lib/_stream_transform.js b/node_modules/readable-stream/lib/_stream_transform.js index fcfc105..905c5e4 100644 --- a/node_modules/readable-stream/lib/_stream_transform.js +++ b/node_modules/readable-stream/lib/_stream_transform.js @@ -19,6 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. + // a transform stream is a readable/writable stream where you do // something with the data. Sometimes it's called a "filter", // but that's not a great name for it, since that implies a thing where @@ -61,57 +62,65 @@ // would be consumed, and then the rest would wait (un-transformed) until // the results of the previous transformed chunk were consumed. -'use strict'; - module.exports = Transform; var Duplex = require('./_stream_duplex'); /**/ -var util = Object.create(require('core-util-is')); +var util = require('core-util-is'); util.inherits = require('inherits'); /**/ util.inherits(Transform, Duplex); -function afterTransform(er, data) { - var ts = this._transformState; + +function TransformState(options, stream) { + this.afterTransform = function(er, data) { + return afterTransform(stream, er, data); + }; + + this.needTransform = false; + this.transforming = false; + this.writecb = null; + this.writechunk = null; +} + +function afterTransform(stream, er, data) { + var ts = stream._transformState; ts.transforming = false; var cb = ts.writecb; - if (!cb) { - return this.emit('error', new Error('write callback called multiple times')); - } + if (!cb) + return stream.emit('error', new Error('no writecb in Transform class')); ts.writechunk = null; ts.writecb = null; - if (data != null) // single equals check for both `null` and `undefined` - this.push(data); + if (!util.isNullOrUndefined(data)) + stream.push(data); - cb(er); + if (cb) + cb(er); - var rs = this._readableState; + var rs = stream._readableState; rs.reading = false; if (rs.needReadable || rs.length < rs.highWaterMark) { - this._read(rs.highWaterMark); + stream._read(rs.highWaterMark); } } + function Transform(options) { - if (!(this instanceof Transform)) return new Transform(options); + if (!(this instanceof Transform)) + return new Transform(options); Duplex.call(this, options); - this._transformState = { - afterTransform: afterTransform.bind(this), - needTransform: false, - transforming: false, - writecb: null, - writechunk: null, - writeencoding: null - }; + this._transformState = new TransformState(options, this); + + // when the writable side finishes, then flush out anything remaining. + var stream = this; // start out asking for a readable event once data is transformed. this._readableState.needReadable = true; @@ -121,29 +130,17 @@ function Transform(options) { // sync guard flag. this._readableState.sync = false; - if (options) { - if (typeof options.transform === 'function') this._transform = options.transform; - - if (typeof options.flush === 'function') this._flush = options.flush; - } - - // When the writable side finishes, then flush out anything remaining. - this.on('prefinish', prefinish); -} - -function prefinish() { - var _this = this; - - if (typeof this._flush === 'function') { - this._flush(function (er, data) { - done(_this, er, data); - }); - } else { - done(this, null, null); - } + this.once('prefinish', function() { + if (util.isFunction(this._flush)) + this._flush(function(er) { + done(stream, er); + }); + else + done(stream); + }); } -Transform.prototype.push = function (chunk, encoding) { +Transform.prototype.push = function(chunk, encoding) { this._transformState.needTransform = false; return Duplex.prototype.push.call(this, chunk, encoding); }; @@ -158,28 +155,31 @@ Transform.prototype.push = function (chunk, encoding) { // Call `cb(err)` when you are done with this chunk. If you pass // an error, then that'll put the hurt on the whole operation. If you // never call cb(), then you'll never get another chunk. -Transform.prototype._transform = function (chunk, encoding, cb) { - throw new Error('_transform() is not implemented'); +Transform.prototype._transform = function(chunk, encoding, cb) { + throw new Error('not implemented'); }; -Transform.prototype._write = function (chunk, encoding, cb) { +Transform.prototype._write = function(chunk, encoding, cb) { var ts = this._transformState; ts.writecb = cb; ts.writechunk = chunk; ts.writeencoding = encoding; if (!ts.transforming) { var rs = this._readableState; - if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark) this._read(rs.highWaterMark); + if (ts.needTransform || + rs.needReadable || + rs.length < rs.highWaterMark) + this._read(rs.highWaterMark); } }; // Doesn't matter what the args are here. // _transform does all the work. // That we got here means that the readable side wants more data. -Transform.prototype._read = function (n) { +Transform.prototype._read = function(n) { var ts = this._transformState; - if (ts.writechunk !== null && ts.writecb && !ts.transforming) { + if (!util.isNull(ts.writechunk) && ts.writecb && !ts.transforming) { ts.transforming = true; this._transform(ts.writechunk, ts.writeencoding, ts.afterTransform); } else { @@ -189,26 +189,21 @@ Transform.prototype._read = function (n) { } }; -Transform.prototype._destroy = function (err, cb) { - var _this2 = this; - Duplex.prototype._destroy.call(this, err, function (err2) { - cb(err2); - _this2.emit('close'); - }); -}; - -function done(stream, er, data) { - if (er) return stream.emit('error', er); - - if (data != null) // single equals check for both `null` and `undefined` - stream.push(data); +function done(stream, er) { + if (er) + return stream.emit('error', er); // if there's nothing in the write buffer, then that means // that nothing more will ever be provided - if (stream._writableState.length) throw new Error('Calling transform done when ws.length != 0'); + var ws = stream._writableState; + var ts = stream._transformState; + + if (ws.length) + throw new Error('calling transform done when ws.length != 0'); - if (stream._transformState.transforming) throw new Error('Calling transform done when still transforming'); + if (ts.transforming) + throw new Error('calling transform done when still transforming'); return stream.push(null); -} \ No newline at end of file +} diff --git a/node_modules/readable-stream/lib/_stream_writable.js b/node_modules/readable-stream/lib/_stream_writable.js index b0b0220..db8539c 100644 --- a/node_modules/readable-stream/lib/_stream_writable.js +++ b/node_modules/readable-stream/lib/_stream_writable.js @@ -20,117 +20,55 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. // A bit simpler than readable streams. -// Implement an async ._write(chunk, encoding, cb), and it'll handle all +// Implement an async ._write(chunk, cb), and it'll handle all // the drain event emission and buffering. -'use strict'; - -/**/ - -var pna = require('process-nextick-args'); -/**/ - module.exports = Writable; -/* */ -function WriteReq(chunk, encoding, cb) { - this.chunk = chunk; - this.encoding = encoding; - this.callback = cb; - this.next = null; -} - -// It seems a linked list but it is not -// there will be only 2 of these for each stream -function CorkedRequest(state) { - var _this = this; - - this.next = null; - this.entry = null; - this.finish = function () { - onCorkedFinish(_this, state); - }; -} -/* */ - -/**/ -var asyncWrite = !process.browser && ['v0.10', 'v0.9.'].indexOf(process.version.slice(0, 5)) > -1 ? setImmediate : pna.nextTick; -/**/ - /**/ -var Duplex; +var Buffer = require('buffer').Buffer; /**/ Writable.WritableState = WritableState; -/**/ -var util = Object.create(require('core-util-is')); -util.inherits = require('inherits'); -/**/ - -/**/ -var internalUtil = { - deprecate: require('util-deprecate') -}; -/**/ - -/**/ -var Stream = require('./internal/streams/stream'); -/**/ /**/ - -var Buffer = require('safe-buffer').Buffer; -var OurUint8Array = global.Uint8Array || function () {}; -function _uint8ArrayToBuffer(chunk) { - return Buffer.from(chunk); -} -function _isUint8Array(obj) { - return Buffer.isBuffer(obj) || obj instanceof OurUint8Array; -} - +var util = require('core-util-is'); +util.inherits = require('inherits'); /**/ -var destroyImpl = require('./internal/streams/destroy'); +var Stream = require('stream'); util.inherits(Writable, Stream); -function nop() {} +function WriteReq(chunk, encoding, cb) { + this.chunk = chunk; + this.encoding = encoding; + this.callback = cb; +} function WritableState(options, stream) { - Duplex = Duplex || require('./_stream_duplex'); + var Duplex = require('./_stream_duplex'); options = options || {}; - // Duplex streams are both readable and writable, but share - // the same options object. - // However, some cases require setting options to different - // values for the readable and the writable sides of the duplex stream. - // These options can be provided separately as readableXXX and writableXXX. - var isDuplex = stream instanceof Duplex; - - // object stream flag to indicate whether or not this stream - // contains buffers or objects. - this.objectMode = !!options.objectMode; - - if (isDuplex) this.objectMode = this.objectMode || !!options.writableObjectMode; - // the point at which write() starts returning false // Note: 0 is a valid value, means that we always return false if // the entire buffer is not flushed immediately on write() var hwm = options.highWaterMark; - var writableHwm = options.writableHighWaterMark; - var defaultHwm = this.objectMode ? 16 : 16 * 1024; + var defaultHwm = options.objectMode ? 16 : 16 * 1024; + this.highWaterMark = (hwm || hwm === 0) ? hwm : defaultHwm; - if (hwm || hwm === 0) this.highWaterMark = hwm;else if (isDuplex && (writableHwm || writableHwm === 0)) this.highWaterMark = writableHwm;else this.highWaterMark = defaultHwm; + // object stream flag to indicate whether or not this stream + // contains buffers or objects. + this.objectMode = !!options.objectMode; - // cast to ints. - this.highWaterMark = Math.floor(this.highWaterMark); + if (stream instanceof Duplex) + this.objectMode = this.objectMode || !!options.writableObjectMode; - // if _final has been called - this.finalCalled = false; + // cast to ints. + this.highWaterMark = ~~this.highWaterMark; - // drain event flag. this.needDrain = false; // at the start of calling end() this.ending = false; @@ -139,9 +77,6 @@ function WritableState(options, stream) { // when 'finish' is emitted this.finished = false; - // has it been destroyed - this.destroyed = false; - // should we decode strings into buffers before passing to _write? // this is here so that some node-core streams can optimize string // handling at a lower level. @@ -176,7 +111,7 @@ function WritableState(options, stream) { this.bufferProcessing = false; // the callback that's passed to _write(chunk,cb) - this.onwrite = function (er) { + this.onwrite = function(er) { onwrite(stream, er); }; @@ -186,8 +121,7 @@ function WritableState(options, stream) { // the amount that is being written when _write is called. this.writelen = 0; - this.bufferedRequest = null; - this.lastBufferedRequest = null; + this.buffer = []; // number of pending user-supplied write callbacks // this must be 0 before 'finish' can be emitted @@ -199,223 +133,137 @@ function WritableState(options, stream) { // True if the error was already emitted and should not be thrown again this.errorEmitted = false; - - // count buffered requests - this.bufferedRequestCount = 0; - - // allocate the first CorkedRequest, there is always - // one allocated and free to use, and we maintain at most two - this.corkedRequestsFree = new CorkedRequest(this); -} - -WritableState.prototype.getBuffer = function getBuffer() { - var current = this.bufferedRequest; - var out = []; - while (current) { - out.push(current); - current = current.next; - } - return out; -}; - -(function () { - try { - Object.defineProperty(WritableState.prototype, 'buffer', { - get: internalUtil.deprecate(function () { - return this.getBuffer(); - }, '_writableState.buffer is deprecated. Use _writableState.getBuffer ' + 'instead.', 'DEP0003') - }); - } catch (_) {} -})(); - -// Test _writableState for inheritance to account for Duplex streams, -// whose prototype chain only points to Readable. -var realHasInstance; -if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') { - realHasInstance = Function.prototype[Symbol.hasInstance]; - Object.defineProperty(Writable, Symbol.hasInstance, { - value: function (object) { - if (realHasInstance.call(this, object)) return true; - if (this !== Writable) return false; - - return object && object._writableState instanceof WritableState; - } - }); -} else { - realHasInstance = function (object) { - return object instanceof this; - }; } function Writable(options) { - Duplex = Duplex || require('./_stream_duplex'); - - // Writable ctor is applied to Duplexes, too. - // `realHasInstance` is necessary because using plain `instanceof` - // would return false, as no `_writableState` property is attached. + var Duplex = require('./_stream_duplex'); - // Trying to use the custom `instanceof` for Writable here will also break the - // Node.js LazyTransform implementation, which has a non-trivial getter for - // `_writableState` that would lead to infinite recursion. - if (!realHasInstance.call(Writable, this) && !(this instanceof Duplex)) { + // Writable ctor is applied to Duplexes, though they're not + // instanceof Writable, they're instanceof Readable. + if (!(this instanceof Writable) && !(this instanceof Duplex)) return new Writable(options); - } this._writableState = new WritableState(options, this); // legacy. this.writable = true; - if (options) { - if (typeof options.write === 'function') this._write = options.write; - - if (typeof options.writev === 'function') this._writev = options.writev; - - if (typeof options.destroy === 'function') this._destroy = options.destroy; - - if (typeof options.final === 'function') this._final = options.final; - } - Stream.call(this); } // Otherwise people can pipe Writable streams, which is just wrong. -Writable.prototype.pipe = function () { - this.emit('error', new Error('Cannot pipe, not readable')); +Writable.prototype.pipe = function() { + this.emit('error', new Error('Cannot pipe. Not readable.')); }; -function writeAfterEnd(stream, cb) { + +function writeAfterEnd(stream, state, cb) { var er = new Error('write after end'); // TODO: defer error events consistently everywhere, not just the cb stream.emit('error', er); - pna.nextTick(cb, er); + process.nextTick(function() { + cb(er); + }); } -// Checks that a user-supplied chunk is valid, especially for the particular -// mode the stream is in. Currently this means that `null` is never accepted -// and undefined/non-string values are only allowed in object mode. +// If we get something that is not a buffer, string, null, or undefined, +// and we're not in objectMode, then that's an error. +// Otherwise stream chunks are all considered to be of length=1, and the +// watermarks determine how many objects to keep in the buffer, rather than +// how many bytes or characters. function validChunk(stream, state, chunk, cb) { var valid = true; - var er = false; - - if (chunk === null) { - er = new TypeError('May not write null values to stream'); - } else if (typeof chunk !== 'string' && chunk !== undefined && !state.objectMode) { - er = new TypeError('Invalid non-string/buffer chunk'); - } - if (er) { + if (!util.isBuffer(chunk) && + !util.isString(chunk) && + !util.isNullOrUndefined(chunk) && + !state.objectMode) { + var er = new TypeError('Invalid non-string/buffer chunk'); stream.emit('error', er); - pna.nextTick(cb, er); + process.nextTick(function() { + cb(er); + }); valid = false; } return valid; } -Writable.prototype.write = function (chunk, encoding, cb) { +Writable.prototype.write = function(chunk, encoding, cb) { var state = this._writableState; var ret = false; - var isBuf = !state.objectMode && _isUint8Array(chunk); - - if (isBuf && !Buffer.isBuffer(chunk)) { - chunk = _uint8ArrayToBuffer(chunk); - } - if (typeof encoding === 'function') { + if (util.isFunction(encoding)) { cb = encoding; encoding = null; } - if (isBuf) encoding = 'buffer';else if (!encoding) encoding = state.defaultEncoding; + if (util.isBuffer(chunk)) + encoding = 'buffer'; + else if (!encoding) + encoding = state.defaultEncoding; - if (typeof cb !== 'function') cb = nop; + if (!util.isFunction(cb)) + cb = function() {}; - if (state.ended) writeAfterEnd(this, cb);else if (isBuf || validChunk(this, state, chunk, cb)) { + if (state.ended) + writeAfterEnd(this, state, cb); + else if (validChunk(this, state, chunk, cb)) { state.pendingcb++; - ret = writeOrBuffer(this, state, isBuf, chunk, encoding, cb); + ret = writeOrBuffer(this, state, chunk, encoding, cb); } return ret; }; -Writable.prototype.cork = function () { +Writable.prototype.cork = function() { var state = this._writableState; state.corked++; }; -Writable.prototype.uncork = function () { +Writable.prototype.uncork = function() { var state = this._writableState; if (state.corked) { state.corked--; - if (!state.writing && !state.corked && !state.finished && !state.bufferProcessing && state.bufferedRequest) clearBuffer(this, state); + if (!state.writing && + !state.corked && + !state.finished && + !state.bufferProcessing && + state.buffer.length) + clearBuffer(this, state); } }; -Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) { - // node::ParseEncoding() requires lower case. - if (typeof encoding === 'string') encoding = encoding.toLowerCase(); - if (!(['hex', 'utf8', 'utf-8', 'ascii', 'binary', 'base64', 'ucs2', 'ucs-2', 'utf16le', 'utf-16le', 'raw'].indexOf((encoding + '').toLowerCase()) > -1)) throw new TypeError('Unknown encoding: ' + encoding); - this._writableState.defaultEncoding = encoding; - return this; -}; - function decodeChunk(state, chunk, encoding) { - if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') { - chunk = Buffer.from(chunk, encoding); + if (!state.objectMode && + state.decodeStrings !== false && + util.isString(chunk)) { + chunk = new Buffer(chunk, encoding); } return chunk; } -Object.defineProperty(Writable.prototype, 'writableHighWaterMark', { - // making it explicit this property is not enumerable - // because otherwise some prototype manipulation in - // userland will fail - enumerable: false, - get: function () { - return this._writableState.highWaterMark; - } -}); - // if we're already writing something, then just put this // in the queue, and wait our turn. Otherwise, call _write // If we return false, then we need a drain event, so set that flag. -function writeOrBuffer(stream, state, isBuf, chunk, encoding, cb) { - if (!isBuf) { - var newChunk = decodeChunk(state, chunk, encoding); - if (chunk !== newChunk) { - isBuf = true; - encoding = 'buffer'; - chunk = newChunk; - } - } +function writeOrBuffer(stream, state, chunk, encoding, cb) { + chunk = decodeChunk(state, chunk, encoding); + if (util.isBuffer(chunk)) + encoding = 'buffer'; var len = state.objectMode ? 1 : chunk.length; state.length += len; var ret = state.length < state.highWaterMark; // we must ensure that previous needDrain will not be reset to false. - if (!ret) state.needDrain = true; - - if (state.writing || state.corked) { - var last = state.lastBufferedRequest; - state.lastBufferedRequest = { - chunk: chunk, - encoding: encoding, - isBuf: isBuf, - callback: cb, - next: null - }; - if (last) { - last.next = state.lastBufferedRequest; - } else { - state.bufferedRequest = state.lastBufferedRequest; - } - state.bufferedRequestCount += 1; - } else { + if (!ret) + state.needDrain = true; + + if (state.writing || state.corked) + state.buffer.push(new WriteReq(chunk, encoding, cb)); + else doWrite(stream, state, false, len, chunk, encoding, cb); - } return ret; } @@ -425,32 +273,26 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) { state.writecb = cb; state.writing = true; state.sync = true; - if (writev) stream._writev(chunk, state.onwrite);else stream._write(chunk, encoding, state.onwrite); + if (writev) + stream._writev(chunk, state.onwrite); + else + stream._write(chunk, encoding, state.onwrite); state.sync = false; } function onwriteError(stream, state, sync, er, cb) { - --state.pendingcb; - - if (sync) { - // defer the callback if we are being called synchronously - // to avoid piling up things on the stack - pna.nextTick(cb, er); - // this can emit finish, and it will always happen - // after error - pna.nextTick(finishMaybe, stream, state); - stream._writableState.errorEmitted = true; - stream.emit('error', er); - } else { - // the caller expect this to happen before if - // it is async + if (sync) + process.nextTick(function() { + state.pendingcb--; + cb(er); + }); + else { + state.pendingcb--; cb(er); - stream._writableState.errorEmitted = true; - stream.emit('error', er); - // this can emit finish, but finish must - // always follow error - finishMaybe(stream, state); } + + stream._writableState.errorEmitted = true; + stream.emit('error', er); } function onwriteStateUpdate(state) { @@ -467,18 +309,23 @@ function onwrite(stream, er) { onwriteStateUpdate(state); - if (er) onwriteError(stream, state, sync, er, cb);else { + if (er) + onwriteError(stream, state, sync, er, cb); + else { // Check if we're actually ready to finish, but don't emit yet - var finished = needFinish(state); + var finished = needFinish(stream, state); - if (!finished && !state.corked && !state.bufferProcessing && state.bufferedRequest) { + if (!finished && + !state.corked && + !state.bufferProcessing && + state.buffer.length) { clearBuffer(stream, state); } if (sync) { - /**/ - asyncWrite(afterWrite, stream, state, finished, cb); - /**/ + process.nextTick(function() { + afterWrite(stream, state, finished, cb); + }); } else { afterWrite(stream, state, finished, cb); } @@ -486,7 +333,8 @@ function onwrite(stream, er) { } function afterWrite(stream, state, finished, cb) { - if (!finished) onwriteDrain(stream, state); + if (!finished) + onwriteDrain(stream, state); state.pendingcb--; cb(); finishMaybe(stream, state); @@ -502,87 +350,80 @@ function onwriteDrain(stream, state) { } } + // if there's something in the buffer waiting, then process it function clearBuffer(stream, state) { state.bufferProcessing = true; - var entry = state.bufferedRequest; - if (stream._writev && entry && entry.next) { + if (stream._writev && state.buffer.length > 1) { // Fast case, write everything using _writev() - var l = state.bufferedRequestCount; - var buffer = new Array(l); - var holder = state.corkedRequestsFree; - holder.entry = entry; - - var count = 0; - var allBuffers = true; - while (entry) { - buffer[count] = entry; - if (!entry.isBuf) allBuffers = false; - entry = entry.next; - count += 1; - } - buffer.allBuffers = allBuffers; - - doWrite(stream, state, true, state.length, buffer, '', holder.finish); + var cbs = []; + for (var c = 0; c < state.buffer.length; c++) + cbs.push(state.buffer[c].callback); - // doWrite is almost always async, defer these to save a bit of time - // as the hot path ends with doWrite + // count the one we are adding, as well. + // TODO(isaacs) clean this up state.pendingcb++; - state.lastBufferedRequest = null; - if (holder.next) { - state.corkedRequestsFree = holder.next; - holder.next = null; - } else { - state.corkedRequestsFree = new CorkedRequest(state); - } - state.bufferedRequestCount = 0; + doWrite(stream, state, true, state.length, state.buffer, '', function(err) { + for (var i = 0; i < cbs.length; i++) { + state.pendingcb--; + cbs[i](err); + } + }); + + // Clear buffer + state.buffer = []; } else { // Slow case, write chunks one-by-one - while (entry) { + for (var c = 0; c < state.buffer.length; c++) { + var entry = state.buffer[c]; var chunk = entry.chunk; var encoding = entry.encoding; var cb = entry.callback; var len = state.objectMode ? 1 : chunk.length; doWrite(stream, state, false, len, chunk, encoding, cb); - entry = entry.next; - state.bufferedRequestCount--; + // if we didn't call the onwrite immediately, then // it means that we need to wait until it does. // also, that means that the chunk and cb are currently // being processed, so move the buffer counter past them. if (state.writing) { + c++; break; } } - if (entry === null) state.lastBufferedRequest = null; + if (c < state.buffer.length) + state.buffer = state.buffer.slice(c); + else + state.buffer.length = 0; } - state.bufferedRequest = entry; state.bufferProcessing = false; } -Writable.prototype._write = function (chunk, encoding, cb) { - cb(new Error('_write() is not implemented')); +Writable.prototype._write = function(chunk, encoding, cb) { + cb(new Error('not implemented')); + }; Writable.prototype._writev = null; -Writable.prototype.end = function (chunk, encoding, cb) { +Writable.prototype.end = function(chunk, encoding, cb) { var state = this._writableState; - if (typeof chunk === 'function') { + if (util.isFunction(chunk)) { cb = chunk; chunk = null; encoding = null; - } else if (typeof encoding === 'function') { + } else if (util.isFunction(encoding)) { cb = encoding; encoding = null; } - if (chunk !== null && chunk !== undefined) this.write(chunk, encoding); + if (!util.isNullOrUndefined(chunk)) + this.write(chunk, encoding); // .end() fully uncorks if (state.corked) { @@ -591,44 +432,34 @@ Writable.prototype.end = function (chunk, encoding, cb) { } // ignore unnecessary end() calls. - if (!state.ending && !state.finished) endWritable(this, state, cb); + if (!state.ending && !state.finished) + endWritable(this, state, cb); }; -function needFinish(state) { - return state.ending && state.length === 0 && state.bufferedRequest === null && !state.finished && !state.writing; + +function needFinish(stream, state) { + return (state.ending && + state.length === 0 && + !state.finished && + !state.writing); } -function callFinal(stream, state) { - stream._final(function (err) { - state.pendingcb--; - if (err) { - stream.emit('error', err); - } + +function prefinish(stream, state) { + if (!state.prefinished) { state.prefinished = true; stream.emit('prefinish'); - finishMaybe(stream, state); - }); -} -function prefinish(stream, state) { - if (!state.prefinished && !state.finalCalled) { - if (typeof stream._final === 'function') { - state.pendingcb++; - state.finalCalled = true; - pna.nextTick(callFinal, stream, state); - } else { - state.prefinished = true; - stream.emit('prefinish'); - } } } function finishMaybe(stream, state) { - var need = needFinish(state); + var need = needFinish(stream, state); if (need) { - prefinish(stream, state); if (state.pendingcb === 0) { + prefinish(stream, state); state.finished = true; stream.emit('finish'); - } + } else + prefinish(stream, state); } return need; } @@ -637,51 +468,10 @@ function endWritable(stream, state, cb) { state.ending = true; finishMaybe(stream, state); if (cb) { - if (state.finished) pna.nextTick(cb);else stream.once('finish', cb); + if (state.finished) + process.nextTick(cb); + else + stream.once('finish', cb); } state.ended = true; - stream.writable = false; } - -function onCorkedFinish(corkReq, state, err) { - var entry = corkReq.entry; - corkReq.entry = null; - while (entry) { - var cb = entry.callback; - state.pendingcb--; - cb(err); - entry = entry.next; - } - if (state.corkedRequestsFree) { - state.corkedRequestsFree.next = corkReq; - } else { - state.corkedRequestsFree = corkReq; - } -} - -Object.defineProperty(Writable.prototype, 'destroyed', { - get: function () { - if (this._writableState === undefined) { - return false; - } - return this._writableState.destroyed; - }, - set: function (value) { - // we ignore the value if the stream - // has not been initialized yet - if (!this._writableState) { - return; - } - - // backward compatibility, the user is explicitly - // managing destroyed - this._writableState.destroyed = value; - } -}); - -Writable.prototype.destroy = destroyImpl.destroy; -Writable.prototype._undestroy = destroyImpl.undestroy; -Writable.prototype._destroy = function (err, cb) { - this.end(); - cb(err); -}; \ No newline at end of file diff --git a/node_modules/readable-stream/lib/internal/streams/BufferList.js b/node_modules/readable-stream/lib/internal/streams/BufferList.js deleted file mode 100644 index aefc68b..0000000 --- a/node_modules/readable-stream/lib/internal/streams/BufferList.js +++ /dev/null @@ -1,79 +0,0 @@ -'use strict'; - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -var Buffer = require('safe-buffer').Buffer; -var util = require('util'); - -function copyBuffer(src, target, offset) { - src.copy(target, offset); -} - -module.exports = function () { - function BufferList() { - _classCallCheck(this, BufferList); - - this.head = null; - this.tail = null; - this.length = 0; - } - - BufferList.prototype.push = function push(v) { - var entry = { data: v, next: null }; - if (this.length > 0) this.tail.next = entry;else this.head = entry; - this.tail = entry; - ++this.length; - }; - - BufferList.prototype.unshift = function unshift(v) { - var entry = { data: v, next: this.head }; - if (this.length === 0) this.tail = entry; - this.head = entry; - ++this.length; - }; - - BufferList.prototype.shift = function shift() { - if (this.length === 0) return; - var ret = this.head.data; - if (this.length === 1) this.head = this.tail = null;else this.head = this.head.next; - --this.length; - return ret; - }; - - BufferList.prototype.clear = function clear() { - this.head = this.tail = null; - this.length = 0; - }; - - BufferList.prototype.join = function join(s) { - if (this.length === 0) return ''; - var p = this.head; - var ret = '' + p.data; - while (p = p.next) { - ret += s + p.data; - }return ret; - }; - - BufferList.prototype.concat = function concat(n) { - if (this.length === 0) return Buffer.alloc(0); - if (this.length === 1) return this.head.data; - var ret = Buffer.allocUnsafe(n >>> 0); - var p = this.head; - var i = 0; - while (p) { - copyBuffer(p.data, ret, i); - i += p.data.length; - p = p.next; - } - return ret; - }; - - return BufferList; -}(); - -if (util && util.inspect && util.inspect.custom) { - module.exports.prototype[util.inspect.custom] = function () { - var obj = util.inspect({ length: this.length }); - return this.constructor.name + ' ' + obj; - }; -} \ No newline at end of file diff --git a/node_modules/readable-stream/lib/internal/streams/destroy.js b/node_modules/readable-stream/lib/internal/streams/destroy.js deleted file mode 100644 index 5a0a0d8..0000000 --- a/node_modules/readable-stream/lib/internal/streams/destroy.js +++ /dev/null @@ -1,74 +0,0 @@ -'use strict'; - -/**/ - -var pna = require('process-nextick-args'); -/**/ - -// undocumented cb() API, needed for core, not for public API -function destroy(err, cb) { - var _this = this; - - var readableDestroyed = this._readableState && this._readableState.destroyed; - var writableDestroyed = this._writableState && this._writableState.destroyed; - - if (readableDestroyed || writableDestroyed) { - if (cb) { - cb(err); - } else if (err && (!this._writableState || !this._writableState.errorEmitted)) { - pna.nextTick(emitErrorNT, this, err); - } - return this; - } - - // we set destroyed to true before firing error callbacks in order - // to make it re-entrance safe in case destroy() is called within callbacks - - if (this._readableState) { - this._readableState.destroyed = true; - } - - // if this is a duplex stream mark the writable part as destroyed as well - if (this._writableState) { - this._writableState.destroyed = true; - } - - this._destroy(err || null, function (err) { - if (!cb && err) { - pna.nextTick(emitErrorNT, _this, err); - if (_this._writableState) { - _this._writableState.errorEmitted = true; - } - } else if (cb) { - cb(err); - } - }); - - return this; -} - -function undestroy() { - if (this._readableState) { - this._readableState.destroyed = false; - this._readableState.reading = false; - this._readableState.ended = false; - this._readableState.endEmitted = false; - } - - if (this._writableState) { - this._writableState.destroyed = false; - this._writableState.ended = false; - this._writableState.ending = false; - this._writableState.finished = false; - this._writableState.errorEmitted = false; - } -} - -function emitErrorNT(self, err) { - self.emit('error', err); -} - -module.exports = { - destroy: destroy, - undestroy: undestroy -}; \ No newline at end of file diff --git a/node_modules/readable-stream/lib/internal/streams/stream-browser.js b/node_modules/readable-stream/lib/internal/streams/stream-browser.js deleted file mode 100644 index 9332a3f..0000000 --- a/node_modules/readable-stream/lib/internal/streams/stream-browser.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('events').EventEmitter; diff --git a/node_modules/readable-stream/lib/internal/streams/stream.js b/node_modules/readable-stream/lib/internal/streams/stream.js deleted file mode 100644 index ce2ad5b..0000000 --- a/node_modules/readable-stream/lib/internal/streams/stream.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('stream'); diff --git a/node_modules/readable-stream/package.json b/node_modules/readable-stream/package.json index 2afa6fb..0bb83ed 100644 --- a/node_modules/readable-stream/package.json +++ b/node_modules/readable-stream/package.json @@ -1,35 +1,23 @@ { "name": "readable-stream", - "version": "2.3.7", - "description": "Streams3, a user-land copy of the stream library from Node.js", + "version": "1.1.14", + "description": "Streams3, a user-land copy of the stream library from Node.js v0.11.x", "main": "readable.js", "dependencies": { "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "isarray": "0.0.1", + "string_decoder": "~0.10.x", + "inherits": "~2.0.1" }, "devDependencies": { - "assert": "^1.4.0", - "babel-polyfill": "^6.9.1", - "buffer": "^4.9.0", - "lolex": "^2.3.2", - "nyc": "^6.4.0", - "tap": "^0.7.0", - "tape": "^4.8.0" + "tap": "~0.2.6" }, "scripts": { - "test": "tap test/parallel/*.js test/ours/*.js && node test/verify-dependencies.js", - "ci": "tap test/parallel/*.js test/ours/*.js --tap | tee test.tap && node test/verify-dependencies.js", - "cover": "nyc npm test", - "report": "nyc report --reporter=lcov" + "test": "tap test/simple/*.js" }, "repository": { "type": "git", - "url": "git://github.com/nodejs/readable-stream" + "url": "git://github.com/isaacs/readable-stream" }, "keywords": [ "readable", @@ -37,16 +25,8 @@ "pipe" ], "browser": { - "util": false, - "./readable.js": "./readable-browser.js", - "./writable.js": "./writable-browser.js", - "./duplex.js": "./duplex-browser.js", - "./lib/internal/streams/stream.js": "./lib/internal/streams/stream-browser.js" - }, - "nyc": { - "include": [ - "lib/**.js" - ] + "util": false }, + "author": "Isaac Z. Schlueter (http://blog.izs.me/)", "license": "MIT" } diff --git a/node_modules/readable-stream/passthrough.js b/node_modules/readable-stream/passthrough.js index ffd791d..27e8d8a 100644 --- a/node_modules/readable-stream/passthrough.js +++ b/node_modules/readable-stream/passthrough.js @@ -1 +1 @@ -module.exports = require('./readable').PassThrough +module.exports = require("./lib/_stream_passthrough.js") diff --git a/node_modules/readable-stream/readable-browser.js b/node_modules/readable-stream/readable-browser.js deleted file mode 100644 index e503725..0000000 --- a/node_modules/readable-stream/readable-browser.js +++ /dev/null @@ -1,7 +0,0 @@ -exports = module.exports = require('./lib/_stream_readable.js'); -exports.Stream = exports; -exports.Readable = exports; -exports.Writable = require('./lib/_stream_writable.js'); -exports.Duplex = require('./lib/_stream_duplex.js'); -exports.Transform = require('./lib/_stream_transform.js'); -exports.PassThrough = require('./lib/_stream_passthrough.js'); diff --git a/node_modules/readable-stream/readable.js b/node_modules/readable-stream/readable.js index ec89ec5..2a8b5c6 100644 --- a/node_modules/readable-stream/readable.js +++ b/node_modules/readable-stream/readable.js @@ -1,19 +1,10 @@ -var Stream = require('stream'); -if (process.env.READABLE_STREAM === 'disable' && Stream) { - module.exports = Stream; - exports = module.exports = Stream.Readable; - exports.Readable = Stream.Readable; - exports.Writable = Stream.Writable; - exports.Duplex = Stream.Duplex; - exports.Transform = Stream.Transform; - exports.PassThrough = Stream.PassThrough; - exports.Stream = Stream; -} else { - exports = module.exports = require('./lib/_stream_readable.js'); - exports.Stream = Stream || exports; - exports.Readable = exports; - exports.Writable = require('./lib/_stream_writable.js'); - exports.Duplex = require('./lib/_stream_duplex.js'); - exports.Transform = require('./lib/_stream_transform.js'); - exports.PassThrough = require('./lib/_stream_passthrough.js'); +exports = module.exports = require('./lib/_stream_readable.js'); +exports.Stream = require('stream'); +exports.Readable = exports; +exports.Writable = require('./lib/_stream_writable.js'); +exports.Duplex = require('./lib/_stream_duplex.js'); +exports.Transform = require('./lib/_stream_transform.js'); +exports.PassThrough = require('./lib/_stream_passthrough.js'); +if (!process.browser && process.env.READABLE_STREAM === 'disable') { + module.exports = require('stream'); } diff --git a/node_modules/readable-stream/transform.js b/node_modules/readable-stream/transform.js index b1baba2..5d482f0 100644 --- a/node_modules/readable-stream/transform.js +++ b/node_modules/readable-stream/transform.js @@ -1 +1 @@ -module.exports = require('./readable').Transform +module.exports = require("./lib/_stream_transform.js") diff --git a/node_modules/readable-stream/writable-browser.js b/node_modules/readable-stream/writable-browser.js deleted file mode 100644 index ebdde6a..0000000 --- a/node_modules/readable-stream/writable-browser.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./lib/_stream_writable.js'); diff --git a/node_modules/readable-stream/writable.js b/node_modules/readable-stream/writable.js index 3211a6f..e1e9efd 100644 --- a/node_modules/readable-stream/writable.js +++ b/node_modules/readable-stream/writable.js @@ -1,8 +1 @@ -var Stream = require("stream") -var Writable = require("./lib/_stream_writable.js") - -if (process.env.READABLE_STREAM === 'disable') { - module.exports = Stream && Stream.Writable || Writable -} else { - module.exports = Writable -} +module.exports = require("./lib/_stream_writable.js") diff --git a/node_modules/string_decoder/.travis.yml b/node_modules/string_decoder/.travis.yml deleted file mode 100644 index 3347a72..0000000 --- a/node_modules/string_decoder/.travis.yml +++ /dev/null @@ -1,50 +0,0 @@ -sudo: false -language: node_js -before_install: - - npm install -g npm@2 - - test $NPM_LEGACY && npm install -g npm@latest-3 || npm install npm -g -notifications: - email: false -matrix: - fast_finish: true - include: - - node_js: '0.8' - env: - - TASK=test - - NPM_LEGACY=true - - node_js: '0.10' - env: - - TASK=test - - NPM_LEGACY=true - - node_js: '0.11' - env: - - TASK=test - - NPM_LEGACY=true - - node_js: '0.12' - env: - - TASK=test - - NPM_LEGACY=true - - node_js: 1 - env: - - TASK=test - - NPM_LEGACY=true - - node_js: 2 - env: - - TASK=test - - NPM_LEGACY=true - - node_js: 3 - env: - - TASK=test - - NPM_LEGACY=true - - node_js: 4 - env: TASK=test - - node_js: 5 - env: TASK=test - - node_js: 6 - env: TASK=test - - node_js: 7 - env: TASK=test - - node_js: 8 - env: TASK=test - - node_js: 9 - env: TASK=test diff --git a/node_modules/string_decoder/LICENSE b/node_modules/string_decoder/LICENSE index 778edb2..6de584a 100644 --- a/node_modules/string_decoder/LICENSE +++ b/node_modules/string_decoder/LICENSE @@ -1,48 +1,20 @@ -Node.js is licensed for use as follows: - -""" -Copyright Node.js contributors. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. -""" - -This license applies to parts of Node.js originating from the -https://github.com/joyent/node repository: - -""" -Copyright Joyent, Inc. and other Node contributors. All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. -""" - +Copyright Joyent, Inc. and other Node contributors. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/node_modules/string_decoder/README.md b/node_modules/string_decoder/README.md index 5fd5831..4d2aa00 100644 --- a/node_modules/string_decoder/README.md +++ b/node_modules/string_decoder/README.md @@ -1,47 +1,7 @@ -# string_decoder +**string_decoder.js** (`require('string_decoder')`) from Node.js core -***Node-core v8.9.4 string_decoder for userland*** +Copyright Joyent, Inc. and other Node contributors. See LICENCE file for details. +Version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. **Prefer the stable version over the unstable.** -[![NPM](https://nodei.co/npm/string_decoder.png?downloads=true&downloadRank=true)](https://nodei.co/npm/string_decoder/) -[![NPM](https://nodei.co/npm-dl/string_decoder.png?&months=6&height=3)](https://nodei.co/npm/string_decoder/) - - -```bash -npm install --save string_decoder -``` - -***Node-core string_decoder for userland*** - -This package is a mirror of the string_decoder implementation in Node-core. - -Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v8.9.4/docs/api/). - -As of version 1.0.0 **string_decoder** uses semantic versioning. - -## Previous versions - -Previous version numbers match the versions found in Node core, e.g. 0.10.24 matches Node 0.10.24, likewise 0.11.10 matches Node 0.11.10. - -## Update - -The *build/* directory contains a build script that will scrape the source from the [nodejs/node](https://github.com/nodejs/node) repo given a specific Node version. - -## Streams Working Group - -`string_decoder` is maintained by the Streams Working Group, which -oversees the development and maintenance of the Streams API within -Node.js. The responsibilities of the Streams Working Group include: - -* Addressing stream issues on the Node.js issue tracker. -* Authoring and editing stream documentation within the Node.js project. -* Reviewing changes to stream subclasses within the Node.js project. -* Redirecting changes to streams from the Node.js project to this - project. -* Assisting in the implementation of stream providers within Node.js. -* Recommending versions of `readable-stream` to be included in Node.js. -* Messaging about the future of streams to give the community advance - notice of changes. - -See [readable-stream](https://github.com/nodejs/readable-stream) for -more details. +The *build/* directory contains a build script that will scrape the source from the [joyent/node](https://github.com/joyent/node) repo given a specific Node version. \ No newline at end of file diff --git a/node_modules/string_decoder/lib/string_decoder.js b/node_modules/string_decoder/lib/string_decoder.js deleted file mode 100644 index 2e89e63..0000000 --- a/node_modules/string_decoder/lib/string_decoder.js +++ /dev/null @@ -1,296 +0,0 @@ -// Copyright Joyent, Inc. and other Node contributors. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to permit -// persons to whom the Software is furnished to do so, subject to the -// following conditions: -// -// The above copyright notice and this permission notice shall be included -// in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN -// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -// USE OR OTHER DEALINGS IN THE SOFTWARE. - -'use strict'; - -/**/ - -var Buffer = require('safe-buffer').Buffer; -/**/ - -var isEncoding = Buffer.isEncoding || function (encoding) { - encoding = '' + encoding; - switch (encoding && encoding.toLowerCase()) { - case 'hex':case 'utf8':case 'utf-8':case 'ascii':case 'binary':case 'base64':case 'ucs2':case 'ucs-2':case 'utf16le':case 'utf-16le':case 'raw': - return true; - default: - return false; - } -}; - -function _normalizeEncoding(enc) { - if (!enc) return 'utf8'; - var retried; - while (true) { - switch (enc) { - case 'utf8': - case 'utf-8': - return 'utf8'; - case 'ucs2': - case 'ucs-2': - case 'utf16le': - case 'utf-16le': - return 'utf16le'; - case 'latin1': - case 'binary': - return 'latin1'; - case 'base64': - case 'ascii': - case 'hex': - return enc; - default: - if (retried) return; // undefined - enc = ('' + enc).toLowerCase(); - retried = true; - } - } -}; - -// Do not cache `Buffer.isEncoding` when checking encoding names as some -// modules monkey-patch it to support additional encodings -function normalizeEncoding(enc) { - var nenc = _normalizeEncoding(enc); - if (typeof nenc !== 'string' && (Buffer.isEncoding === isEncoding || !isEncoding(enc))) throw new Error('Unknown encoding: ' + enc); - return nenc || enc; -} - -// StringDecoder provides an interface for efficiently splitting a series of -// buffers into a series of JS strings without breaking apart multi-byte -// characters. -exports.StringDecoder = StringDecoder; -function StringDecoder(encoding) { - this.encoding = normalizeEncoding(encoding); - var nb; - switch (this.encoding) { - case 'utf16le': - this.text = utf16Text; - this.end = utf16End; - nb = 4; - break; - case 'utf8': - this.fillLast = utf8FillLast; - nb = 4; - break; - case 'base64': - this.text = base64Text; - this.end = base64End; - nb = 3; - break; - default: - this.write = simpleWrite; - this.end = simpleEnd; - return; - } - this.lastNeed = 0; - this.lastTotal = 0; - this.lastChar = Buffer.allocUnsafe(nb); -} - -StringDecoder.prototype.write = function (buf) { - if (buf.length === 0) return ''; - var r; - var i; - if (this.lastNeed) { - r = this.fillLast(buf); - if (r === undefined) return ''; - i = this.lastNeed; - this.lastNeed = 0; - } else { - i = 0; - } - if (i < buf.length) return r ? r + this.text(buf, i) : this.text(buf, i); - return r || ''; -}; - -StringDecoder.prototype.end = utf8End; - -// Returns only complete characters in a Buffer -StringDecoder.prototype.text = utf8Text; - -// Attempts to complete a partial non-UTF-8 character using bytes from a Buffer -StringDecoder.prototype.fillLast = function (buf) { - if (this.lastNeed <= buf.length) { - buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, this.lastNeed); - return this.lastChar.toString(this.encoding, 0, this.lastTotal); - } - buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, buf.length); - this.lastNeed -= buf.length; -}; - -// Checks the type of a UTF-8 byte, whether it's ASCII, a leading byte, or a -// continuation byte. If an invalid byte is detected, -2 is returned. -function utf8CheckByte(byte) { - if (byte <= 0x7F) return 0;else if (byte >> 5 === 0x06) return 2;else if (byte >> 4 === 0x0E) return 3;else if (byte >> 3 === 0x1E) return 4; - return byte >> 6 === 0x02 ? -1 : -2; -} - -// Checks at most 3 bytes at the end of a Buffer in order to detect an -// incomplete multi-byte UTF-8 character. The total number of bytes (2, 3, or 4) -// needed to complete the UTF-8 character (if applicable) are returned. -function utf8CheckIncomplete(self, buf, i) { - var j = buf.length - 1; - if (j < i) return 0; - var nb = utf8CheckByte(buf[j]); - if (nb >= 0) { - if (nb > 0) self.lastNeed = nb - 1; - return nb; - } - if (--j < i || nb === -2) return 0; - nb = utf8CheckByte(buf[j]); - if (nb >= 0) { - if (nb > 0) self.lastNeed = nb - 2; - return nb; - } - if (--j < i || nb === -2) return 0; - nb = utf8CheckByte(buf[j]); - if (nb >= 0) { - if (nb > 0) { - if (nb === 2) nb = 0;else self.lastNeed = nb - 3; - } - return nb; - } - return 0; -} - -// Validates as many continuation bytes for a multi-byte UTF-8 character as -// needed or are available. If we see a non-continuation byte where we expect -// one, we "replace" the validated continuation bytes we've seen so far with -// a single UTF-8 replacement character ('\ufffd'), to match v8's UTF-8 decoding -// behavior. The continuation byte check is included three times in the case -// where all of the continuation bytes for a character exist in the same buffer. -// It is also done this way as a slight performance increase instead of using a -// loop. -function utf8CheckExtraBytes(self, buf, p) { - if ((buf[0] & 0xC0) !== 0x80) { - self.lastNeed = 0; - return '\ufffd'; - } - if (self.lastNeed > 1 && buf.length > 1) { - if ((buf[1] & 0xC0) !== 0x80) { - self.lastNeed = 1; - return '\ufffd'; - } - if (self.lastNeed > 2 && buf.length > 2) { - if ((buf[2] & 0xC0) !== 0x80) { - self.lastNeed = 2; - return '\ufffd'; - } - } - } -} - -// Attempts to complete a multi-byte UTF-8 character using bytes from a Buffer. -function utf8FillLast(buf) { - var p = this.lastTotal - this.lastNeed; - var r = utf8CheckExtraBytes(this, buf, p); - if (r !== undefined) return r; - if (this.lastNeed <= buf.length) { - buf.copy(this.lastChar, p, 0, this.lastNeed); - return this.lastChar.toString(this.encoding, 0, this.lastTotal); - } - buf.copy(this.lastChar, p, 0, buf.length); - this.lastNeed -= buf.length; -} - -// Returns all complete UTF-8 characters in a Buffer. If the Buffer ended on a -// partial character, the character's bytes are buffered until the required -// number of bytes are available. -function utf8Text(buf, i) { - var total = utf8CheckIncomplete(this, buf, i); - if (!this.lastNeed) return buf.toString('utf8', i); - this.lastTotal = total; - var end = buf.length - (total - this.lastNeed); - buf.copy(this.lastChar, 0, end); - return buf.toString('utf8', i, end); -} - -// For UTF-8, a replacement character is added when ending on a partial -// character. -function utf8End(buf) { - var r = buf && buf.length ? this.write(buf) : ''; - if (this.lastNeed) return r + '\ufffd'; - return r; -} - -// UTF-16LE typically needs two bytes per character, but even if we have an even -// number of bytes available, we need to check if we end on a leading/high -// surrogate. In that case, we need to wait for the next two bytes in order to -// decode the last character properly. -function utf16Text(buf, i) { - if ((buf.length - i) % 2 === 0) { - var r = buf.toString('utf16le', i); - if (r) { - var c = r.charCodeAt(r.length - 1); - if (c >= 0xD800 && c <= 0xDBFF) { - this.lastNeed = 2; - this.lastTotal = 4; - this.lastChar[0] = buf[buf.length - 2]; - this.lastChar[1] = buf[buf.length - 1]; - return r.slice(0, -1); - } - } - return r; - } - this.lastNeed = 1; - this.lastTotal = 2; - this.lastChar[0] = buf[buf.length - 1]; - return buf.toString('utf16le', i, buf.length - 1); -} - -// For UTF-16LE we do not explicitly append special replacement characters if we -// end on a partial character, we simply let v8 handle that. -function utf16End(buf) { - var r = buf && buf.length ? this.write(buf) : ''; - if (this.lastNeed) { - var end = this.lastTotal - this.lastNeed; - return r + this.lastChar.toString('utf16le', 0, end); - } - return r; -} - -function base64Text(buf, i) { - var n = (buf.length - i) % 3; - if (n === 0) return buf.toString('base64', i); - this.lastNeed = 3 - n; - this.lastTotal = 3; - if (n === 1) { - this.lastChar[0] = buf[buf.length - 1]; - } else { - this.lastChar[0] = buf[buf.length - 2]; - this.lastChar[1] = buf[buf.length - 1]; - } - return buf.toString('base64', i, buf.length - n); -} - -function base64End(buf) { - var r = buf && buf.length ? this.write(buf) : ''; - if (this.lastNeed) return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed); - return r; -} - -// Pass bytes on through for single-byte encodings (e.g. ascii, latin1, hex) -function simpleWrite(buf) { - return buf.toString(this.encoding); -} - -function simpleEnd(buf) { - return buf && buf.length ? this.write(buf) : ''; -} \ No newline at end of file diff --git a/node_modules/string_decoder/package.json b/node_modules/string_decoder/package.json index 518c3eb..f2dd499 100644 --- a/node_modules/string_decoder/package.json +++ b/node_modules/string_decoder/package.json @@ -1,26 +1,20 @@ { "name": "string_decoder", - "version": "1.1.1", + "version": "0.10.31", "description": "The string_decoder module from Node core", - "main": "lib/string_decoder.js", - "dependencies": { - "safe-buffer": "~5.1.0" - }, + "main": "index.js", + "dependencies": {}, "devDependencies": { - "babel-polyfill": "^6.23.0", - "core-util-is": "^1.0.2", - "inherits": "^2.0.3", "tap": "~0.4.8" }, "scripts": { - "test": "tap test/parallel/*.js && node test/verify-dependencies", - "ci": "tap test/parallel/*.js test/ours/*.js --tap | tee test.tap && node test/verify-dependencies.js" + "test": "tap test/simple/*.js" }, "repository": { "type": "git", - "url": "git://github.com/nodejs/string_decoder.git" + "url": "git://github.com/rvagg/string_decoder.git" }, - "homepage": "https://github.com/nodejs/string_decoder", + "homepage": "https://github.com/rvagg/string_decoder", "keywords": [ "string", "decoder", diff --git a/package.json b/package.json index 45bac16..151a1d9 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,14 @@ }, "dependencies": { "@types/express": "^4.17.12", + "aws-sdk": "^2.943.0", "bcryptjs": "^2.4.3", "dotenv": "^10.0.0", "express": "^4.17.1", "express-validator": "^6.12.0", "mongoose": "^5.13.0", + "multer": "^1.4.2", + "multer-s3": "^2.9.0", "nodemon": "^2.0.12" } } diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 6aceacc..d79af35 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -140,6 +140,7 @@ module.exports = { if(findSecondPartChapter === null){ throw { statusCode : 400 } } + //전체 2부 목차 const tableContents = (await TableContents.find().populate({ path: "secondPartTableContents" diff --git a/yarn.lock b/yarn.lock index 3330b68..b781658 100644 --- a/yarn.lock +++ b/yarn.lock @@ -156,6 +156,11 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +append-field@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/append-field/-/append-field-1.0.0.tgz#1e3440e915f0b1203d23748e78edd7b9b5b43e56" + integrity sha1-HjRA6RXwsSA9I3SOeO3XubW0PlY= + arg@^4.1.0: version "4.1.3" resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" @@ -166,11 +171,31 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= +aws-sdk@^2.943.0: + version "2.943.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.943.0.tgz#6bda506cc33f5e7ec14e58ca4847e9abbab05c13" + integrity sha512-1/WDupJrIB0SJEzIOf+UpqmG0AP5AXoDXhbW7CEujHerOd+/b5A1ubeHKGQJvBN4tAktgsvGpDiBRfB9MpJU5g== + dependencies: + 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" + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +base64-js@^1.0.2: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + bcryptjs@^2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" @@ -249,6 +274,23 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer@4.9.2: + version "4.9.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" + integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + +busboy@^0.2.11: + version "0.2.14" + resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.2.14.tgz#6c2a622efcf47c57bbbe1e2a9c37ad36c7925453" + integrity sha1-bCpiLvz0fFe7vh4qnDetNseSVFM= + dependencies: + dicer "0.2.5" + readable-stream "1.1.x" + bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" @@ -329,6 +371,16 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +concat-stream@^1.5.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -431,6 +483,14 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +dicer@0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f" + integrity sha1-WZbAhrszIYyBLAkL3cCc0S+stw8= + dependencies: + readable-stream "1.1.x" + streamsearch "0.1.2" + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -495,6 +555,11 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= +events@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= + express-validator@^6.12.0: version "6.12.0" resolved "https://registry.yarnpkg.com/express-validator/-/express-validator-6.12.0.tgz#a9cd49b3fe4c470abb615ae2e7dd111053c25f66" @@ -539,6 +604,11 @@ express@^4.17.1: utils-merge "1.0.1" vary "~1.1.2" +file-type@^3.3.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" + integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek= + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -639,6 +709,11 @@ has-yarn@^2.1.0: resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== +html-comment-regex@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" + integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== + http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" @@ -673,6 +748,16 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 3" +ieee754@1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== + +ieee754@^1.1.4: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -693,7 +778,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -inherits@2.0.4, inherits@~2.0.3: +inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -777,6 +862,13 @@ is-path-inside@^3.0.1: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-svg@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" + integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= + dependencies: + html-comment-regex "^1.1.0" + is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -787,11 +879,21 @@ is-yarn-global@^0.3.0: resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== -isarray@~1.0.0: +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + +isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +jmespath@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" + integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -816,6 +918,11 @@ latest-version@^5.0.0: dependencies: package-json "^6.3.0" +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" @@ -833,11 +940,6 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" -lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -892,11 +994,18 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0: +minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + mongodb@3.6.8: version "3.6.8" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.6.8.tgz#3e2632af81915b3ff99b7681121ca0895e8ed407" @@ -969,6 +1078,29 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +multer-s3@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/multer-s3/-/multer-s3-2.9.0.tgz#a946fd8c01c9726076f11949b84943259f8ca8c3" + integrity sha512-qLF8pCD5HhXLLd954q49B63x3bk6Fe0jqD3eM0FVcGtqhiSVuTrchEDAo0mnO5pc34cMuX/CVCCbPkGTjX2xUA== + dependencies: + file-type "^3.3.0" + is-svg "^2.1.0" + run-parallel "^1.1.6" + +multer@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.2.tgz#2f1f4d12dbaeeba74cb37e623f234bf4d3d2057a" + integrity sha512-xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg== + dependencies: + append-field "^1.0.0" + busboy "^0.2.11" + concat-stream "^1.5.2" + mkdirp "^0.5.1" + object-assign "^4.1.1" + on-finished "^2.3.0" + type-is "^1.6.4" + xtend "^4.0.0" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -1007,7 +1139,12 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== -on-finished@~2.3.0: +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +on-finished@^2.3.0, on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= @@ -1087,6 +1224,11 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + pupa@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" @@ -1099,6 +1241,16 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -1124,7 +1276,17 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -readable-stream@^2.3.5: +readable-stream@1.1.x: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + +readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -1170,6 +1332,13 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +run-parallel@^1.1.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -1192,6 +1361,16 @@ saslprep@^1.0.0: dependencies: sparse-bitfield "^3.0.3" +sax@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" + integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= + +sax@>=0.6.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -1283,6 +1462,11 @@ sparse-bitfield@^3.0.3: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= +streamsearch@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" + integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= + string-width@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -1301,6 +1485,11 @@ string-width@^4.0.0, string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -1391,7 +1580,7 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@~1.6.17, type-is@~1.6.18: +type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -1406,6 +1595,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + typescript@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" @@ -1456,6 +1650,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url@0.10.3: + version "0.10.3" + resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" + integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= + dependencies: + punycode "1.3.2" + querystring "0.2.0" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -1466,6 +1668,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +uuid@3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== + validator@^13.5.2: version "13.6.0" resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059" @@ -1503,6 +1710,24 @@ xdg-basedir@^4.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +xml2js@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== + dependencies: + sax ">=0.6.0" + xmlbuilder "~9.0.1" + +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +xtend@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From ad99e6f22365168813887cfebf611dd2c9a4575f Mon Sep 17 00:00:00 2001 From: sol Date: Mon, 12 Jul 2021 03:33:19 +0900 Subject: [PATCH 065/168] =?UTF-8?q?refactor=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=EB=B7=B0=20API=20fee?= =?UTF-8?q?lingList=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 10 +++++++--- src/dto/petDiary/PetDiaryPageResDto.ts | 27 ++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 4dfc3d2..7cc5d6c 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -6,7 +6,7 @@ import Pet from "../../models/pet/Pet" import { response } from "express" import PetDiary from "../../models/diary/PetDiary" import PetEmotions from "../../models/diary/PetEmotions" -import { PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" +import { FeelingListDto, PetDiaryPageResDto } from "../../dto/petDiary/PetDiaryPageResDto" import { TIMEOUT } from "dns" require("../../models/user/User") require("../../models/book/Book") @@ -95,9 +95,13 @@ module.exports = { try { const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 + // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { - petDiaryPageResDto.setFeelingList(findPetDiary.petEmotions[i]) - } + let feelingList=new FeelingListDto(findPetDiary.pets[i]) + feelingList.setFeeling(findPetDiary.petEmotions[i]) + petDiaryPageResDto.setFeelingList(feelingList) + } return petDiaryPageResDto } catch (err) { diff --git a/src/dto/petDiary/PetDiaryPageResDto.ts b/src/dto/petDiary/PetDiaryPageResDto.ts index 5c0461c..fa3fcc8 100644 --- a/src/dto/petDiary/PetDiaryPageResDto.ts +++ b/src/dto/petDiary/PetDiaryPageResDto.ts @@ -1,5 +1,6 @@ import { IPetDiary, IPetDiaryDocument } from "../../interfaces/diary/IPetDiary"; import { IPetEmotions } from "../../interfaces/diary/IPetEmotions"; +import { IPet } from "../../interfaces/pet/IPet"; require("../../models/user/User") require("../../models/book/Book") require("../../models/pet/Pet") @@ -17,8 +18,9 @@ export class PetDiaryPageResDto { date: null, contents: null, timeTogether: null, - kind: null, + // kind: null, feelingList: [] + //feeling,kind,img } @@ -33,12 +35,29 @@ export class PetDiaryPageResDto { this.petDiary.date = await dateMethod.toKoreanByFormatting(petDiary.date) this.petDiary.episode = petDiary.episode this.petDiary.contents = petDiary.contents - this.petDiary.kind = petDiary.pets[0].kind + // this.petDiary.kind = petDiary.pets[0].kind this.petDiary.timeTogether = await dateMethod.getElapsedDay(petDiary.pets[0].startDate) } - setFeelingList(emotion: IPetEmotions) { - this.petDiary.feelingList.push(emotion.feeling) + setFeelingList(feelingList:FeelingListDto) { + this.petDiary.feelingList.push(feelingList) } +} + +export class FeelingListDto{ + private feeling=null + private kind=null + private petImgs=null + constructor(pet:IPet){ + this.kind=pet.kind + this.petImgs=pet.imgs + } + setFeeling(emotion:IPetEmotions){ + this.feeling=emotion.feeling + } + + + + } export { } \ No newline at end of file From 766f111d7de05a815534e23f3aa19d98dc51a849 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 12 Jul 2021 13:56:29 +0900 Subject: [PATCH 066/168] feat : apply to s3 --- src/api/controller/petController.ts | 15 ++++++++++----- src/api/router/diary/index.ts | 10 ++++++++++ src/api/router/index.ts | 2 +- src/api/router/pet/index.ts | 3 +++ src/modules/multer.ts | 18 ++++++++++++++++++ 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/api/router/diary/index.ts create mode 100644 src/modules/multer.ts diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 7d0a615..f9c6abd 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -1,6 +1,6 @@ -const util = require('../../modules/util') -const responseMessage = require('../../modules/responseMessage') -const statusCode = require('../../modules/statusCode') +var util = require('../../modules/util') +var responseMessage = require('../../modules/responseMessage') +var statusCode = require('../../modules/statusCode') const petService = require('../service/petService') @@ -19,6 +19,11 @@ module.exports = { console.error(err) res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } + }, + setImages:async(req,res)=>{ + const imagesUrls = req.files.map(file=>file.location) + res.send({ + imagesUrls + }) } -} -export{}; \ No newline at end of file +} \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts new file mode 100644 index 0000000..1088853 --- /dev/null +++ b/src/api/router/diary/index.ts @@ -0,0 +1,10 @@ +var express = require('express') +var router = express.Router() +const diaryController = require('../../controller/diaryController') + +router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 +router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 +router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 +router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 +router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 +module.exports = router; \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index f0c95f2..63dd6f5 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -1,5 +1,5 @@ import express from "express" -const router = express.Router(); +var router = express.Router(); router.use('/user',require('./user'))//user router.use('/pet',require('./pet'))//pet diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index be06fd5..93da895 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -1,6 +1,9 @@ var express = require('express') var router = express.Router() var petController = require('../../controller/petController') +var upload = require('../../../modules/multer') router.post('/register',petController.registerPet) //register pet +router.post('/multer',upload.array('images',3),petController.setImages) + module.exports = router; \ No newline at end of file diff --git a/src/modules/multer.ts b/src/modules/multer.ts new file mode 100644 index 0000000..f44d2f4 --- /dev/null +++ b/src/modules/multer.ts @@ -0,0 +1,18 @@ +const multer = require('multer') +const multerS3 = require('multer-s3') +const aws = require('aws-sdk') +aws.config.loadFromPath(__dirname+'/../config/s3.json') + +const s3 = new aws.S3(); +var upload = multer({ + storage : multerS3({ + s3, + bucket : 'watcha', + acl : 'public-read', + key:function(req,file,cb){ + cb(null, 'images/origin/'+Date.now()+'.'+file.originalname.split('.').pop()) + } + }) +}) + +module.exports=upload \ No newline at end of file From f443d079e43298ef9e74383fa2521917df6e79a5 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 12 Jul 2021 14:04:57 +0900 Subject: [PATCH 067/168] refactor : setting config --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b7cd2a6..d5a7a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ yarn-debug.log* yarn-error.log* yarn.lock -.env \ No newline at end of file +.env + +src/config \ No newline at end of file From e99e4a0dfd50da6c662c084252e71e27cbce0cb6 Mon Sep 17 00:00:00 2001 From: sol Date: Mon, 12 Jul 2021 14:39:26 +0900 Subject: [PATCH 068/168] =?UTF-8?q?refactor:=202=EB=B6=80=20=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0=20=EC=9E=91=EC=84=B1=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 7cc5d6c..530345d 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -95,13 +95,13 @@ module.exports = { try { const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 - // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) - + // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { - let feelingList=new FeelingListDto(findPetDiary.pets[i]) + let feelingList = new FeelingListDto(findPetDiary.pets[i]) feelingList.setFeeling(findPetDiary.petEmotions[i]) petDiaryPageResDto.setFeelingList(feelingList) - } + } return petDiaryPageResDto } catch (err) { From ee0bb5a8ba4227b6b06f0936321247578016acc6 Mon Sep 17 00:00:00 2001 From: sol Date: Mon, 12 Jul 2021 14:40:12 +0900 Subject: [PATCH 069/168] =?UTF-8?q?refactor:=202=EB=B6=80=20=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0=20=EC=9E=91=EC=84=B1=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 5 +++++ src/api/router/index.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index cd2ed7a..876a927 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -71,5 +71,10 @@ module.exports = { } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } + }, + + addSecondPartDiary:async(req,res)=>{ + const } + } \ No newline at end of file diff --git a/src/api/router/index.ts b/src/api/router/index.ts index dafdc3f..009dfb5 100644 --- a/src/api/router/index.ts +++ b/src/api/router/index.ts @@ -4,7 +4,7 @@ const router = express.Router(); router.use('/user',require('./user'))//user router.use('/pet',require('./pet'))//pet router.use('/diary',require('./diary'));//1부 일기 -router.use('/rainbow', require('./rainbow')) //무지개\ +router.use('/rainbow', require('./rainbow')) //무지개 router.use('/calendar', require('./calendar')) //캘린더 router.use('/secondPart', require('./secondPart'))//2부 From 87841f9816edad922050476e212d5bbb336a7ac3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 12 Jul 2021 17:00:25 +0900 Subject: [PATCH 070/168] =?UTF-8?q?refacotr=20:=201=EB=B6=80=20=ED=99=88?= =?UTF-8?q?=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/firstPartService.ts | 25 ++++++------ .../mainPageDto/FirstPartMainPageResDto.ts | 40 +++++++++++++++++-- src/modules/responseMessage.ts | 7 ---- 3 files changed, 49 insertions(+), 23 deletions(-) diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index b89be40..04812b3 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -26,20 +26,19 @@ module.exports = { path: "pets" }).populate({ path: "book", - populate: { + populate: ({ path: "tableContents", - populate: { + populate: ({ path: "firstPartTableContents", - populate: { + populate: ({ path: "petDiary", populate: { path: "petEmotions" } - } - } - } + }) + }) + }) }) - console.log(findUser) let newBook=new Book() let newTableContents=new TableContents() @@ -58,20 +57,22 @@ module.exports = { } const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) - let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length + let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length-1 //console.log("#:",lastTableNumber) - console.log(firstPartMainPageResDto) const lastDiary = new DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]) - console.log("lastDiary:",lastDiary) //tableContents for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]) firstPartMainPageResDto.setTableContents(tableContentsResDto) } firstPartMainPageResDto.setDiary(lastDiary) - - return {firstPartMainPageResDto}; + + if(findUser.book.tableContents.secondPartTableContents.length > 1){ + firstPartMainPageResDto.setSecondPartBook(findUser) + } + + return firstPartMainPageResDto } catch (err) { console.log(err) diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 94b27d8..3a83aab 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -4,6 +4,7 @@ import { IPet } from "../../../interfaces/pet/IPet"; import { IBook } from "../../../interfaces/book/IBook"; import { IFirstPartTableContents } from "../../../interfaces/tableContents/IFirstPartTableContents"; import { ITableContents } from "../../../interfaces/tableContents/ITableContents"; +import { IUser } from "../../../interfaces/user/IUser"; const dateMethod=require('../../../modules/dateMethod') export class FirstPartMainPageResDto { @@ -11,7 +12,8 @@ export class FirstPartMainPageResDto { title: null, bookImg: null, diary: {}, - tableContents: null + tableContents: [], + secondPartBook : null } constructor(book: IBook) { @@ -26,9 +28,13 @@ export class FirstPartMainPageResDto { setTableContents(tableContents: TableContentsResDto) { this.firstPartMainPage.tableContents.push(tableContents) } + setSecondPartBook(user : IUser){ + this.firstPartMainPage.secondPartBook = new SecondPartBookResDto(user) + } } export class DiaryResDto { + private _id; private chapter; private episode; private title; @@ -37,11 +43,19 @@ export class DiaryResDto { //가장 마지막 화 들어감 constructor(firstPartTableContents: IFirstPartTableContents) { + this.init(firstPartTableContents) + } + + async init(firstPartTableContents: IFirstPartTableContents){ + console.log('!!!!!!!!!!!!!!! : '+firstPartTableContents) this.chapter = firstPartTableContents.chapter this.episode = firstPartTableContents.petDiary.length; - this.title = firstPartTableContents.petDiary[this.episode].title; - this.contents = firstPartTableContents.petDiary[this.episode].contents; - this.date = dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode].date); + console.log('@@@@@@@ : '+this.episode) + console.log('######## : '+firstPartTableContents.petDiary[this.episode-1]) + this._id = firstPartTableContents.petDiary[this.episode-1]._id + this.title = firstPartTableContents.petDiary[this.episode-1].title; + this.contents = firstPartTableContents.petDiary[this.episode-1].contents; + this.date = await dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode-1].date); } } @@ -57,4 +71,22 @@ export class TableContentsResDto { this.chapterName = firstPartTableContents.title; this.episodePerchapterCount = firstPartTableContents.petDiary.length; } +} + +export class SecondPartBookResDto{ + private userId + private imgs + private author + private date + + constructor(user : IUser){ + this.init(user) + } + + async init(user : IUser){ + this.userId = user._id + this.imgs = user.book.imgs + this.author = user.book.author + this.date = await dateMethod.toStringByFormatting(user.book.date) + } } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index 40f976c..6f5876e 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -29,15 +29,8 @@ module.exports = { SUCCESS_POST_CHAPTERLIST: "목차 리스트 추가 성공", SUCCESS_EDIT_CHAPTERLIST: "목차 리스트 수정 성공", SUCCESS_DELETE_CHAPTERLIST: "목차 리스트 삭제 성공", -<<<<<<< HEAD SUCCESS_REGISTER_PET: "반려동물 등록 성공", SUCCESS_GET_FIRSTPART_MAINPAGE:"1부 메인뷰 불러오기 성공", -======= - SUCCESS_GET_FIRSTPART_MAINPAGE:"1부 메인뷰 불러오기 성공", - - /* 반려동물 등록 (by 솔)*/ - SUCCESS_REGISTER_PET: "반려동물 등록 성공", ->>>>>>> 894b219148dee9b24ccb02d166565bb57e4cd639 /** 1.5부 무지개다리 (by 현종) */ SUCCESS_GET_RAINBOW_MAIN_PAGE : "무지개 메인뷰 불러오기 성공", From 0dfda4358f9049dd5244f4070a31cbf33bb71fcc Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Mon, 12 Jul 2021 17:13:56 +0900 Subject: [PATCH 071/168] =?UTF-8?q?refactor=20:=20s3=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/router/pet/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index 93da895..284ff1d 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -1,9 +1,7 @@ var express = require('express') var router = express.Router() var petController = require('../../controller/petController') -var upload = require('../../../modules/multer') router.post('/register',petController.registerPet) //register pet -router.post('/multer',upload.array('images',3),petController.setImages) module.exports = router; \ No newline at end of file From fa44c38b1e646f901246f8da8c186e876e2b533b Mon Sep 17 00:00:00 2001 From: sol Date: Mon, 12 Jul 2021 17:32:28 +0900 Subject: [PATCH 072/168] =?UTF-8?q?2=EB=B6=80=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 65 ++++++++++++++++++--- src/api/router/secondPart/index.ts | 5 +- src/api/service/secondPartService.ts | 23 ++++++++ src/dto/secondPart/SecondPartDiaryResDto.ts | 39 +++++++++++++ src/modules/responseMessage.ts | 1 + 5 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 src/dto/secondPart/SecondPartDiaryResDto.ts diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index 876a927..0418b05 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -59,22 +59,69 @@ module.exports = { } }, - deleteSecondPartChapter: async(req,res)=>{ - const {chapterId} = req.params - try{ + deleteSecondPartChapter: async (req, res) => { + const { chapterId } = req.params + try { await secondPartService.deleteSecondPartChapter(chapterId) return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) - }catch(err){ + } catch (err) { + console.error(err) + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + getSecondPartDiary: async (req, res) => { + const { diaryId } = req.params + try { + await secondPartService.getSecondPartDiary(diaryId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + } catch (err) { console.error(err) - if(err.statusCode === 400){ + if (err.statusCode === 400) { return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, - - addSecondPartDiary:async(req,res)=>{ - const + addSecondPartDiary: async (req, res) => { + const { userData } = req.body + try { + await secondPartService.addSecondPartDiary(userData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + } catch (err) { + console.error(err) + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + modifySecondPartDiary: async (req, res) => { + const { diaryId } = req.params.id + try { + await secondPartService.modifySecondPartDiary(diaryId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + } catch (err) { + console.error(err) + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } + }, + deleteSecondPartDiary: async (req, res) => { + const { diaryId } = req.params.id + try { + await secondPartService.getSecondPartDiary(diaryId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + } catch (err) { + console.error(err) + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) + } } - } \ No newline at end of file diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index b67b791..e7f48f3 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -8,5 +8,8 @@ router.get('/chapter/list', secondPartController.getSecondPartChapterList) router.post('/chapter', secondPartController.addSecondPartChapter) router.put('/chapter/:chapterId', secondPartController.modifySecondPartChapterInfo) router.delete('/chapter/:chapterId', secondPartController.deleteSecondPartChapter) - +router.get('/diary/user/:diaryId',secondPartController.getSecondPartDiary)//2부 일기 조회 +// router.post('/diary/user',secondPartController.addSecondPartDiary)//2부 일기 작성 +// router.put('/diary/user/:diaryId',secondPartController.modifySecondPartUserDiary)//2부 일기 수정 +// router.delete('/diary/user/:diaryId',secondPartController.deleteSecondPartDiary)//2부 일기 삭제 module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 6aceacc..cef5737 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -6,6 +6,7 @@ import Book from "../../models/book/Book" import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" import { SecondPartDiariesOfMonth, SecondPartDiariesOfMonthResDto } from "../../dto/secondPart/SecondPartDiariesOfMonthResDto" import { SecondPartChapterListResDto } from "../../dto/secondPart/SecondPartChapterListResDto" +import { SecondPartDiaryResDto } from "../../dto/secondPart/SecondPartDiaryResDto" import TableContents from "../../models/tableContents/TableContents" const dateMethod = require("../../modules/dateMethod") @@ -170,5 +171,27 @@ module.exports = { } catch (err) { throw err } + },getSecondPartDiary:async(diaryId)=>{ + try { + console.log(diaryId) + console.log(await UserDiary.findById(diaryId)) + const findSecondPartDiary = await UserDiary.findById(diaryId).populate('users').populate('tableContents'); + console.log(findSecondPartDiary) + let secondPartDiaryResDto = await new SecondPartDiaryResDto(findSecondPartDiary) + + return secondPartDiaryResDto + + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } + } + // ,addSecondPartDiary:async()=>{ + + // },modifySecondPartDiary:async(diaryId)=>{ + + // },deleteSecondPartDiary:async(diaryId)=>{ + + // } } \ No newline at end of file diff --git a/src/dto/secondPart/SecondPartDiaryResDto.ts b/src/dto/secondPart/SecondPartDiaryResDto.ts new file mode 100644 index 0000000..a5da8d7 --- /dev/null +++ b/src/dto/secondPart/SecondPartDiaryResDto.ts @@ -0,0 +1,39 @@ +import { IUserDiary, IUserDiaryDocument } from "../../interfaces/diary/IUserDiary"; +import { IPet } from "../../interfaces/pet/IPet"; +import UserDiary from "../../models/diary/UserDiary"; +require("../../models/user/User") +require("../../models/book/Book") +require("../../models/pet/Pet") +require('../../models/tableContents/TableContents') +require('../../models/tableContents/SecondPartTableContent') +const dateMethod = require('../../modules/dateMethod') + +export class SecondPartDiaryResDto { + public secondPartDiary = { + _id: null, + episode: null, + title: null, + diaryImg: [], + date: null, + contents: null, + feelingList: [] + } + + constructor(userDiary: IUserDiary) { + this.init(userDiary) + } + async init(userDiary: IUserDiary) { + this.secondPartDiary._id = userDiary._id + this.secondPartDiary.title = userDiary.title + this.secondPartDiary.diaryImg = userDiary.imgs + this.secondPartDiary.date = await dateMethod.toKoreanByFormatting(userDiary.date) + this.secondPartDiary.episode = userDiary.episode + this.secondPartDiary.contents = userDiary.contents + this.secondPartDiary.feelingList[0]={ + kind:0, + petImgs:null, + feeling:userDiary.feeling + } + } +} +export { } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index b2a75ee..cdca6c7 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -48,6 +48,7 @@ module.exports = { SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER: "2부 목차 수정 성공", SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER : "2부 목차 삭제 성공", FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS : "잘못된 2부 목차의 ID입니다.", + SUCCESS_GET_SECOND_PART_DIARY:"2부 일기 불러오기 성공", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 0edbc61e7ceb4d14ebcc310a3d3f64ad6b1583b3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 02:52:36 +0900 Subject: [PATCH 073/168] refactor : post PetDiary images --- dist/api/controller/calendarController.js | 28 ++ dist/api/controller/calendarController.js.map | 1 + dist/api/controller/chapterController.js | 95 +++++ dist/api/controller/chapterController.js.map | 1 + dist/api/controller/diaryController.js | 92 +++++ dist/api/controller/diaryController.js.map | 1 + dist/api/controller/firstPartController.js | 29 ++ .../api/controller/firstPartController.js.map | 1 + dist/api/controller/petController.js | 32 ++ dist/api/controller/petController.js.map | 1 + dist/api/controller/rainbowController.js | 117 ++++++ dist/api/controller/rainbowController.js.map | 1 + dist/api/controller/secondPartController.js | 85 +++++ .../controller/secondPartController.js.map | 1 + dist/api/controller/userController.js | 51 +++ dist/api/controller/userController.js.map | 1 + dist/api/router/calendar/index.js | 6 + dist/api/router/calendar/index.js.map | 1 + dist/api/router/chapter/index.js | 12 + dist/api/router/chapter/index.js.map | 1 + dist/api/router/diary/index.js | 10 + dist/api/router/diary/index.js.map | 1 + dist/api/router/firstPart/index.js | 12 + dist/api/router/firstPart/index.js.map | 1 + dist/api/router/index.js | 17 + dist/api/router/index.js.map | 1 + dist/api/router/pet/index.js | 7 + dist/api/router/pet/index.js.map | 1 + dist/api/router/rainbow/index.js | 15 + dist/api/router/rainbow/index.js.map | 1 + dist/api/router/secondPart/index.js | 11 + dist/api/router/secondPart/index.js.map | 1 + dist/api/router/user/index.js | 9 + dist/api/router/user/index.js.map | 1 + dist/api/service/calendarService.js | 87 +++++ dist/api/service/calendarService.js.map | 1 + dist/api/service/chapterService.js | 138 +++++++ dist/api/service/chapterService.js.map | 1 + dist/api/service/diaryService.js | 166 ++++++++ dist/api/service/diaryService.js.map | 1 + dist/api/service/firstPartService.js | 88 +++++ dist/api/service/firstPartService.js.map | 1 + dist/api/service/petService.js | 57 +++ dist/api/service/petService.js.map | 1 + dist/api/service/rainbowService.js | 359 ++++++++++++++++++ dist/api/service/rainbowService.js.map | 1 + dist/api/service/secondPartService.js | 163 ++++++++ dist/api/service/secondPartService.js.map | 1 + dist/api/service/userService.js | 84 ++++ dist/api/service/userService.js.map | 1 + dist/config/index.js | 31 ++ dist/config/index.js.map | 1 + dist/config/s3.json | 5 + dist/dto/calendar/calendarResDto.js | 67 ++++ dist/dto/calendar/calendarResDto.js.map | 1 + .../mainPageDto/FirstPartMainPageResDto.js | 81 ++++ .../FirstPartMainPageResDto.js.map | 1 + dist/dto/petChapter/ChapterList.js | 30 ++ dist/dto/petChapter/ChapterList.js.map | 1 + dist/dto/petChapter/PetChapterDiary.js | 69 ++++ dist/dto/petChapter/PetChapterDiary.js.map | 1 + dist/dto/petDiary/PetDiaryPageResDto.js | 53 +++ dist/dto/petDiary/PetDiaryPageResDto.js.map | 1 + .../mainPageDto/RainbowMainPageResDto.js | 50 +++ .../mainPageDto/RainbowMainPageResDto.js.map | 1 + .../partingDto/PartingRainbowResDto.js | 13 + .../partingDto/PartingRainbowResDto.js.map | 1 + dist/dto/rainbow/petDto/PetNameResDto.js | 10 + dist/dto/rainbow/petDto/PetNameResDto.js.map | 1 + dist/dto/rainbow/petDto/RainbowPetResDto.js | 19 + .../rainbow/petDto/RainbowPetResDto.js.map | 1 + .../ReadyPartingAndStartRecordResDto.js | 24 ++ .../ReadyPartingAndStartRecordResDto.js.map | 1 + .../theBestMomentDto/TheBestMomentResDto.js | 67 ++++ .../TheBestMomentResDto.js.map | 1 + .../TheBestMomentSubResDto.js | 26 ++ .../TheBestMomentSubResDto.js.map | 1 + .../secondPart/SecondPartChapterListResDto.js | 22 ++ .../SecondPartChapterListResDto.js.map | 1 + .../SecondPartDiariesOfMonthResDto.js | 48 +++ .../SecondPartDiariesOfMonthResDto.js.map | 1 + .../secondPart/SecondPartMainPageResDto.js | 84 ++++ .../SecondPartMainPageResDto.js.map | 1 + dist/index.js | 35 ++ dist/index.js.map | 1 + dist/interfaces/book/IBook.js | 3 + dist/interfaces/book/IBook.js.map | 1 + dist/interfaces/diary/IPetDiary.js | 3 + dist/interfaces/diary/IPetDiary.js.map | 1 + dist/interfaces/diary/IPetEmotions.js | 3 + dist/interfaces/diary/IPetEmotions.js.map | 1 + dist/interfaces/diary/IUserDiary.js | 3 + dist/interfaces/diary/IUserDiary.js.map | 1 + dist/interfaces/etc/IComments.js | 3 + dist/interfaces/etc/IComments.js.map | 1 + dist/interfaces/etc/IHelp.js | 3 + dist/interfaces/etc/IHelp.js.map | 1 + dist/interfaces/etc/IInstitution.js | 3 + dist/interfaces/etc/IInstitution.js.map | 1 + dist/interfaces/pet/IPet.js | 3 + dist/interfaces/pet/IPet.js.map | 1 + .../tableContents/IFirstPartTableContents.js | 3 + .../IFirstPartTableContents.js.map | 1 + .../tableContents/ISecondPartTableContents.js | 3 + .../ISecondPartTableContents.js.map | 1 + .../tableContents/ITableContents.js | 3 + .../tableContents/ITableContents.js.map | 1 + dist/interfaces/user/IUser.js | 3 + dist/interfaces/user/IUser.js.map | 1 + dist/logger/db.js | 32 ++ dist/logger/db.js.map | 1 + dist/models/book/Book.js | 35 ++ dist/models/book/Book.js.map | 1 + dist/models/diary/PetDiary.js | 71 ++++ dist/models/diary/PetDiary.js.map | 1 + dist/models/diary/PetEmotions.js | 36 ++ dist/models/diary/PetEmotions.js.map | 1 + dist/models/diary/UserDiary.js | 45 +++ dist/models/diary/UserDiary.js.map | 1 + dist/models/etc/Comments.js | 13 + dist/models/etc/Comments.js.map | 1 + dist/models/etc/Help.js | 13 + dist/models/etc/Help.js.map | 1 + dist/models/etc/Institution.js | 14 + dist/models/etc/Institution.js.map | 1 + dist/models/pet/Pet.js | 50 +++ dist/models/pet/Pet.js.map | 1 + .../tableContents/FirstPartTableContents.js | 42 ++ .../FirstPartTableContents.js.map | 1 + .../tableContents/SecondPartTableContent.js | 43 +++ .../SecondPartTableContent.js.map | 1 + dist/models/tableContents/TableContents.js | 45 +++ .../models/tableContents/TableContents.js.map | 1 + dist/models/user/User.js | 42 ++ dist/models/user/User.js.map | 1 + dist/modules/dateMethod.js | 51 +++ dist/modules/dateMethod.js.map | 1 + dist/modules/multer.js | 17 + dist/modules/multer.js.map | 1 + dist/modules/responseMessage.js | 55 +++ dist/modules/responseMessage.js.map | 1 + dist/modules/statusCode.js | 14 + dist/modules/statusCode.js.map | 1 + dist/modules/swagger.js | 1 + dist/modules/swagger.js.map | 1 + dist/modules/util.js | 14 + dist/modules/util.js.map | 1 + src/api/controller/petController.ts | 10 +- src/api/router/pet/index.ts | 3 +- src/api/service/petService.ts | 5 +- 150 files changed, 3252 insertions(+), 12 deletions(-) create mode 100644 dist/api/controller/calendarController.js create mode 100644 dist/api/controller/calendarController.js.map create mode 100644 dist/api/controller/chapterController.js create mode 100644 dist/api/controller/chapterController.js.map create mode 100644 dist/api/controller/diaryController.js create mode 100644 dist/api/controller/diaryController.js.map create mode 100644 dist/api/controller/firstPartController.js create mode 100644 dist/api/controller/firstPartController.js.map create mode 100644 dist/api/controller/petController.js create mode 100644 dist/api/controller/petController.js.map create mode 100644 dist/api/controller/rainbowController.js create mode 100644 dist/api/controller/rainbowController.js.map create mode 100644 dist/api/controller/secondPartController.js create mode 100644 dist/api/controller/secondPartController.js.map create mode 100644 dist/api/controller/userController.js create mode 100644 dist/api/controller/userController.js.map create mode 100644 dist/api/router/calendar/index.js create mode 100644 dist/api/router/calendar/index.js.map create mode 100644 dist/api/router/chapter/index.js create mode 100644 dist/api/router/chapter/index.js.map create mode 100644 dist/api/router/diary/index.js create mode 100644 dist/api/router/diary/index.js.map create mode 100644 dist/api/router/firstPart/index.js create mode 100644 dist/api/router/firstPart/index.js.map create mode 100644 dist/api/router/index.js create mode 100644 dist/api/router/index.js.map create mode 100644 dist/api/router/pet/index.js create mode 100644 dist/api/router/pet/index.js.map create mode 100644 dist/api/router/rainbow/index.js create mode 100644 dist/api/router/rainbow/index.js.map create mode 100644 dist/api/router/secondPart/index.js create mode 100644 dist/api/router/secondPart/index.js.map create mode 100644 dist/api/router/user/index.js create mode 100644 dist/api/router/user/index.js.map create mode 100644 dist/api/service/calendarService.js create mode 100644 dist/api/service/calendarService.js.map create mode 100644 dist/api/service/chapterService.js create mode 100644 dist/api/service/chapterService.js.map create mode 100644 dist/api/service/diaryService.js create mode 100644 dist/api/service/diaryService.js.map create mode 100644 dist/api/service/firstPartService.js create mode 100644 dist/api/service/firstPartService.js.map create mode 100644 dist/api/service/petService.js create mode 100644 dist/api/service/petService.js.map create mode 100644 dist/api/service/rainbowService.js create mode 100644 dist/api/service/rainbowService.js.map create mode 100644 dist/api/service/secondPartService.js create mode 100644 dist/api/service/secondPartService.js.map create mode 100644 dist/api/service/userService.js create mode 100644 dist/api/service/userService.js.map create mode 100644 dist/config/index.js create mode 100644 dist/config/index.js.map create mode 100644 dist/config/s3.json create mode 100644 dist/dto/calendar/calendarResDto.js create mode 100644 dist/dto/calendar/calendarResDto.js.map create mode 100644 dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js create mode 100644 dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map create mode 100644 dist/dto/petChapter/ChapterList.js create mode 100644 dist/dto/petChapter/ChapterList.js.map create mode 100644 dist/dto/petChapter/PetChapterDiary.js create mode 100644 dist/dto/petChapter/PetChapterDiary.js.map create mode 100644 dist/dto/petDiary/PetDiaryPageResDto.js create mode 100644 dist/dto/petDiary/PetDiaryPageResDto.js.map create mode 100644 dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js create mode 100644 dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map create mode 100644 dist/dto/rainbow/partingDto/PartingRainbowResDto.js create mode 100644 dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map create mode 100644 dist/dto/rainbow/petDto/PetNameResDto.js create mode 100644 dist/dto/rainbow/petDto/PetNameResDto.js.map create mode 100644 dist/dto/rainbow/petDto/RainbowPetResDto.js create mode 100644 dist/dto/rainbow/petDto/RainbowPetResDto.js.map create mode 100644 dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js create mode 100644 dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map create mode 100644 dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js create mode 100644 dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map create mode 100644 dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js create mode 100644 dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js.map create mode 100644 dist/dto/secondPart/SecondPartChapterListResDto.js create mode 100644 dist/dto/secondPart/SecondPartChapterListResDto.js.map create mode 100644 dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js create mode 100644 dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map create mode 100644 dist/dto/secondPart/SecondPartMainPageResDto.js create mode 100644 dist/dto/secondPart/SecondPartMainPageResDto.js.map create mode 100644 dist/index.js create mode 100644 dist/index.js.map create mode 100644 dist/interfaces/book/IBook.js create mode 100644 dist/interfaces/book/IBook.js.map create mode 100644 dist/interfaces/diary/IPetDiary.js create mode 100644 dist/interfaces/diary/IPetDiary.js.map create mode 100644 dist/interfaces/diary/IPetEmotions.js create mode 100644 dist/interfaces/diary/IPetEmotions.js.map create mode 100644 dist/interfaces/diary/IUserDiary.js create mode 100644 dist/interfaces/diary/IUserDiary.js.map create mode 100644 dist/interfaces/etc/IComments.js create mode 100644 dist/interfaces/etc/IComments.js.map create mode 100644 dist/interfaces/etc/IHelp.js create mode 100644 dist/interfaces/etc/IHelp.js.map create mode 100644 dist/interfaces/etc/IInstitution.js create mode 100644 dist/interfaces/etc/IInstitution.js.map create mode 100644 dist/interfaces/pet/IPet.js create mode 100644 dist/interfaces/pet/IPet.js.map create mode 100644 dist/interfaces/tableContents/IFirstPartTableContents.js create mode 100644 dist/interfaces/tableContents/IFirstPartTableContents.js.map create mode 100644 dist/interfaces/tableContents/ISecondPartTableContents.js create mode 100644 dist/interfaces/tableContents/ISecondPartTableContents.js.map create mode 100644 dist/interfaces/tableContents/ITableContents.js create mode 100644 dist/interfaces/tableContents/ITableContents.js.map create mode 100644 dist/interfaces/user/IUser.js create mode 100644 dist/interfaces/user/IUser.js.map create mode 100644 dist/logger/db.js create mode 100644 dist/logger/db.js.map create mode 100644 dist/models/book/Book.js create mode 100644 dist/models/book/Book.js.map create mode 100644 dist/models/diary/PetDiary.js create mode 100644 dist/models/diary/PetDiary.js.map create mode 100644 dist/models/diary/PetEmotions.js create mode 100644 dist/models/diary/PetEmotions.js.map create mode 100644 dist/models/diary/UserDiary.js create mode 100644 dist/models/diary/UserDiary.js.map create mode 100644 dist/models/etc/Comments.js create mode 100644 dist/models/etc/Comments.js.map create mode 100644 dist/models/etc/Help.js create mode 100644 dist/models/etc/Help.js.map create mode 100644 dist/models/etc/Institution.js create mode 100644 dist/models/etc/Institution.js.map create mode 100644 dist/models/pet/Pet.js create mode 100644 dist/models/pet/Pet.js.map create mode 100644 dist/models/tableContents/FirstPartTableContents.js create mode 100644 dist/models/tableContents/FirstPartTableContents.js.map create mode 100644 dist/models/tableContents/SecondPartTableContent.js create mode 100644 dist/models/tableContents/SecondPartTableContent.js.map create mode 100644 dist/models/tableContents/TableContents.js create mode 100644 dist/models/tableContents/TableContents.js.map create mode 100644 dist/models/user/User.js create mode 100644 dist/models/user/User.js.map create mode 100644 dist/modules/dateMethod.js create mode 100644 dist/modules/dateMethod.js.map create mode 100644 dist/modules/multer.js create mode 100644 dist/modules/multer.js.map create mode 100644 dist/modules/responseMessage.js create mode 100644 dist/modules/responseMessage.js.map create mode 100644 dist/modules/statusCode.js create mode 100644 dist/modules/statusCode.js.map create mode 100644 dist/modules/swagger.js create mode 100644 dist/modules/swagger.js.map create mode 100644 dist/modules/util.js create mode 100644 dist/modules/util.js.map diff --git a/dist/api/controller/calendarController.js b/dist/api/controller/calendarController.js new file mode 100644 index 0000000..eefbb0a --- /dev/null +++ b/dist/api/controller/calendarController.js @@ -0,0 +1,28 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var util = require('../../modules/util'); +var responseMessage = require('../../modules/responseMessage'); +var statusCode = require('../../modules/statusCode'); +const calendarService = require('../service/calendarService'); +module.exports = { + getCalendar: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { year, month, part } = req.params; + try { + console.log(month + '+' + part); + const result = yield calendarService.getDiaryPerDate(year, month, part); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_MONTH_CALENDAR, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), +}; +//# sourceMappingURL=calendarController.js.map \ No newline at end of file diff --git a/dist/api/controller/calendarController.js.map b/dist/api/controller/calendarController.js.map new file mode 100644 index 0000000..c8a1478 --- /dev/null +++ b/dist/api/controller/calendarController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"calendarController.js","sourceRoot":"","sources":["../../../src/api/controller/calendarController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,eAAe,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAA;AAE7D,MAAM,CAAC,OAAO,GAAC;IACX,WAAW,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QACxB,MAAM,EAAC,IAAI,EAAC,KAAK,EAAC,IAAI,EAAC,GAAG,GAAG,CAAC,MAAM,CAAA;QACpC,IAAG;YACC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAE,GAAG,GAAC,IAAI,CAAC,CAAA;YAC5B,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,IAAI,EAAC,KAAK,EAAC,IAAI,CAAC,CAAA;YACrE,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,0BAA0B,EAAC,MAAM,CAAC,CAAC,CAAA;SACvH;QAAA,OAAM,GAAG,EAAC;YACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC/I;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/chapterController.js b/dist/api/controller/chapterController.js new file mode 100644 index 0000000..ef334a2 --- /dev/null +++ b/dist/api/controller/chapterController.js @@ -0,0 +1,95 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +const chapterService = require('../service/chapterService'); +module.exports = { + getChapterDiary: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const chapterId = req.params.id; //id를 뺴면 객체를 보내줌 + try { + const result = yield chapterService.getChapterDiary(chapterId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_CHAPTER_PETDIARY, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + getChapterList: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const userId = req.params.id; + try { + const result = yield chapterService.getChapterList(userId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_CHAPTERLIST, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + postChapterList: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const userId = req.params.id; + const chapterTitle = req.body.chapterTitle; + try { + const result = yield chapterService.postChapterList(userId, chapterTitle); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_CHAPTERLIST, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + putChapterList: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const chapterId = req.params.id; + const chapterTitle = req.body.chapterTitle; + try { + const result = yield chapterService.putChapterList(chapterId, chapterTitle); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_EDIT_CHAPTERLIST, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + deleteChapterList: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const chapterId = req.params.id; + try { + const result = yield chapterService.deleteChapterList(chapterId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_CHAPTERLIST, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }) +}; +//# sourceMappingURL=chapterController.js.map \ No newline at end of file diff --git a/dist/api/controller/chapterController.js.map b/dist/api/controller/chapterController.js.map new file mode 100644 index 0000000..9868e65 --- /dev/null +++ b/dist/api/controller/chapterController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"chapterController.js","sourceRoot":"","sources":["../../../src/api/controller/chapterController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/diaryController.js b/dist/api/controller/diaryController.js new file mode 100644 index 0000000..afc0bc1 --- /dev/null +++ b/dist/api/controller/diaryController.js @@ -0,0 +1,92 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var util = require('../../modules/util'); +var responseMessage = require('../../modules/responseMessage'); +var statusCode = require('../../modules/statusCode'); +var diaryService = require('../service/diaryService'); +module.exports = { + postPrologue: (req, res) => __awaiter(this, void 0, void 0, function* () { + const bookData = req.body; + try { + const result = yield diaryService.postPrologue(bookData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PROLOGUE, "")); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + postPetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { + const diaryData = req.body; + try { + const result = yield diaryService.postPetDiary(diaryData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PETDIARY, "")); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + getPetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petDiaryId = req.params.id; //id를 뺴면 객체를 보내줌 + try { + const result = yield diaryService.getPetDiary(petDiaryId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PETDIARY, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + putPetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petDiaryId = req.params.id; + const diaryData = req.body; + try { + const result = yield diaryService.putPetDiary(petDiaryId, diaryData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_PETDIARY, "")); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + deletePetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petDiaryId = req.params.id; + try { + const result = yield diaryService.deletePetDiary(petDiaryId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_PETDIARY, result)); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }) +}; +//# sourceMappingURL=diaryController.js.map \ No newline at end of file diff --git a/dist/api/controller/diaryController.js.map b/dist/api/controller/diaryController.js.map new file mode 100644 index 0000000..5d977e1 --- /dev/null +++ b/dist/api/controller/diaryController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/firstPartController.js b/dist/api/controller/firstPartController.js new file mode 100644 index 0000000..f905fd5 --- /dev/null +++ b/dist/api/controller/firstPartController.js @@ -0,0 +1,29 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +const firstPartService = require('../service/firstPartService'); +module.exports = { + mainPage: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { userId } = req.params; + try { + const result = yield firstPartService.getMainPage(userId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }) +}; +//# sourceMappingURL=firstPartController.js.map \ No newline at end of file diff --git a/dist/api/controller/firstPartController.js.map b/dist/api/controller/firstPartController.js.map new file mode 100644 index 0000000..0087540 --- /dev/null +++ b/dist/api/controller/firstPartController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"firstPartController.js","sourceRoot":"","sources":["../../../src/api/controller/firstPartController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,gBAAgB,GAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAG7D,MAAM,CAAC,OAAO,GAAG;IACb,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC9B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC,CAAA;SACrH;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC/I;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js new file mode 100644 index 0000000..f8d0107 --- /dev/null +++ b/dist/api/controller/petController.js @@ -0,0 +1,32 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var util = require('../../modules/util'); +var responseMessage = require('../../modules/responseMessage'); +var statusCode = require('../../modules/statusCode'); +const petService = require('../service/petService'); +module.exports = { + registerPet: (req, res) => __awaiter(this, void 0, void 0, function* () { + let reqData = req.body; + const images = req.files.map(img => img.location); + try { + yield petService.registerPet(reqData, images); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, "")); + } + catch (err) { + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error(err); + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), +}; +//# sourceMappingURL=petController.js.map \ No newline at end of file diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map new file mode 100644 index 0000000..a04343d --- /dev/null +++ b/dist/api/controller/petController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAC;QACrB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACjD,IAAI;YACA,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAC,MAAM,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAA;SACxG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/rainbowController.js b/dist/api/controller/rainbowController.js new file mode 100644 index 0000000..3b03054 --- /dev/null +++ b/dist/api/controller/rainbowController.js @@ -0,0 +1,117 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var util = require('../../modules/util'); +var responseMessage = require('../../modules/responseMessage'); +var statusCode = require('../../modules/statusCode'); +const rainbowService = require('../service/rainbowService'); +module.exports = { + mainPage: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId, petId } = req.params; + try { + const result = yield rainbowService.getMainPage(userId, petId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + selectRainbowPet: (req, res) => __awaiter(this, void 0, void 0, function* () { + try { + const result = yield rainbowService.selectPet(); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_PET, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + setRainbowPet: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petId = req.params.petId; + try { + const result = yield rainbowService.setPartingRainbowPet(petId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PET_COMMENT, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + cancelPartingPet: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petId = req.params.petId; + try { + yield rainbowService.cancelPartingPet(petId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_PARTING_PET)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + getReadyPartingPetComment: (req, res) => __awaiter(this, void 0, void 0, function* () { + const petId = req.params.petId; + try { + const result = yield rainbowService.getReadyPartingPetComment(petId); + return res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + theBestMoment: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId, petId } = req.params; + try { + const result = yield rainbowService.getTheBestMoment(userId, petId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_BEST_MOMENT, result, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + getPartingPetName: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { petId } = req.params; + try { + const result = yield rainbowService.getPartingPetName(petId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PARTING_PETNAME, result, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + postEpilogue: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId, petId } = req.params; + const data = req.body; + try { + yield rainbowService.postEpilogue(userId, data); + const result = yield rainbowService.getMainPage(userId, petId); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_EPILOGUE, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + theBestMomentSub: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId, petId } = req.params; + try { + const theBestMoment = yield rainbowService.getTheBestMoment(userId, petId); + const result = yield rainbowService.getTheBestMomentSub(petId, theBestMoment); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_SUB_PAGE, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }) +}; +//# sourceMappingURL=rainbowController.js.map \ No newline at end of file diff --git a/dist/api/controller/rainbowController.js.map b/dist/api/controller/rainbowController.js.map new file mode 100644 index 0000000..e9ccae1 --- /dev/null +++ b/dist/api/controller/rainbowController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"rainbowController.js","sourceRoot":"","sources":["../../../src/api/controller/rainbowController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/secondPartController.js b/dist/api/controller/secondPartController.js new file mode 100644 index 0000000..1aef08d --- /dev/null +++ b/dist/api/controller/secondPartController.js @@ -0,0 +1,85 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var util = require('../../modules/util'); +var responseMessage = require('../../modules/responseMessage'); +var statusCode = require('../../modules/statusCode'); +const secondPartService = require('../service/secondPartService'); +module.exports = { + getMainPage: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId } = req.params; + try { + const result = yield secondPartService.getMainPage(userId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_MAIN_PAGE, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + getDiaryOfTableContents: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { tableContentsId } = req.params; + try { + const result = yield secondPartService.getDiaryOfTableContents(tableContentsId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + getSecondPartChapterList: (req, res) => __awaiter(this, void 0, void 0, function* () { + try { + const result = yield secondPartService.getSecondPartChapterList(); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_CHAPTER_LIST, result)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + addSecondPartChapter: (req, res) => __awaiter(this, void 0, void 0, function* () { + const chapterData = req.body; + try { + yield secondPartService.addSecondPartChapter(chapterData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + modifySecondPartChapterInfo: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { chapterId } = req.params; + const modifyChapterData = req.body; + try { + yield secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER)); + } + catch (err) { + console.error(err); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + deleteSecondPartChapter: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { chapterId } = req.params; + try { + yield secondPartService.deleteSecondPartChapter(chapterId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)); + } + catch (err) { + console.error(err); + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)); + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }) +}; +//# sourceMappingURL=secondPartController.js.map \ No newline at end of file diff --git a/dist/api/controller/secondPartController.js.map b/dist/api/controller/secondPartController.js.map new file mode 100644 index 0000000..a14ab64 --- /dev/null +++ b/dist/api/controller/secondPartController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"secondPartController.js","sourceRoot":"","sources":["../../../src/api/controller/secondPartController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/userController.js b/dist/api/controller/userController.js new file mode 100644 index 0000000..9aacac2 --- /dev/null +++ b/dist/api/controller/userController.js @@ -0,0 +1,51 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +const userService = require('../service/userService'); +module.exports = { + //register user + register: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { email, password } = req.body; + try { + const result = yield userService.register(email, password); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS, result)); + } + catch (err) { + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error(err); + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }), + login: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { email, password } = req.body; + try { + const result = yield userService.login(email, password); + console.log('얘가나오면 안되는데 : ', result); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS)); + } + catch (err) { + console.log('bbbbb : ' + err.statusCode); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + console.error('!!!!!' + err); + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }) +}; +//# sourceMappingURL=userController.js.map \ No newline at end of file diff --git a/dist/api/controller/userController.js.map b/dist/api/controller/userController.js.map new file mode 100644 index 0000000..acb10a0 --- /dev/null +++ b/dist/api/controller/userController.js.map @@ -0,0 +1 @@ +{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACpC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAA;SAE/F;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/router/calendar/index.js b/dist/api/router/calendar/index.js new file mode 100644 index 0000000..7099c8b --- /dev/null +++ b/dist/api/router/calendar/index.js @@ -0,0 +1,6 @@ +var express = require('express'); +var router = express.Router(); +const calendarController = require('../../controller/calendarController'); +router.get('/:year/:month/:part', calendarController.getCalendar); //캘린더 +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/calendar/index.js.map b/dist/api/router/calendar/index.js.map new file mode 100644 index 0000000..a594c54 --- /dev/null +++ b/dist/api/router/calendar/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/calendar/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,MAAM,kBAAkB,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAA;AAEzE,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA,CAAA,KAAK;AAErE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAA"} \ No newline at end of file diff --git a/dist/api/router/chapter/index.js b/dist/api/router/chapter/index.js new file mode 100644 index 0000000..3a8a80c --- /dev/null +++ b/dist/api/router/chapter/index.js @@ -0,0 +1,12 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const express = require('express'); +const router = express.Router(); +const chapterController = require('../../controller/chapterController'); +router.get('/pet/:id', chapterController.getChapterDiary); //1부 목차별 일기 조회 +router.get('/:id', chapterController.getChapterList); //목차리스트 조회 +router.post('/:id', chapterController.postChapterList); //목차리스트 추가 +router.put('/:id', chapterController.putChapterList); //목차리스트 수정 +router.delete('/:id', chapterController.deleteChapterList); //목차리스트 삭제 +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/chapter/index.js.map b/dist/api/router/chapter/index.js.map new file mode 100644 index 0000000..e8b54d3 --- /dev/null +++ b/dist/api/router/chapter/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/chapter/index.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC/B,MAAM,iBAAiB,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAA;AAEvE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,iBAAiB,CAAC,eAAe,CAAC,CAAA,CAAC,cAAc;AACvE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA,CAAA,UAAU;AAC7D,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,iBAAiB,CAAC,eAAe,CAAC,CAAA,CAAA,UAAU;AAC/D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,iBAAiB,CAAC,cAAc,CAAC,CAAA,CAAA,UAAU;AAC7D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA,CAAA,UAAU;AACnE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/diary/index.js b/dist/api/router/diary/index.js new file mode 100644 index 0000000..f78ab36 --- /dev/null +++ b/dist/api/router/diary/index.js @@ -0,0 +1,10 @@ +var express = require('express'); +var router = express.Router(); +var diaryController = require('../../controller/diaryController'); +router.post('/prologue', diaryController.postPrologue); //1부 프롤로그 작성 +router.post('/pet', diaryController.postPetDiary); //반려동물 일기 작성 +router.get('/pet/:id', diaryController.getPetDiary); //반려동물 일기 상세 조회 +router.put('/pet/:id', diaryController.putPetDiary); //반려동물 일기 수정 +router.delete('/pet/:id', diaryController.deletePetDiary); //반려동물 일기 삭제 +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/diary/index.js.map b/dist/api/router/diary/index.js.map new file mode 100644 index 0000000..a8c692b --- /dev/null +++ b/dist/api/router/diary/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AAEjE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAClE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AAC5D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/firstPart/index.js b/dist/api/router/firstPart/index.js new file mode 100644 index 0000000..ff9318d --- /dev/null +++ b/dist/api/router/firstPart/index.js @@ -0,0 +1,12 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const express_1 = __importDefault(require("express")); +const router = express_1.default.Router(); +const firstPartController = require('../../controller/FirstPartController'); +//1부 메인페이지 불러오기 +router.get('/main/:userId', firstPartController.mainPage); +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/firstPart/index.js.map b/dist/api/router/firstPart/index.js.map new file mode 100644 index 0000000..6b128ac --- /dev/null +++ b/dist/api/router/firstPart/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/firstPart/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAC7B,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAA;AAC/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,sCAAsC,CAAC,CAAA;AAE3E,eAAe;AACf,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAA;AAEzD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/index.js b/dist/api/router/index.js new file mode 100644 index 0000000..56978b3 --- /dev/null +++ b/dist/api/router/index.js @@ -0,0 +1,17 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const express_1 = __importDefault(require("express")); +var router = express_1.default.Router(); +router.use('/user', require('./user')); //user +router.use('/pet', require('./pet')); //pet +router.use('/chapter', require('./chapter')); //1부 목차 +router.use('/diary', require('./diary')); //1부 일기 +router.use('/rainbow', require('./rainbow')); //무지개\ +router.use('/calendar', require('./calendar')); //캘린더 +router.use('/firstPart', require('./firstPart')); //1부 +router.use('/secondPart', require('./secondPart')); //2부 +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/index.js.map b/dist/api/router/index.js.map new file mode 100644 index 0000000..56a3724 --- /dev/null +++ b/dist/api/router/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/router/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAC7B,IAAI,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAE9B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA,CAAA,MAAM;AAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA,CAAA,KAAK;AACxC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA,OAAO;AACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA,OAAO;AAC/C,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA,CAAC,MAAM;AACnD,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA,CAAC,KAAK;AACpD,MAAM,CAAC,GAAG,CAAC,YAAY,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA,CAAC,IAAI;AACpD,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAA,CAAA,IAAI;AAEtD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js new file mode 100644 index 0000000..3269b31 --- /dev/null +++ b/dist/api/router/pet/index.js @@ -0,0 +1,7 @@ +var express = require('express'); +var router = express.Router(); +var petController = require('../../controller/petController'); +var upload = require('../../../modules/multer'); +router.post('/register', upload.array('images', 4), petController.registerPet); //register pet +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map new file mode 100644 index 0000000..74a5590 --- /dev/null +++ b/dist/api/router/pet/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAE1F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/rainbow/index.js b/dist/api/router/rainbow/index.js new file mode 100644 index 0000000..78b1372 --- /dev/null +++ b/dist/api/router/rainbow/index.js @@ -0,0 +1,15 @@ +var express = require('express'); +var router = express.Router(); +let rainbowController = require('../../controller/rainbowController'); +router.get('/main/:userId/:petId', rainbowController.mainPage); //1.5부 무지개 홈 화면 불러오기 +router.get('/pet', rainbowController.selectRainbowPet); //1.5부 무지개 반려동물 선택 화면 불러오기 +router.get('/pet/:petId', rainbowController.setRainbowPet); //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 +router.delete('/pet/:petId', rainbowController.cancelPartingPet); //1.5부 무지개 반려동물 떠나보내기 취소 +router.get('/record/:petId', rainbowController.getReadyPartingPetComment); //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 +router.get('/moment/:userId/:petId', rainbowController.theBestMoment); //1.5부 무지개 최고의 순간 +router.get('/parting/pet/:petId', rainbowController.getPartingPetName); //1.5부 반려동물 이름 반환 +router.post('/epilogue/:userId/:petId', rainbowController.postEpilogue); //1.5부 작가의 말 작성 +router.get('/moment/sub/:userId/:petId', rainbowController.theBestMomentSub); //1.5부 무지개 서브 홈 +module.exports = router; +//solve error TS2451 : Cannot redeclare block-scoped variable +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/rainbow/index.js.map b/dist/api/router/rainbow/index.js.map new file mode 100644 index 0000000..2b65121 --- /dev/null +++ b/dist/api/router/rainbow/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/rainbow/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,iBAAiB,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAA;AAErE,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA,CAAC,oBAAoB;AAClF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA,CAAG,0BAA0B;AAClF,MAAM,CAAC,GAAG,CAAC,aAAa,EAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA,CAAG,sCAAsC;AAClG,MAAM,CAAC,MAAM,CAAC,aAAa,EAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA,CAAC,wBAAwB;AACxF,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAA,CAAI,iCAAiC;AAC7G,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA,CAAI,iBAAiB;AACzF,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA,CAAG,iBAAiB;AACzF,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAC,iBAAiB,CAAC,YAAY,CAAC,CAAA,CAAE,eAAe;AACvF,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA,CAAC,eAAe;AAE3F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;AACxB,6DAA6D"} \ No newline at end of file diff --git a/dist/api/router/secondPart/index.js b/dist/api/router/secondPart/index.js new file mode 100644 index 0000000..431e10b --- /dev/null +++ b/dist/api/router/secondPart/index.js @@ -0,0 +1,11 @@ +var express = require('express'); +var router = express.Router(); +const secondPartController = require('../../controller/secondPartController'); +router.get('/main/:userId', secondPartController.getMainPage); +router.get('/chapter/user/:tableContentsId', secondPartController.getDiaryOfTableContents); +router.get('/chapter/list', secondPartController.getSecondPartChapterList); +router.post('/chapter', secondPartController.addSecondPartChapter); +router.put('/chapter/:chapterId', secondPartController.modifySecondPartChapterInfo); +router.delete('/chapter/:chapterId', secondPartController.deleteSecondPartChapter); +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/secondPart/index.js.map b/dist/api/router/secondPart/index.js.map new file mode 100644 index 0000000..d41fb65 --- /dev/null +++ b/dist/api/router/secondPart/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/secondPart/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,MAAM,oBAAoB,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAC7D,MAAM,CAAC,GAAG,CAAC,gCAAgC,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAC1F,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,CAAA;AAC1E,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,CAAA;AAClE,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,CAAA;AACnF,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAElF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAA"} \ No newline at end of file diff --git a/dist/api/router/user/index.js b/dist/api/router/user/index.js new file mode 100644 index 0000000..5703847 --- /dev/null +++ b/dist/api/router/user/index.js @@ -0,0 +1,9 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const express = require('express'); +const router = express.Router(); +const userController = require('../../controller/userController'); +router.post('/register', userController.register); //user register +router.post('/login', userController.login); //user login +module.exports = router; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/user/index.js.map b/dist/api/router/user/index.js.map new file mode 100644 index 0000000..3f3b973 --- /dev/null +++ b/dist/api/router/user/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/user/index.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAA;AAGjE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAA,CAAC,eAAe;AAChE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC,cAAc,CAAC,KAAK,CAAC,CAAA,CAAC,YAAY;AAEvD,MAAM,CAAC,OAAO,GAAC,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/calendarService.js b/dist/api/service/calendarService.js new file mode 100644 index 0000000..0966d36 --- /dev/null +++ b/dist/api/service/calendarService.js @@ -0,0 +1,87 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const PetDiary_1 = __importDefault(require("../../models/diary/PetDiary")); +const UserDiary_1 = __importDefault(require("../../models/diary/UserDiary")); +const calendarResDto_1 = require("../../dto/calendar/calendarResDto"); +const User_1 = __importDefault(require("../../models/user/User")); +const dateMethod = require("../../modules/dateMethod"); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/tableContents/SecondPartTableContent'); +require('../../models/diary/PetDiary'); +require('../../models/diary/UserDiary'); +require('../../models/diary/PetEmotions'); +require('../../models/book/Book'); +module.exports = { + getDiaryPerDate: (year, month, part) => __awaiter(void 0, void 0, void 0, function* () { + try { + const user = (yield User_1.default.find().populate({ path: "book" }))[0]; + const author = user.book.author; + const calendarResDto = new calendarResDto_1.CalendarResDto(author, part); + if (part == 1) { + const calendarDiary = yield PetDiary_1.default.find({ + date: { + $gte: new Date(year, month - 1, 1), + $lt: new Date(year, month, 1) + } + }).populate({ + path: "petEmotions pets", + }); + console.log('calendarDiary : ' + calendarDiary); + const thisMonthLength = yield dateMethod.getLastDateOfMonth(year, month); + const calendarInfoResDto = new calendarResDto_1.CalendarInfoResDto(year, month); + for (let i = 0; i < thisMonthLength; i++) { + const diariesPerMonth = calendarDiary.filter(diary => diary.date.getDate() == i); + if (diariesPerMonth.length < 1) { + calendarInfoResDto.setDate(null); + } + else { + calendarInfoResDto.setDate(new calendarResDto_1.CalendarDatePetDto(i + 1, diariesPerMonth)); + } + //CalendarDiary에 각 일에 해당하는 일기를 만들어서 넣어주면된다 + } + calendarResDto.setCalendar(calendarInfoResDto); + } + else if (part == 2) { + const calendarDiary = yield UserDiary_1.default.find({ + date: { + $gte: new Date(year, month - 1, 1), + $lt: new Date(year, month, 1) + } + }).populate({ + path: "petEmotions pets" + }); + console.log('calendarDiary : ' + calendarDiary); + const thisMonthLength = yield dateMethod.getLastDateOfMonth(year, month); + const calendarInfoResDto = new calendarResDto_1.CalendarInfoResDto(year, month); + for (let i = 0; i < thisMonthLength; i++) { + const diariesPerMonth = calendarDiary.filter(diary => diary.date.getDate() == i); + if (diariesPerMonth.length < 1) { + calendarInfoResDto.setDate(null); + } + else { + calendarInfoResDto.setDate(new calendarResDto_1.CalendarDateUserDto(i + 1, diariesPerMonth, user)); + } + //CalendarDiary에 각 일에 해당하는 일기를 만들어서 넣어주면된다 + } + calendarResDto.setCalendar(calendarInfoResDto); + } + return calendarResDto; + } + catch (err) { + throw err; + } + }), +}; +//# sourceMappingURL=calendarService.js.map \ No newline at end of file diff --git a/dist/api/service/calendarService.js.map b/dist/api/service/calendarService.js.map new file mode 100644 index 0000000..a516645 --- /dev/null +++ b/dist/api/service/calendarService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"calendarService.js","sourceRoot":"","sources":["../../../src/api/service/calendarService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/chapterService.js b/dist/api/service/chapterService.js new file mode 100644 index 0000000..425f096 --- /dev/null +++ b/dist/api/service/chapterService.js @@ -0,0 +1,138 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); +const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +const PetChapterDiary_1 = require("../../dto/petChapter/PetChapterDiary"); +const User_1 = __importDefault(require("../../models/user/User")); +const ChapterList_1 = require("../../dto/petChapter/ChapterList"); +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/diary/PetDiary'); +require('../../models/diary/PetEmotions'); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +module.exports = { + getChapterDiary: (chapterId) => __awaiter(void 0, void 0, void 0, function* () { + try { + //챕터 id로 1부 목차 + const findFirstTableContents = yield FirstPartTableContents_1.default.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); + //.populate({path:"petDiary",populate:({path:"petEmotions"})}) + let newChapterDiary = new PetChapterDiary_1.PetChapterDiaryResDto(findFirstTableContents); + //월별로 자르기 + for (let m = 1; m <= 12; m++) { + let cnt = 0; + //1화부터 + let monthly = new PetChapterDiary_1.MonthlyDiaryResDto(); + for (let i = 0; i < findFirstTableContents.petDiary.length; i++) { + if (m == findFirstTableContents.petDiary[i].date.getMonth()) { + cnt++; + let newDiary = new PetChapterDiary_1.DiariesResDto(findFirstTableContents.petDiary[i]); //diary + monthly.setDiaries(newDiary); + //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) + } + } + monthly.setMonthCount(cnt); + monthly.setMonth(m); + newChapterDiary.setMonthly(monthly); + } + console.log(newChapterDiary); + return newChapterDiary; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; + } + }), + getChapterList: (userId) => __awaiter(void 0, void 0, void 0, function* () { + const findUserChapter = yield User_1.default.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + let chapterList = new ChapterList_1.ChapterListResDto(); + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + let newChapter = new ChapterList_1.ChapterResDto(new FirstPartTableContents_1.default(findUserChapter.book.tableContents.firstPartTableContents[i])); + chapterList.setChapterList(newChapter); + } + console.log(chapterList); + return chapterList; + }), + postChapterList: (userId, chapterTitle) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findUserChapter = yield User_1.default.findById(userId).populate({ path: "book", populate: ({ path: "tableContents", populate: ({ path: "firstPartTableContents" }) }) }); + const newFirstPartTable = new FirstPartTableContents_1.default(); //chapter,title + console.log(findUserChapter); + console.log(chapterTitle); + let max = 0; + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + if (max < findUserChapter.book.tableContents.firstPartTableContents[i].chapter) { + max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter); + } + } + newFirstPartTable.chapter = max; + newFirstPartTable.title = chapterTitle; + yield newFirstPartTable.save(); + findUserChapter.book.tableContents.firstPartTableContents.push(newFirstPartTable); + let newTableContents = new TableContents_1.default(findUserChapter.book.tableContents); + yield newTableContents.save(); + console.log(newTableContents); + return responseMessage.SUCCESS_POST_CHAPTERLIST; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS }; + } + }), + putChapterList: (chapterId, chapterTitle) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findChapter = yield FirstPartTableContents_1.default.findById(chapterId); + findChapter.title = chapterTitle; + const editFirstPartTableContents = new FirstPartTableContents_1.default(findChapter); + yield editFirstPartTableContents.save(); + console.log(editFirstPartTableContents); + return responseMessage.SUCCESS_PUT_CHAPTERLIST; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS }; + } + }), + deleteChapterList: (chapterId) => __awaiter(void 0, void 0, void 0, function* () { + try { + let findChapter = yield FirstPartTableContents_1.default.findById(chapterId); + const curChapter = findChapter.chapter; + const allFirstTableContents = yield FirstPartTableContents_1.default.find({}); + let updateFTC = new FirstPartTableContents_1.default(); + //해당 목차보다 큰 목차 -=1 + for (let i = 0; i < allFirstTableContents.length; i++) { + if (allFirstTableContents[i].chapter > curChapter) { + allFirstTableContents[i].chapter = Number(allFirstTableContents[i].chapter) - 1; + } + //db save + updateFTC = allFirstTableContents[i]; + yield updateFTC.save(); + } + console.log(allFirstTableContents); + //해당 목차 삭제 + findChapter = null; + return responseMessage.SUCCESS_DELETE_CHAPTERLIST; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS }; + } + }) +}; +//# sourceMappingURL=chapterService.js.map \ No newline at end of file diff --git a/dist/api/service/chapterService.js.map b/dist/api/service/chapterService.js.map new file mode 100644 index 0000000..5f6a825 --- /dev/null +++ b/dist/api/service/chapterService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js new file mode 100644 index 0000000..cb1c177 --- /dev/null +++ b/dist/api/service/diaryService.js @@ -0,0 +1,166 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const Book_1 = __importDefault(require("../../models/book/Book")); +const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); +const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +const Pet_1 = __importDefault(require("../../models/pet/Pet")); +const PetDiary_1 = __importDefault(require("../../models/diary/PetDiary")); +const PetEmotions_1 = __importDefault(require("../../models/diary/PetEmotions")); +const PetDiaryPageResDto_1 = require("../../dto/petDiary/PetDiaryPageResDto"); +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/diary/PetDiary'); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +module.exports = { + postPrologue: (bookData) => __awaiter(void 0, void 0, void 0, function* () { + try { + // add book info + let book = yield Book_1.default.findById(bookData._id); + book.title = bookData.title; + book.imgs = bookData.image; + book.author = bookData.userName; + console.log(book); + //add tableContents info + let tc = yield new TableContents_1.default(); + let ftc = yield new FirstPartTableContents_1.default({ + chapter: 0, + title: bookData.prologueTitle, + contents: bookData.prologueContents + }); + yield tc.setFirstPartTableContents(ftc); + yield book.setTableContents(tc); + //save db + yield book.save(); + return responseMessage.SUCCESS_POST_PROLOGUE; + //error handling + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK }; + } + }), + postPetDiary: (diaryData) => __awaiter(void 0, void 0, void 0, function* () { + const writeDate = yield new Date(diaryData.date); + writeDate.setDate(writeDate.getDate() + 1); + // console.log(FirstPartTableContents.findById(diaryData._id)) + const temp = yield FirstPartTableContents_1.default.findById(diaryData._id).populate('petDiary'); + //console.log("temp:",temp,"end") + let newPetDiary = new PetDiary_1.default({ + tableContents: diaryData._id, + episode: temp.petDiary.length, + date: writeDate, + imgs: diaryData.diaryImages, + title: diaryData.title, + contents: diaryData.contents + }); + try { + //save petinfo + let petN = diaryData.character.length; + for (let i = 0; i < petN; i++) { + const petData = yield Pet_1.default.findById(diaryData.character[0]._id).populate('_id'); + newPetDiary.setPet(petData); + //save emotions + const petEmotion = new PetEmotions_1.default({ + pet: diaryData.character[0]._id, + feeling: diaryData.character[0].feeling + }); + newPetDiary.setPetEmotions(petEmotion); + } + console.log(newPetDiary); + yield newPetDiary.save(); + yield temp.setPetDiary(newPetDiary); //db관련은 await 붙이기(setter,save...) + yield temp.save(); + console.log(temp._id); + return responseMessage.SUCCESS_POST_PETDIARY; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; + } + }), + getPetDiary: (petDiaryId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findPetDiary = yield PetDiary_1.default.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); + let petDiaryPageResDto = yield new PetDiaryPageResDto_1.PetDiaryPageResDto(findPetDiary); //이부분 + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { + petDiaryPageResDto.setFeelingList(findPetDiary.petEmotions[i]); + } + return petDiaryPageResDto; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; + } + }), + putPetDiary: (petDiaryId, diaryData) => __awaiter(void 0, void 0, void 0, function* () { + try { + let findPetDiary = yield PetDiary_1.default.findById(petDiaryId); + findPetDiary.tableContents = findPetDiary.tableContents; + findPetDiary.episode = findPetDiary.episode; + findPetDiary.date = findPetDiary.date; + findPetDiary.imgs = diaryData.diaryImages; + findPetDiary.title = diaryData.title; + findPetDiary.contents = diaryData.contents; + //save petinfo + let petN = diaryData.character.length; + for (let i = 0; i < petN; i++) { + const petData = yield Pet_1.default.findById(diaryData.character[i]._id).populate('_id'); + findPetDiary.setPet(petData); + //save emotions + let emotion = new PetEmotions_1.default(); + emotion.pet = diaryData.character[i]._id; + emotion.feeling = diaryData.character[i].feeling; + emotion.setPetDiary(findPetDiary); + yield emotion.save(); + } + yield findPetDiary.save(); + return responseMessage.SUCCESS_EDIT_PETDIARY; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; + } + }), + deletePetDiary: (petDiaryId) => __awaiter(void 0, void 0, void 0, function* () { + try { + let findPetDiary = yield PetDiary_1.default.findById(petDiaryId).populate('tableContents'); + console.log(findPetDiary); + //화 정렬 순서 맞추기 + //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 + // let allDiaries=await (PetDiary.find({}).populate('tableContents')) + let petDiaries = (yield FirstPartTableContents_1.default.findOne({ chapter: { $eq: findPetDiary.tableContents.chapter } })).petDiary; + for (let i = 0; i < petDiaries.length; i++) { + let temp = yield PetDiary_1.default.findById(petDiaries[i]); + if (findPetDiary.episode <= temp.episode) { + temp.episode = Number(temp.episode) - 1; + yield temp.save(); + } + } + yield PetDiary_1.default.deleteOne({ _id: findPetDiary }); + console.log(findPetDiary); + return responseMessage.SUCCESS_DELETE_PETDIARY; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; + } + }) +}; +//# sourceMappingURL=diaryService.js.map \ No newline at end of file diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map new file mode 100644 index 0000000..3c749e2 --- /dev/null +++ b/dist/api/service/diaryService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/firstPartService.js b/dist/api/service/firstPartService.js new file mode 100644 index 0000000..98813b9 --- /dev/null +++ b/dist/api/service/firstPartService.js @@ -0,0 +1,88 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const User_1 = __importDefault(require("../../models/user/User")); +const FirstPartMainPageResDto_1 = require("../../dto/firstPart/mainPageDto/FirstPartMainPageResDto"); +const dateMethod = require("../../modules/dateMethod"); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +const Book_1 = __importDefault(require("../../models/book/Book")); +const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); +const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +require("../../models/user/User"); +require("../../models/pet/Pet"); +require("../../models/book/Book"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/diary/PetDiary'); +require('../../models/diary/PetEmotions'); +require('../../models/diary/UserDiary'); +module.exports = { + getMainPage: (userId) => __awaiter(void 0, void 0, void 0, function* () { + try { + //find userData + const findUser = yield User_1.default.findById(userId).populate({ + path: "pets" + }).populate({ + path: "book", + populate: ({ + path: "tableContents", + populate: ({ + path: "firstPartTableContents", + populate: ({ + path: "petDiary", + populate: { + path: "petEmotions" + } + }) + }) + }) + }); + let newBook = new Book_1.default(); + let newTableContents = new TableContents_1.default(); + let newFirstPartTableContents = new FirstPartTableContents_1.default(); + newTableContents.setFirstPartTableContents(newFirstPartTableContents); + newBook.setTableContents(newTableContents); + if (findUser.book == null) { + findUser.setBook(newBook); + } + if (findUser.book.tableContents == null) { + findUser.book.tableContents = new TableContents_1.default(); + } + if (findUser.book.tableContents.firstPartTableContents == null) { + findUser.book.tableContents.firstPartTableContents.push(new FirstPartTableContents_1.default()); + } + const firstPartMainPageResDto = new FirstPartMainPageResDto_1.FirstPartMainPageResDto(findUser.book); + let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length - 1; + //console.log("#:",lastTableNumber) + const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]); + //tableContents + for (let i = 0; i < lastTableNumber; i++) { + let tableContentsResDto = new FirstPartMainPageResDto_1.TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]); + firstPartMainPageResDto.setTableContents(tableContentsResDto); + } + firstPartMainPageResDto.setDiary(lastDiary); + if (findUser.book.tableContents.secondPartTableContents.length > 1) { + firstPartMainPageResDto.setSecondPartBook(findUser); + } + return firstPartMainPageResDto; + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; + } + }) +}; +//# sourceMappingURL=firstPartService.js.map \ No newline at end of file diff --git a/dist/api/service/firstPartService.js.map b/dist/api/service/firstPartService.js.map new file mode 100644 index 0000000..19fd747 --- /dev/null +++ b/dist/api/service/firstPartService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js new file mode 100644 index 0000000..b892d14 --- /dev/null +++ b/dist/api/service/petService.js @@ -0,0 +1,57 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const Pet_1 = __importDefault(require("../../models/pet/Pet")); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +const util = require('../../modules/util'); +const petService = require('../service/petService'); +var mongoose = require('mongoose'); +require("../../models/user/User"); +require("../../models/pet/Pet"); +module.exports = { + registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { + try { + //error handling + let pets = []; + const startDate = new Date(reqData.pets[0].startDate); + startDate.setDate(startDate.getDate() + 1); + for (let i = 0; i < reqData.pets.length; i++) { + let pet = new Pet_1.default({ + name: reqData.pets[i].name, + kind: reqData.pets[i].kind, + gender: reqData.pets[i].gender, + imgs: images[i], + user: mongoose.Types.ObjectId(reqData._id), + rainbow: false, + startDate: new Date(startDate) + // findUser, UserId만 해서 되면 가능 + //book://나중에 책을 등록할때, pet에 book을 등록. 연관관계 확인. 안들어가있는게 있으면 나중에 같이 넣어야됨. + //SETTER사용. pet 찾아서 setter로 넣기. + }); + pets[i] = pet; + } + console.log(reqData); + //db save + for (let i = 0; i < pets.length; i++) { + yield pets[i].save(); + } + } + catch (err) { + console.log(err); + throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; + } + }) +}; +//# sourceMappingURL=petService.js.map \ No newline at end of file diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map new file mode 100644 index 0000000..6ed3b82 --- /dev/null +++ b/dist/api/service/petService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,+DAAsC;AACtC,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACnD,IAAI,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAElC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAG;YACH,gBAAgB;YACZ,IAAI,IAAI,GAAC,EAAE,CAAC;YACZ,MAAM,SAAS,GAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YACpD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAI,GAAG,GAAG,IAAI,aAAG,CAAC;oBACd,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1B,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;oBAC9B,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;oBACf,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;oBAC1C,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC;oBAE/B,6BAA6B;oBAC5B,sEAAsE;oBACtE,+BAA+B;iBAClC,CAAC,CAAC;gBACH,IAAI,CAAC,CAAC,CAAC,GAAC,GAAG,CAAC;aACf;YACD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,SAAS;YACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACxB;SACJ;QAAA,OAAM,GAAG,EAAC;YACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,qBAAqB,EAAE,eAAe,EAAE,eAAe,CAAC,qBAAqB,EAAE,CAAC;SAClH;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js new file mode 100644 index 0000000..7abd99d --- /dev/null +++ b/dist/api/service/rainbowService.js @@ -0,0 +1,359 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const User_1 = __importDefault(require("../../models/user/User")); +const RainbowMainPageResDto_1 = require("../../dto/rainbow/mainPageDto/RainbowMainPageResDto"); +const Help_1 = __importDefault(require("../../models/etc/Help")); +const RainbowPetResDto_1 = require("../../dto/rainbow/petDto/RainbowPetResDto"); +const Pet_1 = __importDefault(require("../../models/pet/Pet")); +const PartingRainbowResDto_1 = require("../../dto/rainbow/partingDto/PartingRainbowResDto"); +const ReadyPartingAndStartRecordResDto_1 = require("../../dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto"); +const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +const SecondPartTableContent_1 = __importDefault(require("../../models/tableContents/SecondPartTableContent")); +const PetEmotions_1 = __importDefault(require("../../models/diary/PetEmotions")); +const TheBestMomentResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentResDto"); +const PetNameResDto_1 = require("../../dto/rainbow/petDto/PetNameResDto"); +const Comments_1 = __importDefault(require("../../models/etc/Comments")); +const TheBestMomentSubResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentSubResDto"); +const dateMethod = require("../../modules/dateMethod"); +require("../../models/user/User"); +require("../../models/pet/Pet"); +require("../../models/book/Book"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/diary/PetDiary'); +require('../../models/diary/PetEmotions'); +require('../../models/tableContents/SecondPartTableContent'); +require('../../models/diary/UserDiary'); +require("../../models/etc/Help"); +module.exports = { + getMainPage: (userId, petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findUser = yield User_1.default.findById(userId).populate({ + path: "pets" + }).populate({ + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents", + populate: { + path: "petDiary", + populate: { + path: "petEmotions" + } + } + } + } + }); + const isRainbowPet = yield isRainbow(findUser.pets); + const rainbowButtonCheck = yield rainbowCheck(findUser.pets); + const rainbowMainPageResDto = new RainbowMainPageResDto_1.RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck); + const firstPartTableContents = findUser.book.tableContents.firstPartTableContents; + const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId))); + //validMemories : [tableContetns [petDiary]] + let memoriesResDto = [null, null]; + if (validMemories.length == 2) { + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0], petId); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[1], petId); + } + else if (validMemories.length > 2) { + let firstTableContentsIndex = yield getRandomNumber(validMemories.length); + let secondTableContentsIndex = yield getRandomNumber(validMemories.length); + if (firstTableContentsIndex == secondTableContentsIndex) { + while (firstTableContentsIndex == secondTableContentsIndex) { + if (secondTableContentsIndex == firstTableContentsIndex) { + secondTableContentsIndex = yield getRandomNumber(validMemories.length); + } + else { + break; + } + } + } + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[firstTableContentsIndex], petId); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[secondTableContentsIndex], petId); + } + else if (validMemories.length == 1) { + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0], petId); + } + rainbowMainPageResDto.setMemories(memoriesResDto); + //helpResDto + const helps = yield Help_1.default.find(); + const helpResDto = helps.map(help => new RainbowMainPageResDto_1.HelpResDto(help)); + rainbowMainPageResDto.setHelp(helpResDto); + return rainbowMainPageResDto; + } + catch (error) { + throw error; + } + function getRandomNumber(max) { + max = Math.floor(max); + return Math.floor(Math.random() * max); + } + function isRainbow(pets) { + let rainbow = false; + pets.forEach(pet => { + if (pet.rainbow === true) { + rainbow = true; + } + }); + return rainbow; + } + function rainbowCheck(pets) { + let check = true; + pets.forEach(pet => { + if (pet.rainbow === false) { + check = false; + } + }); + return check; + } + }), + selectPet: () => __awaiter(void 0, void 0, void 0, function* () { + try { + const findUser = yield User_1.default.find().populate({ + path: "pets" + }); + const rainbowPetResDto = findUser[0].pets.map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); + return rainbowPetResDto; + } + catch (err) { + throw err; + } + }), + setPartingRainbowPet: (petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findPet = yield Pet_1.default.findById(petId).populate({ + path: "user", + populate: { + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents" + } + } + } + }); + findPet.rainbow = true; + yield findPet.save(); + const user = findPet.user; + let diaryCount = 0; + user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length); + return new PartingRainbowResDto_1.PartingRainbowResDto(diaryCount, findPet.name); + } + catch (err) { + throw err; + } + }), + cancelPartingPet: (petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findPet = yield Pet_1.default.findById(petId); + findPet.rainbow = false; + yield findPet.save(); + } + catch (err) { + throw err; + } + }), + getReadyPartingPetComment: (petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const pet = yield Pet_1.default.findById(petId).populate({ + path: "user", + populate: { + path: "book", + populate: { + path: "tableContents", + populate: { + path: "firstPartTableContents" + } + } + } + }); + const user = pet.user; + const bookInfo = new ReadyPartingAndStartRecordResDto_1.BookInfoResDto(pet.user.book); + let diaryCount = 0; + user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length); + const startDate = pet.startDate; + const dayTogether = yield dateMethod.getElapsedDay(startDate); + return new ReadyPartingAndStartRecordResDto_1.ReadyPartingAndStartRecordResDto(diaryCount, dayTogether, bookInfo); + } + catch (err) { + throw err; + } + }), + getTheBestMoment: (userId, petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const pet = yield Pet_1.default.findById(petId); + const TheBestMomentPetInfo = new TheBestMomentResDto_1.TheBestMomentPetInformation(pet); + const diaryPerFeeling = []; + for (let i = 0; i < 6; i++) { + console.log(i); + const diaries = (yield PetEmotions_1.default.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary); + if (diaries.length < 1) { + diaryPerFeeling.push(null); + } + else { + diaryPerFeeling.push(diaries); + } + } + const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(); + for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 + const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); + let theBestMoment = null; + if (j < 3) { + theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])); + } + else { + theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])); + } + theBestMomentsResDto.setTheBestMoment(theBestMoment); + theBestMomentsResDto.setTheBestMomentPetInfo(TheBestMomentPetInfo); + } + return theBestMomentsResDto; + } + catch (err) { + throw err; + } + //각 기분에 따른 일기들을 배열로 묶어서 보내줘야함 + function getPositiveRadomDiary(diaries) { + if (diaries === null) + return null; + const diaryLength = diaries.length; + const theBestMomentDiaries = []; + if (diaryLength < 8) { + for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 + theBestMomentDiaries.push(new TheBestMomentResDto_1.TheBestMomentDiary(diaries[i])); + } + for (let j = 0; j < 8 - diaryLength; j++) { //남은 일기갯수(8-가지고 있는 일기수)만큼 null로 채워준다 + theBestMomentDiaries.push(null); + } + } + else { + //8개 이상의 일기중 8개만 골라서 넣어준다. + const indexArray = []; + while (indexArray.length < 8) { + let index = getRandomNumber(diaryLength); + if (!indexArray.includes(index)) { + indexArray.push(index); + } + } + for (let k = 0; k < 8; k++) { + theBestMomentDiaries.push(new TheBestMomentResDto_1.TheBestMomentDiary(diaries[indexArray[k]])); + } + } + return theBestMomentDiaries; + } + //부정 일기는 2개씩만 + function getNegativeRandomDiary(diaries) { + if (diaries === null) + return null; + const diaryLength = diaries.length; + const theBestMomentDiaries = []; + if (diaryLength < 2) { + for (let i = 0; i < diaryLength; i++) { + theBestMomentDiaries.push(new TheBestMomentResDto_1.TheBestMomentDiary(diaries[i])); + } + for (let j = 0; j < 2 - diaryLength; j++) { + theBestMomentDiaries.push(null); + } + } + else { + const indexArray = []; + while (indexArray.length < 2) { + let index = getRandomNumber(diaryLength); + if (!indexArray.includes(index)) { + indexArray.push(index); + } + } + for (let k = 0; k < 2; k++) { + theBestMomentDiaries.push(new TheBestMomentResDto_1.TheBestMomentDiary(diaries[indexArray[k]])); + } + } + return theBestMomentDiaries; + } + function getRandomNumber(max) { + max = Math.floor(max); + return Math.floor(Math.random() * max); + } + }), + getPartingPetName: (petId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const pet = yield Pet_1.default.findById(petId); + return new PetNameResDto_1.PetNameResDto(pet); + } + catch (err) { + throw err; + } + }), + postEpilogue: (userId, data) => __awaiter(void 0, void 0, void 0, function* () { + try { + const user = yield User_1.default.findById(userId).populate({ + path: "book", + populate: ({ + path: "tableContents", + populate: ({ + path: "firstPartTableContents secondPartTableContents" + }) + }) + }); + const tableContents = user.book.tableContents; + //1부 목차 마지막에 에필로그 + const firstPartEpilogue = new FirstPartTableContents_1.default({ + chapter: -1, + title: data.title, + contents: data.contents + }); + yield firstPartEpilogue.save(); + yield tableContents.firstPartTableContents.push(firstPartEpilogue); + const isAlreadySecondPartTableContents = yield SecondPartTableContent_1.default.find(); //첫 반려동물이 무지개를 건넜는지 확인하기 위한 로직 + //2부 목차 처음에 에필로그 + const secondPartEpilogue = new SecondPartTableContent_1.default({ + chapter: 0, + title: data.title, + contents: data.contents + }); + const saveSecondPartEpiogue = yield secondPartEpilogue.save(); + yield tableContents.secondPartTableContents.unshift(saveSecondPartEpiogue); + if (isAlreadySecondPartTableContents.length < 1) { + const season = ["봄", "여름", "가을", "겨울"]; + for (let i = 0; i < 4; i++) { + let chapter = 1; + const dummySecondPartTableContents = new SecondPartTableContent_1.default({ + chapter, + title: `${user.book.author}의 ${season[i]}` + }); + const saveSecondPartEpiogue = yield dummySecondPartTableContents.save(); + yield tableContents.secondPartTableContents.push(saveSecondPartEpiogue); + chapter = chapter + 1; + } + } + yield tableContents.save(); + return user; + } + catch (err) { + throw err; + } + }), + getTheBestMomentSub: (petId, theBestMoment) => __awaiter(void 0, void 0, void 0, function* () { + try { + const pet = yield Pet_1.default.findById(petId); + return new TheBestMomentSubResDto_1.TheBestMomentSubResDto(pet, theBestMoment); + } + catch (err) { + throw err; + } + }) +}; +//# sourceMappingURL=rainbowService.js.map \ No newline at end of file diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map new file mode 100644 index 0000000..ca69053 --- /dev/null +++ b/dist/api/service/rainbowService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,+FAAuH;AACvH,iEAAwC;AACxC,gFAA2E;AAC3E,+DAAsC;AAEtC,4FAAwF;AACxF,uIAAmJ;AACnJ,+GAAsF;AACtF,+GAAsF;AAEtF,iFAAwD;AACxD,gGAA6J;AAC7J,0EAAsE;AAEtE,yEAAgD;AAChD,sGAAkG;AAClG,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,8BAA8B,CAAC,CAAA;AACvC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAEhC,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAClD,IAAI,EAAE,MAAM;aACf,CAAC,CAAC,QAAQ,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE;wBACN,IAAI,EAAE,wBAAwB;wBAC9B,QAAQ,EAAE;4BACN,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACN,IAAI,EAAE,aAAa;6BACtB;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnD,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC5D,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAA;YACxG,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAA;YAEjF,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAChE,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CACnD,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CACrC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;YACL,4CAA4C;YAE5C,IAAI,cAAc,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAEjC,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3B,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC/D,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;iBAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,IAAI,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBACzE,IAAI,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBAE1E,IAAI,uBAAuB,IAAI,wBAAwB,EAAE;oBACrD,OAAO,uBAAuB,IAAI,wBAAwB,EAAE;wBACxD,IAAI,wBAAwB,IAAI,uBAAuB,EAAE;4BACrD,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;yBACzE;6BAAM;4BACH,MAAM;yBACT;qBACJ;iBACJ;gBACD,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAA;gBACrF,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC,CAAA;aACzF;iBAAM,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAClC,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;YACD,qBAAqB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;YAEjD,YAAY;YACZ,MAAM,KAAK,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,kCAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YAE1D,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAEzC,OAAO,qBAAqB,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,KAAK,CAAA;SACd;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,SAAS,SAAS,CAAC,IAAY;YAC3B,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;oBACtB,OAAO,GAAG,IAAI,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;QACD,SAAS,YAAY,CAAC,IAAY;YAC9B,IAAI,KAAK,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE;oBACvB,KAAK,GAAG,KAAK,CAAA;iBAChB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC,CAAA;IAED,SAAS,EAAE,GAAS,EAAE;QAClB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC;gBACxC,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAChD,IAAI,kCAAe,CAAC,GAAG,CAAC,CAAC,CAAA;YAE7B,OAAO,gBAAgB,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,oBAAoB,EAAE,CAAO,KAAK,EAAE,EAAE;QAClC,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;YACtB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,OAAO,IAAI,2CAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;SACvB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,yBAAyB,EAAE,CAAO,KAAK,EAAE,EAAE;QACvC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC3C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YACrB,MAAM,QAAQ,GAAG,IAAI,iDAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAC/B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE7D,OAAO,IAAI,mEAAgC,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;SACjF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACtC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,MAAM,oBAAoB,GAAG,IAAI,iDAA2B,CAAC,GAAG,CAAC,CAAA;YAEjE,MAAM,eAAe,GAAG,EAAE,CAAA;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACd,MAAM,OAAO,GAAG,CAAC,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC7L,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC7B;qBAAM;oBACH,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAChC;aACJ;YAED,MAAM,oBAAoB,GAAG,IAAI,0CAAoB,EAAE,CAAA;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAI,YAAY;gBACxC,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAA;gBACnF,IAAI,aAAa,GAAG,IAAI,CAAA;gBACxB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACP,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAClG;qBAAM;oBACH,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBACnG;gBACD,oBAAoB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBACpD,oBAAoB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;aACrE;YAED,OAAO,oBAAoB,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;QAED,6BAA6B;QAC7B,SAAS,qBAAqB,CAAC,OAAoB;YAC/C,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,qBAAqB;oBACzD,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,oCAAoC;oBAC5E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,0BAA0B;gBAC1B,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,aAAa;QACb,SAAS,sBAAsB,CAAC,OAAoB;YAChD,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBAClC,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBACtC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC,CAAA;IAED,iBAAiB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC/B,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,6BAAa,CAAC,GAAG,CAAC,CAAA;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,YAAY,EAAE,CAAO,MAAM,EAAE,IAAI,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,CAAC;wBACP,IAAI,EAAE,gDAAgD;qBACzD,CAAC;iBACL,CAAC;aACL,CAAC,CAAA;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAA;YAE7C,iBAAiB;YACjB,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,MAAM,gCAAgC,GAAG,MAAM,gCAAsB,CAAC,IAAI,EAAE,CAAA,CAAA,8BAA8B;YAE1G,gBAAgB;YAChB,MAAM,kBAAkB,GAAG,IAAI,gCAAsB,CAAC;gBAClD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,qBAAqB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC7D,MAAM,aAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;YAE1E,IAAI,gCAAgC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,IAAI,OAAO,GAAG,CAAC,CAAA;oBACf,MAAM,4BAA4B,GAAG,IAAI,gCAAsB,CAAC;wBAC5D,OAAO;wBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;qBAC7C,CAAC,CAAA;oBACF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC,IAAI,EAAE,CAAA;oBACvE,MAAM,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;oBACvE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;iBACxB;aACJ;YACD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,mBAAmB,EAAC,CAAO,KAAK,EAAC,aAAa,EAAE,EAAE;QAC9C,IAAG;YACC,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,+CAAsB,CAAC,GAAG,EAAC,aAAa,CAAC,CAAA;SACvD;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js new file mode 100644 index 0000000..f6e079f --- /dev/null +++ b/dist/api/service/secondPartService.js @@ -0,0 +1,163 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const SecondPartTableContent_1 = __importDefault(require("../../models/tableContents/SecondPartTableContent")); +const UserDiary_1 = __importDefault(require("../../models/diary/UserDiary")); +const User_1 = __importDefault(require("../../models/user/User")); +const SecondPartMainPageResDto_1 = require("../../dto/secondPart/SecondPartMainPageResDto"); +const SecondPartDiariesOfMonthResDto_1 = require("../../dto/secondPart/SecondPartDiariesOfMonthResDto"); +const SecondPartChapterListResDto_1 = require("../../dto/secondPart/SecondPartChapterListResDto"); +const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); +const dateMethod = require("../../modules/dateMethod"); +require('../../models/tableContents/FirstPartTableContents'); +require('../../models/tableContents/SecondPartTableContent'); +require('../../models/diary/PetDiary'); +require('../../models/diary/UserDiary'); +require('../../models/diary/PetEmotions'); +require('../../models/book/Book'); +module.exports = { + getMainPage: (userId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const user = yield User_1.default.findById(userId).populate({ + path: "book", + populate: ({ + path: "tableContents", + populate: ({ + path: "secondPartTableContents", + populate: ({ + path: "userDiary" + }) + }) + }) + }); + const epilogue = user.book.tableContents.secondPartTableContents[0]; + const checkFirst = user.book.tableContents.secondPartTableContents.map(tableContents => tableContents.userDiary); + let check = false; + checkFirst.forEach(x => { + if (x.length > 1) + check = true; + }); + let sortSecondPartTableContents = []; + if (check) { + sortSecondPartTableContents = user.book.tableContents.secondPartTableContents.filter(secondPartTableContents => secondPartTableContents.userDiary.length > 1).sort((a, b) => b.chapter - a.chapter)[0].userDiary.sort((a, b) => b.episode - a.episode); + } + else { + sortSecondPartTableContents.push({ + nextEpisode: 1, + episode: 0, + title: epilogue.title, + contents: epilogue.contents, + date: user.book.tableContents.secondPartStartDate + }); + } + return new SecondPartMainPageResDto_1.SecondPartMainPageResDto(user, sortSecondPartTableContents[0]); + } + catch (err) { + throw err; + } + }), + getDiaryOfTableContents: (tableContentsId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const tableContents = yield SecondPartTableContent_1.default.findById(tableContentsId).populate({ + path: "userDiary" + }); + const test = tableContents.userDiary.filter(userDiary => userDiary.date.getMonth() == 6); + const secondPartDiariesOfMonth = []; + for (let i = 12; i > 0; i--) { + if ((tableContents.userDiary.map(diary => diary.date.getMonth() == i)).includes(true)) { + const filteringDiaries = tableContents.userDiary.filter(userDiary => userDiary.date.getMonth() == i); + secondPartDiariesOfMonth.push(new SecondPartDiariesOfMonthResDto_1.SecondPartDiariesOfMonth(i + 1, filteringDiaries)); + } + } + return new SecondPartDiariesOfMonthResDto_1.SecondPartDiariesOfMonthResDto(tableContents, secondPartDiariesOfMonth); + } + catch (err) { + throw err; + } + }), + getSecondPartChapterList: () => __awaiter(void 0, void 0, void 0, function* () { + try { + const chapterList = yield SecondPartTableContent_1.default.find(); + return new SecondPartChapterListResDto_1.SecondPartChapterListResDto(chapterList); + } + catch (err) { + throw err; + } + }), + addSecondPartChapter: (chapterData) => __awaiter(void 0, void 0, void 0, function* () { + try { + let newChapter = new SecondPartTableContent_1.default({ + title: chapterData.chapterTitle, + chapter: yield getNextChapter() + }); + yield newChapter.save(); + const tableContents = (yield TableContents_1.default.find())[0]; + yield tableContents.setSecondPartTableContents(newChapter); + yield tableContents.save(); + } + catch (err) { + throw err; + } + function getNextChapter() { + return __awaiter(this, void 0, void 0, function* () { + const secondPartTableContents = (yield SecondPartTableContent_1.default.find()); + const secondPartLength = secondPartTableContents.length; + return secondPartTableContents[secondPartLength - 1].chapter + 1; + }); + } + }), + modifySecondPartChapterInfo: (chapterId, modifyChapterData) => __awaiter(void 0, void 0, void 0, function* () { + try { + yield SecondPartTableContent_1.default.update({ _id: chapterId }, { $set: { title: modifyChapterData.chapterTitle } }); + } + catch (err) { + throw err; + } + }), + deleteSecondPartChapter: (chapterId) => __awaiter(void 0, void 0, void 0, function* () { + try { + //삭제하고자하는 2부 목차 + const findSecondPartChapter = yield SecondPartTableContent_1.default.findById(chapterId).populate({ + path: "userDiary" + }); + if (findSecondPartChapter === null) { + throw { statusCode: 400 }; + } + //전체 2부 목차 + const tableContents = (yield TableContents_1.default.find().populate({ + path: "secondPartTableContents" + }))[0]; + //삭제할 2부 목차의 chapter보다 큰 챕터 배열 & chapter -1씩 줄임 & 저장 + tableContents.secondPartTableContents.filter(secondPartTable => secondPartTable.chapter > findSecondPartChapter.chapter).forEach((secondPartTable) => __awaiter(void 0, void 0, void 0, function* () { + secondPartTable.chapter -= 1; + yield secondPartTable.save(); + })); + //2부 목차에서 해당 목차 삭제 + yield SecondPartTableContent_1.default.deleteOne({ _id: `${chapterId}` }); + //2부 목차에 들어있던 userDiary 삭제 + const userDiaries = findSecondPartChapter.userDiary; + userDiaries.forEach((userDiary) => __awaiter(void 0, void 0, void 0, function* () { + yield UserDiary_1.default.deleteOne({ _id: `${userDiary._id}` }); + })); + //총 목차(1부,2부)에서 해당 목차 secondPartTableContents배열에서 삭제 + const idx = tableContents.secondPartTableContents.findIndex(secondPartTable => secondPartTable._id == chapterId); + tableContents.secondPartTableContents.splice(idx, 1); + yield tableContents.save(); + } + catch (err) { + throw err; + } + }) +}; +//# sourceMappingURL=secondPartService.js.map \ No newline at end of file diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map new file mode 100644 index 0000000..b2889bb --- /dev/null +++ b/dist/api/service/secondPartService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/userService.js b/dist/api/service/userService.js new file mode 100644 index 0000000..977a540 --- /dev/null +++ b/dist/api/service/userService.js @@ -0,0 +1,84 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const User_1 = __importDefault(require("../../models/user/User")); +const Book_1 = __importDefault(require("../../models/book/Book")); +const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); +const bcryptjs_1 = __importDefault(require("bcryptjs")); +const express_validator_1 = require("express-validator"); +const validator = require('validator'); +require("../../models/user/User"); +require("../../models/pet/Pet"); +require("../../models/book/Book"); +const util = require('../../modules/util'); +const responseMessage = require('../../modules/responseMessage'); +const statusCode = require('../../modules/statusCode'); +module.exports = { + register: (email, password) => __awaiter(void 0, void 0, void 0, function* () { + //See if user exists(check valid email) + const errors = express_validator_1.validationResult(email); + if (!errors.isEmpty()) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; + } + if (!validator.isEmail(email) || !validator.isLength(password, { min: 8 })) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.WRONG_FORM }; + } + let user = yield User_1.default.findOne({ email }); + if (user) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.ALREADY_ID }; + } + user = new User_1.default({ + email, + password + }); + //Encrpyt password + const salt = yield bcryptjs_1.default.genSalt(10); + user.password = yield bcryptjs_1.default.hash(password, salt); + //Create book object + const book = new Book_1.default(); + //Create tableContents object + const tableContents = new TableContents_1.default(); + //Create firstPartTableContents object + const firstPart = new FirstPartTableContents_1.default(); + tableContents.setFirstPartTableContents(firstPart); + book.setTableContents(tableContents); + user.setBook(book); + //db save + yield user.save(); + return { bookId: book._id }; + }), + login: (email, password) => __awaiter(void 0, void 0, void 0, function* () { + try { + const errors = express_validator_1.validationResult(email); + if (!errors.isEmpty()) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; + } + let user = yield User_1.default.findOne({ email }); + if (!user) { + //등록되지 않은 email + throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; + } + const test = yield bcryptjs_1.default.compare(password, user.password); + console.log('asdada' + test); + if (!test) { + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; + } + } + catch (err) { + throw err; + } + }) +}; +//# sourceMappingURL=userService.js.map \ No newline at end of file diff --git a/dist/api/service/userService.js.map b/dist/api/service/userService.js.map new file mode 100644 index 0000000..4143458 --- /dev/null +++ b/dist/api/service/userService.js.map @@ -0,0 +1 @@ +{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/config/index.js b/dist/config/index.js new file mode 100644 index 0000000..13cf2af --- /dev/null +++ b/dist/config/index.js @@ -0,0 +1,31 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const dotenv_1 = __importDefault(require("dotenv")); +// Set the NODE_ENV to 'development' by default +process.env.NODE_ENV = process.env.NODE_ENV || "development"; +const envFound = dotenv_1.default.config(); +if (envFound.error) { + // This error should crash whole process + throw new Error("⚠️ Couldn't find .env file ⚠️"); +} +exports.default = { + /** + * Your favorite port + */ + port: parseInt(process.env.PORT, 10), + /** + * That long string from mlab + */ + mongoURI: process.env.MONGODB_URI, + /** + * Your secret sauce + */ + jwtSecret: process.env.JWT_SECRET, + jwtAlgorithm: process.env.JWT_ALGO, + githubClientId: process.env.GITHUB_CLIENT_ID, + githubSecret: process.env.GITHUB_SECRET, +}; +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/config/index.js.map b/dist/config/index.js.map new file mode 100644 index 0000000..a313c07 --- /dev/null +++ b/dist/config/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAE5B,+CAA+C;AAC/C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAE7D,MAAM,QAAQ,GAAG,gBAAM,CAAC,MAAM,EAAE,CAAC;AACjC,IAAI,QAAQ,CAAC,KAAK,EAAE;IAClB,wCAAwC;IAExC,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;CACpD;AAED,kBAAe;IACb;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAEpC;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IAEjC;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IACjC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAElC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC5C,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;CACxC,CAAC"} \ No newline at end of file diff --git a/dist/config/s3.json b/dist/config/s3.json new file mode 100644 index 0000000..626b115 --- /dev/null +++ b/dist/config/s3.json @@ -0,0 +1,5 @@ +{ + "accessKeyId": "AKIAYBR5NJVMWLVU4RNJ", + "secretAccessKey": "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", + "region": "ap-northeast-2" +} \ No newline at end of file diff --git a/dist/dto/calendar/calendarResDto.js b/dist/dto/calendar/calendarResDto.js new file mode 100644 index 0000000..79cd2d0 --- /dev/null +++ b/dist/dto/calendar/calendarResDto.js @@ -0,0 +1,67 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.CalendarDateUserDto = exports.CalendarDatePetDto = exports.CalendarInfoResDto = exports.CalendarResDto = void 0; +const IPet = require("../../interfaces/pet/IPet"); +class CalendarResDto { + constructor(name, part) { + this.name = null; + this.part = null; + this.nextEpilogue = null; + this.calendar = null; + this.name = name; + this.part = part; + } + setCalendar(calendar) { + this.calendar = calendar; + } +} +exports.CalendarResDto = CalendarResDto; +class CalendarInfoResDto { + constructor(year, month) { + this.year = null; + this.month = null; + this.date = []; + this.year = year; + this.month = month; + } + setDate(calendarDateDto) { + this.date.push(calendarDateDto); + } +} +exports.CalendarInfoResDto = CalendarInfoResDto; +class CalendarDatePetDto { + constructor(days, petDiaries) { + this.days = null; + this.kind = null; + this.id = []; + this.feeling = null; + this.days = days; + this.kind = petDiaries[0].pets[0].kind; + this.id = petDiaries.map(diary => diary._id); + this.feeling = petDiaries[0].petEmotions[0].feeling; + } +} +exports.CalendarDatePetDto = CalendarDatePetDto; +class CalendarDateUserDto { + constructor(days, userDiaries, user) { + this.days = null; + this.kind = null; + this.diaryId = []; + this.feeling = null; + this.days = days; + this.kind = this.getUsersPet(user); + this.diaryId = userDiaries.map(diary => diary._id); + this.feeling = userDiaries[0].feeling; + } + getUsersPet(user) { + const pets = user.pets; + let petsKind = null; + for (let i = pets.length - 1; i >= 0; i--) { + if (pets[i].rainbow) + petsKind = pets[i].kind; + } + return petsKind; + } +} +exports.CalendarDateUserDto = CalendarDateUserDto; +//# sourceMappingURL=calendarResDto.js.map \ No newline at end of file diff --git a/dist/dto/calendar/calendarResDto.js.map b/dist/dto/calendar/calendarResDto.js.map new file mode 100644 index 0000000..6742ad5 --- /dev/null +++ b/dist/dto/calendar/calendarResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"calendarResDto.js","sourceRoot":"","sources":["../../../src/dto/calendar/calendarResDto.ts"],"names":[],"mappings":";;;AAMA,MAAM,IAAI,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAEjD,MAAa,cAAc;IAMvB,YAAY,IAAI,EAAE,IAAI;QALd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QACX,iBAAY,GAAG,IAAI,CAAA;QACnB,aAAQ,GAAG,IAAI,CAAA;QAGnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;IAED,WAAW,CAAC,QAA6B;QACrC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAdD,wCAcC;AAED,MAAa,kBAAkB;IAK3B,YAAY,IAAI,EAAE,KAAK;QAJf,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,SAAI,GAAG,EAAE,CAAA;QAGb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,OAAO,CAAC,eAA0D;QAC9D,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IACnC,CAAC;CACJ;AAbD,gDAaC;AAED,MAAa,kBAAkB;IAM3B,YAAY,IAAI,EAAE,UAAwB;QALlC,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QACX,OAAE,GAAG,EAAE,CAAA;QACP,YAAO,GAAG,IAAI,CAAA;QAGlB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACtC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAA,KAAK,CAAC,GAAG,CAAC,CAAA;QAC1C,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACvD,CAAC;CACJ;AAZD,gDAYC;AAED,MAAa,mBAAmB;IAM5B,YAAY,IAAI,EAAE,WAA0B,EAAE,IAAY;QALlD,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QACX,YAAO,GAAG,EAAE,CAAA;QACZ,YAAO,GAAG,IAAI,CAAA;QAGlB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClD,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACzC,CAAC;IAED,WAAW,CAAC,IAAY;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACtB,IAAI,QAAQ,GAAG,IAAI,CAAA;QACnB,KAAI,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAC,CAAC,EAAG,CAAC,IAAG,CAAC,EAAG,CAAC,EAAE,EAAC;YACpC,IAAG,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO;gBAAE,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SAC9C;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;CACJ;AArBD,kDAqBC"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js new file mode 100644 index 0000000..cf7ad97 --- /dev/null +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -0,0 +1,81 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SecondPartBookResDto = exports.TableContentsResDto = exports.DiaryResDto = exports.FirstPartMainPageResDto = void 0; +const dateMethod = require('../../../modules/dateMethod'); +class FirstPartMainPageResDto { + constructor(book) { + this.firstPartMainPage = { + title: null, + bookImg: null, + diary: {}, + tableContents: [], + secondPartBook: null + }; + this.firstPartMainPage.title = book.title; + this.firstPartMainPage.bookImg = book.imgs; + } + //가장 최근 일기 작성(기분X) + setDiary(diary) { + this.firstPartMainPage.diary = diary; + } + setTableContents(tableContents) { + this.firstPartMainPage.tableContents.push(tableContents); + } + setSecondPartBook(user) { + this.firstPartMainPage.secondPartBook = new SecondPartBookResDto(user); + } +} +exports.FirstPartMainPageResDto = FirstPartMainPageResDto; +class DiaryResDto { + //가장 마지막 화 들어감 + constructor(firstPartTableContents) { + this.init(firstPartTableContents); + } + init(firstPartTableContents) { + return __awaiter(this, void 0, void 0, function* () { + console.log('!!!!!!!!!!!!!!! : ' + firstPartTableContents); + this.chapter = firstPartTableContents.chapter; + this.episode = firstPartTableContents.petDiary.length; + console.log('@@@@@@@ : ' + this.episode); + console.log('######## : ' + firstPartTableContents.petDiary[this.episode - 1]); + this._id = firstPartTableContents.petDiary[this.episode - 1]._id; + this.title = firstPartTableContents.petDiary[this.episode - 1].title; + this.contents = firstPartTableContents.petDiary[this.episode - 1].contents; + this.date = yield dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode - 1].date); + }); + } +} +exports.DiaryResDto = DiaryResDto; +class TableContentsResDto { + constructor(firstPartTableContents) { + this.chapterId = firstPartTableContents._id; //목차 Id + this.chapter = firstPartTableContents.chapter; + this.chapterName = firstPartTableContents.title; + this.episodePerchapterCount = firstPartTableContents.petDiary.length; + } +} +exports.TableContentsResDto = TableContentsResDto; +class SecondPartBookResDto { + constructor(user) { + this.init(user); + } + init(user) { + return __awaiter(this, void 0, void 0, function* () { + this.userId = user._id; + this.imgs = user.book.imgs; + this.author = user.book.author; + this.date = yield dateMethod.toStringByFormatting(user.book.date); + }); + } +} +exports.SecondPartBookResDto = SecondPartBookResDto; +//# sourceMappingURL=FirstPartMainPageResDto.js.map \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map new file mode 100644 index 0000000..be3910d --- /dev/null +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petChapter/ChapterList.js b/dist/dto/petChapter/ChapterList.js new file mode 100644 index 0000000..709055e --- /dev/null +++ b/dist/dto/petChapter/ChapterList.js @@ -0,0 +1,30 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.ChapterResDto = exports.ChapterListResDto = void 0; +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +const dateMethod = require('../../modules/dateMethod'); +class ChapterListResDto { + constructor() { + this.tableContents = []; + } + setChapterList(chapter) { + this.tableContents.push(chapter); + } +} +exports.ChapterListResDto = ChapterListResDto; +class ChapterResDto { + constructor(firstPartTableContents) { + this.chapterId = null; + this.chapter = null; + this.chapterTitle = null; + this.chapterId = firstPartTableContents._id; + this.chapter = firstPartTableContents.chapter; + this.chapterTitle = firstPartTableContents.title; + } +} +exports.ChapterResDto = ChapterResDto; +//# sourceMappingURL=ChapterList.js.map \ No newline at end of file diff --git a/dist/dto/petChapter/ChapterList.js.map b/dist/dto/petChapter/ChapterList.js.map new file mode 100644 index 0000000..1cff0cc --- /dev/null +++ b/dist/dto/petChapter/ChapterList.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAKtB,YAAY,sBAA8C;QAJ/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QAGxB,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;IAClD,CAAC;CACJ;AAVD,sCAUC"} \ No newline at end of file diff --git a/dist/dto/petChapter/PetChapterDiary.js b/dist/dto/petChapter/PetChapterDiary.js new file mode 100644 index 0000000..5cdaa49 --- /dev/null +++ b/dist/dto/petChapter/PetChapterDiary.js @@ -0,0 +1,69 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.DiariesResDto = exports.MonthlyDiaryResDto = exports.PetChapterDiaryResDto = void 0; +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +const dateMethod = require('../../modules/dateMethod'); +class PetChapterDiaryResDto { + constructor(firstPartTableContents) { + this.petChapterDiary = { + chapterId: null, + chapter: null, + chapterTitle: null, + monthly: [], + }; + this.petChapterDiary.chapterId = firstPartTableContents._id; + this.petChapterDiary.chapter = firstPartTableContents.chapter; + this.petChapterDiary.chapterTitle = firstPartTableContents.title; + } + setMonthly(monthly) { + this.petChapterDiary.monthly.push(monthly); + } +} +exports.PetChapterDiaryResDto = PetChapterDiaryResDto; +class MonthlyDiaryResDto { + constructor() { + this.episodePerMonthCount = null; + this.month = null; + this.diaries = []; + } + setMonthCount(monthCount) { this.episodePerMonthCount = monthCount; } + setMonth(month) { this.month = month; } + setDiaries(diary) { + this.diaries.push(diary); + } +} +exports.MonthlyDiaryResDto = MonthlyDiaryResDto; +class DiariesResDto { + constructor(diary) { + this.diaryId = null; + this.title = null; + this.contents = null; + this.episode = null; + this.image = null; + this.feelingCount = null; + this.feeling = null; + this.date = null; + this.weekday = null; + this.kind = null; + const week = new Array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'); + this.diaryId = diary._id; + this.title = diary.title; + this.contents = diary.contents; + this.episode = diary.episode; + this.image = diary.imgs[0]; //가장 첫번째 사진 + this.feelingCount = diary.petEmotions.length; + this.feeling = diary.petEmotions[0].feeling; + this.date = diary.date.getDate() + "일"; + this.weekday = week[diary.date.getDate()]; + this.kind = diary.pets[0].kind; + } + setFeeling(petEmotion) { + this.feeling = petEmotion; + } +} +exports.DiariesResDto = DiariesResDto; +//# sourceMappingURL=PetChapterDiary.js.map \ No newline at end of file diff --git a/dist/dto/petChapter/PetChapterDiary.js.map b/dist/dto/petChapter/PetChapterDiary.js.map new file mode 100644 index 0000000..cfc9675 --- /dev/null +++ b/dist/dto/petChapter/PetChapterDiary.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetChapterDiary.js","sourceRoot":"","sources":["../../../src/dto/petChapter/PetChapterDiary.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petDiary/PetDiaryPageResDto.js b/dist/dto/petDiary/PetDiaryPageResDto.js new file mode 100644 index 0000000..9fc494a --- /dev/null +++ b/dist/dto/petDiary/PetDiaryPageResDto.js @@ -0,0 +1,53 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.PetDiaryPageResDto = void 0; +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/FirstPartTableContents'); +const dateMethod = require('../../modules/dateMethod'); +class PetDiaryPageResDto { + constructor(petDiary) { + this.petDiary = { + _id: null, + //chapter:null, + episode: null, + title: null, + bookImg: [], + date: null, + contents: null, + timeTogether: null, + kind: null, + feelingList: [] + }; + this.init(petDiary); + } + init(petDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.petDiary._id = petDiary._id; + //this.petDiaryPage.chapter=temp.chapter + this.petDiary.title = petDiary.title; + this.petDiary.bookImg = petDiary.imgs; + this.petDiary.date = yield dateMethod.toKoreanByFormatting(petDiary.date); + this.petDiary.episode = petDiary.episode; + this.petDiary.contents = petDiary.contents; + this.petDiary.kind = petDiary.pets[0].kind; + this.petDiary.timeTogether = yield dateMethod.getElapsedDay(petDiary.pets[0].startDate); + }); + } + setFeelingList(emotion) { + this.petDiary.feelingList.push(emotion.feeling); + } +} +exports.PetDiaryPageResDto = PetDiaryPageResDto; +//# sourceMappingURL=PetDiaryPageResDto.js.map \ No newline at end of file diff --git a/dist/dto/petDiary/PetDiaryPageResDto.js.map b/dist/dto/petDiary/PetDiaryPageResDto.js.map new file mode 100644 index 0000000..c92a228 --- /dev/null +++ b/dist/dto/petDiary/PetDiaryPageResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetDiaryPageResDto.js","sourceRoot":"","sources":["../../../src/dto/petDiary/PetDiaryPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,kBAAkB;IAe3B,YAAY,QAAmB;QAdxB,aAAQ,GAAG;YACd,GAAG,EAAE,IAAI;YACT,eAAe;YACf,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,EAAE;SAClB,CAAA;QAIG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IACK,IAAI,CAAC,QAAmB;;YAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAA;YAChC,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;YACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAA;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACzE,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;YACxC,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC3F,CAAC;KAAA;IACD,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;CAEJ;AAjCD,gDAiCC"} \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js new file mode 100644 index 0000000..bb8496b --- /dev/null +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js @@ -0,0 +1,50 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.HelpResDto = exports.MemoriesResDto = exports.RainbowMainPageResDto = void 0; +class RainbowMainPageResDto { + constructor(book, isRainbowPet, rainbowButtonCheck) { + this.rainbowMainPage = { + title: null, + bookImg: null, + rainbowCheck: false, + memories: [], + help: [] + }; + this.rainbowMainPage.title = isRainbowPet ? "우리들의 무지개" : "무지개 준비하기"; //작가와 무지개다리를 건넌 동물의 이름 합친거 + this.rainbowMainPage.bookImg = book.imgs; + this.rainbowMainPage.rainbowCheck = rainbowButtonCheck; + } + setMemories(memories) { + this.rainbowMainPage.memories = memories; + } + setHelp(helps) { + this.rainbowMainPage.help = helps; + } +} +exports.RainbowMainPageResDto = RainbowMainPageResDto; +class MemoriesResDto { + constructor(petDiaries, petId) { + const diaryIndex = this.getRandomMemoryIndex(petDiaries.length); + const randomDiary = petDiaries[diaryIndex]; + console.log("랜덤된 petEmotion " + randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]); + this.title = randomDiary.title; + this.contents = randomDiary.contents; + this.date = randomDiary.date; + this.feeling = randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0].feeling; + } + getRandomMemoryIndex(max) { + let min = Math.ceil(0); + max = Math.floor(max); + return Math.floor(Math.random() * (max - min)) + min; + } +} +exports.MemoriesResDto = MemoriesResDto; +class HelpResDto { + constructor(help) { + this.classification = help.classification; + this.title = help.title; + this.url = help.url; + } +} +exports.HelpResDto = HelpResDto; +//# sourceMappingURL=RainbowMainPageResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map new file mode 100644 index 0000000..1402479 --- /dev/null +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAMvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AAxBD,wCAwBC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js new file mode 100644 index 0000000..04fd394 --- /dev/null +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js @@ -0,0 +1,13 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.PartingRainbowResDto = void 0; +class PartingRainbowResDto { + constructor(diaryCount, petName) { + this.partingRainbowBridge = { + contents: "" + }; + this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.`; + } +} +exports.PartingRainbowResDto = PartingRainbowResDto; +//# sourceMappingURL=PartingRainbowResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map new file mode 100644 index 0000000..69c711b --- /dev/null +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;IAK7B,YAAY,UAAmB,EAAE,OAAgB;QAJ1C,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;SAChB,CAAA;QAGG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,OAAO,oKAAoK,CAAA;IAC1P,CAAC;CACJ;AARD,oDAQC"} \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/PetNameResDto.js b/dist/dto/rainbow/petDto/PetNameResDto.js new file mode 100644 index 0000000..af90f01 --- /dev/null +++ b/dist/dto/rainbow/petDto/PetNameResDto.js @@ -0,0 +1,10 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.PetNameResDto = void 0; +class PetNameResDto { + constructor(pet) { + this.name = pet.name; + } +} +exports.PetNameResDto = PetNameResDto; +//# sourceMappingURL=PetNameResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/PetNameResDto.js.map b/dist/dto/rainbow/petDto/PetNameResDto.js.map new file mode 100644 index 0000000..182475a --- /dev/null +++ b/dist/dto/rainbow/petDto/PetNameResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetNameResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/petDto/PetNameResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,aAAa;IAGtB,YAAY,GAAU;QAClB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AAND,sCAMC"} \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/RainbowPetResDto.js b/dist/dto/rainbow/petDto/RainbowPetResDto.js new file mode 100644 index 0000000..63e44c4 --- /dev/null +++ b/dist/dto/rainbow/petDto/RainbowPetResDto.js @@ -0,0 +1,19 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MyPetInfoResDto = exports.RainbowPetResDto = void 0; +class RainbowPetResDto { + constructor(myPetInfoResDto) { + this.pet = []; + this.pet = myPetInfoResDto; + } +} +exports.RainbowPetResDto = RainbowPetResDto; +class MyPetInfoResDto { + constructor(pet) { + this._id = pet._id; + this.name = pet.name; + this.img = pet.imgs; + } +} +exports.MyPetInfoResDto = MyPetInfoResDto; +//# sourceMappingURL=RainbowPetResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/RainbowPetResDto.js.map b/dist/dto/rainbow/petDto/RainbowPetResDto.js.map new file mode 100644 index 0000000..ce6a766 --- /dev/null +++ b/dist/dto/rainbow/petDto/RainbowPetResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"RainbowPetResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/petDto/RainbowPetResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAGzB,YAAY,eAAmC;QAFxC,QAAG,GAAG,EAAE,CAAA;QAGX,IAAI,CAAC,GAAG,GAAG,eAAe,CAAA;IAC9B,CAAC;CACJ;AAND,4CAMC;AAED,MAAa,eAAe;IAKxB,YAAY,GAAU;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;QAClB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAA;IACvB,CAAC;CACJ;AAVD,0CAUC"} \ No newline at end of file diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js new file mode 100644 index 0000000..685698e --- /dev/null +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js @@ -0,0 +1,24 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.BookInfoResDto = exports.ReadyPartingAndStartRecordResDto = void 0; +class ReadyPartingAndStartRecordResDto { + constructor(diaryCount, dayTogether, bookInfo) { + this.diaryCount = 0; + this.dayTogether = 0; + this.bookInfo = {}; + this.diaryCount = diaryCount; + this.dayTogether = dayTogether; + this.bookInfo = bookInfo; + } +} +exports.ReadyPartingAndStartRecordResDto = ReadyPartingAndStartRecordResDto; +class BookInfoResDto { + constructor(book) { + this.title = null; + this.bookImg = null; + this.title = book.title; + this.bookImg = book.imgs; + } +} +exports.BookInfoResDto = BookInfoResDto; +//# sourceMappingURL=ReadyPartingAndStartRecordResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map new file mode 100644 index 0000000..df79062 --- /dev/null +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ReadyPartingAndStartRecordResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gCAAgC;IAKzC,YAAY,UAAmB,EAAE,WAAoB,EAAE,QAAyB;QAJhF,eAAU,GAAG,CAAC,CAAC;QACf,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,EAAE,CAAA;QAGT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAVD,4EAUC;AAED,MAAa,cAAc;IAIvB,YAAY,IAAY;QAHxB,UAAK,GAAG,IAAI,CAAC;QACb,YAAO,GAAG,IAAI,CAAC;QAGX,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC5B,CAAC;CACJ;AARD,wCAQC"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js new file mode 100644 index 0000000..56d55ac --- /dev/null +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -0,0 +1,67 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.TheBestMomentDiary = exports.TheBestMoment = exports.TheBestMomentPetInformation = exports.TheBestMomentsResDto = void 0; +const dateMethod = require("../../../modules/dateMethod"); +class TheBestMomentsResDto { + constructor() { + this.pet = {}; + this.theBestMoments = []; + } + setTheBestMoment(theBestMoment) { + this.theBestMoments.push(theBestMoment); + } + setTheBestMomentPetInfo(petInfo) { + this.pet = petInfo; + } +} +exports.TheBestMomentsResDto = TheBestMomentsResDto; +class TheBestMomentPetInformation { + constructor(pet) { + this.name = null; + this.kind = null; + this.name = pet.name; + this.kind = pet.kind; + } +} +exports.TheBestMomentPetInformation = TheBestMomentPetInformation; +class TheBestMoment { + constructor(commentPerFeeling, theBestMomentDiary) { + this.comment = null; + this.feeling = null; + this.diaries = []; + this.comment = commentPerFeeling.comments; + this.feeling = commentPerFeeling.feeling; + this.diaries = theBestMomentDiary; + } +} +exports.TheBestMoment = TheBestMoment; +class TheBestMomentDiary { + constructor(diaryPerFeeling) { + this.chapter = null; + this.episode = null; + this.title = null; + this.contents = null; + this.date = null; + this.init(diaryPerFeeling); + } + init(diaryPerFeeling) { + return __awaiter(this, void 0, void 0, function* () { + this.chapter = diaryPerFeeling.tableContents.chapter; + this.episode = diaryPerFeeling.episode; + this.title = diaryPerFeeling.title; + this.contents = diaryPerFeeling.contents; + this.date = yield dateMethod.toStringByFormatting(diaryPerFeeling.date); + }); + } +} +exports.TheBestMomentDiary = TheBestMomentDiary; +//# sourceMappingURL=TheBestMomentResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map new file mode 100644 index 0000000..822a9f3 --- /dev/null +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAA6B,EAAE,kBAAyC;QAJ5E,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAlBD,gDAkBC"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js new file mode 100644 index 0000000..2e966cb --- /dev/null +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js @@ -0,0 +1,26 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.TheBestMomentSubResDto = void 0; +const dateMethod = require("../../../modules/dateMethod"); +class TheBestMomentSubResDto { + constructor(pet, theBestMoment) { + this.init(pet, theBestMoment); + } + init(pet, theBestMoment) { + return __awaiter(this, void 0, void 0, function* () { + this.rainbowComment = `작가님과 함께했던 ${yield dateMethod.getElapsedDay(pet.startDate)}일의 시간동안\n${pet.name}는 의젓하고 당당한 ${pet.name}으로써\n행복한 인생을 보낼 수 있었어요.\n이젠 ${pet.name}가 느꼇던 최고의 순간들을\n모아봤어요!`; + this.rainbowBestMoment = theBestMoment; + }); + } +} +exports.TheBestMomentSubResDto = TheBestMomentSubResDto; +//# sourceMappingURL=TheBestMomentSubResDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js.map new file mode 100644 index 0000000..f345301 --- /dev/null +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"TheBestMomentSubResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentSubResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAI,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAE1D,MAAa,sBAAsB;IAI/B,YAAY,GAAS,EAAE,aAAoC;QACvD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IACjC,CAAC;IAEK,IAAI,CAAC,GAAS,EAAE,aAAoC;;YACtD,IAAI,CAAC,cAAc,GAAG,aAAa,MAAM,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,GAAG,CAAC,IAAI,cAAc,GAAG,CAAC,IAAI,+BAA+B,GAAG,CAAC,IAAI,wBAAwB,CAAA;YACzL,IAAI,CAAC,iBAAiB,GAAG,aAAa,CAAA;QAC1C,CAAC;KAAA;CACJ;AAZD,wDAYC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartChapterListResDto.js b/dist/dto/secondPart/SecondPartChapterListResDto.js new file mode 100644 index 0000000..6807958 --- /dev/null +++ b/dist/dto/secondPart/SecondPartChapterListResDto.js @@ -0,0 +1,22 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SecondPartChapterList = exports.SecondPartChapterListResDto = void 0; +class SecondPartChapterListResDto { + constructor(secondPartChapterList) { + this.tableContents = []; + this.tableContents = secondPartChapterList.map(chapter => new SecondPartChapterList(chapter)); + } +} +exports.SecondPartChapterListResDto = SecondPartChapterListResDto; +class SecondPartChapterList { + constructor(chapter) { + this._id = null; + this.chapter = null; + this.title = null; + this._id = chapter._id; + this.chapter = chapter.chapter; + this.title = chapter.title; + } +} +exports.SecondPartChapterList = SecondPartChapterList; +//# sourceMappingURL=SecondPartChapterListResDto.js.map \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartChapterListResDto.js.map b/dist/dto/secondPart/SecondPartChapterListResDto.js.map new file mode 100644 index 0000000..7bfae40 --- /dev/null +++ b/dist/dto/secondPart/SecondPartChapterListResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SecondPartChapterListResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartChapterListResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,2BAA2B;IAGpC,YAAY,qBAAkD;QAFtD,kBAAa,GAA6B,EAAE,CAAA;QAGhD,IAAI,CAAC,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAA,EAAE,CACpD,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC3C,CAAC;CACJ;AAPD,kEAOC;AAED,MAAa,qBAAqB;IAK9B,YAAY,OAAkC;QAJtC,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QAGhB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;QAC9B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;IAC9B,CAAC;CACJ;AAVD,sDAUC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js new file mode 100644 index 0000000..b6ff85ef --- /dev/null +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js @@ -0,0 +1,48 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SecondPartDiaries = exports.SecondPartDiariesOfMonth = exports.SecondPartDiariesOfMonthResDto = void 0; +class SecondPartDiariesOfMonthResDto { + constructor(tableContents, secondPartyDiariesOfMonth) { + this._id = null; + this.chapter = null; + this.chapterTitle = null; + this.diariesOfMonth = []; + this._id = tableContents._id; + this.chapter = tableContents.chapter; + this.chapterTitle = tableContents.title; + this.diariesOfMonth = secondPartyDiariesOfMonth; + } +} +exports.SecondPartDiariesOfMonthResDto = SecondPartDiariesOfMonthResDto; +class SecondPartDiariesOfMonth { + constructor(month, userDiaries) { + this.month = null; + this.diaryCountOfTableContents = null; + this.diaries = []; + this.month = month; + this.diaryCountOfTableContents = userDiaries.length; + this.diaries.push(userDiaries.sort((a, b) => b.date.getDate() - a.date.getDate()).map(diary => new SecondPartDiaries(diary))); + } +} +exports.SecondPartDiariesOfMonth = SecondPartDiariesOfMonth; +class SecondPartDiaries { + constructor(userDiary) { + this.days = null; + this.dayOfWeek = null; + this.feeling = null; + this.kind = null; + this.title = null; + this.contents = null; + this.img = null; + const weeks = ["일", "월", "화", "수", "목", "금", "토"]; + this.days = userDiary.date.getDate(); + this.dayOfWeek = weeks[userDiary.date.getDay()]; + this.feeling = userDiary.feeling; + this.kind = 0; + this.title = userDiary.title; + this.contents = userDiary.contents; + this.img = userDiary.imgs[0]; + } +} +exports.SecondPartDiaries = SecondPartDiaries; +//# sourceMappingURL=SecondPartDiariesOfMonthResDto.js.map \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map new file mode 100644 index 0000000..5261b1b --- /dev/null +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SecondPartDiariesOfMonthResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts"],"names":[],"mappings":";;;AAGA,MAAa,8BAA8B;IAMvC,YAAY,aAAwC,EAAE,yBAAsD;QALpG,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,iBAAY,GAAG,IAAI,CAAA;QACnB,mBAAc,GAAG,EAAE,CAAA;QAGvB,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,KAAK,CAAA;QACvC,IAAI,CAAC,cAAc,GAAG,yBAAyB,CAAA;IACnD,CAAC;CACJ;AAZD,wEAYC;AAED,MAAa,wBAAwB;IAKjC,YAAY,KAAc,EAAE,WAA0B;QAJ9C,UAAK,GAAG,IAAI,CAAA;QACZ,8BAAyB,GAAG,IAAI,CAAA;QAChC,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CACtC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;CACJ;AAZD,4DAYC;AAED,MAAa,iBAAiB;IAS1B,YAAY,SAAsB;QAR1B,SAAI,GAAG,IAAI,CAAA;QACX,cAAS,GAAG,IAAI,CAAA;QAChB,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,QAAG,GAAG,IAAI,CAAA;QAGd,MAAM,KAAK,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,CAAC,CAAA;QAE3C,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CACJ;AApBD,8CAoBC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartMainPageResDto.js b/dist/dto/secondPart/SecondPartMainPageResDto.js new file mode 100644 index 0000000..1ffab98 --- /dev/null +++ b/dist/dto/secondPart/SecondPartMainPageResDto.js @@ -0,0 +1,84 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SecondPartMainPageFirstPartBook = exports.SecondPartMainPageTableContents = exports.SecondPartMainPageDiary = exports.SecondPartMainPageMemory = exports.SecondPartMainPageResDto = void 0; +const dateMethod = require('../../modules/dateMethod'); +class SecondPartMainPageResDto { + constructor(user, sortUserDiary) { + this.part = null; + this.author = null; + this.bookImg = null; + this.memory = null; + this.tableContents = null; + this.firstPartBook = null; + this.part = 2; + this.author = user.book.author; + this.bookImg = user.book.imgs; + this.memory = new SecondPartMainPageMemory(sortUserDiary); + this.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents => new SecondPartMainPageTableContents(secondPartTableContents)); + this.firstPartBook = new SecondPartMainPageFirstPartBook(user.book); + } +} +exports.SecondPartMainPageResDto = SecondPartMainPageResDto; +class SecondPartMainPageMemory { + constructor(sortUserDiary) { + this.diary = null; + this.nextEpisode = null; + this.diary = new SecondPartMainPageDiary(sortUserDiary); + this.nextEpisode = sortUserDiary.episode + 1; + } +} +exports.SecondPartMainPageMemory = SecondPartMainPageMemory; +class SecondPartMainPageDiary { + constructor(sortUserDiary) { + this.episode = null; + this.title = null; + this.contents = null; + this.date = null; + this.init(sortUserDiary); + } + init(sortUserDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.episode = sortUserDiary.episode; + this.title = sortUserDiary.title; + this.contents = sortUserDiary.contents; + this.date = yield dateMethod.toStringByFormatting(sortUserDiary.date); + }); + } +} +exports.SecondPartMainPageDiary = SecondPartMainPageDiary; +class SecondPartMainPageTableContents { + constructor(secondPartTableContents) { + this.chapter = null; + this.title = null; + this.episodePerChapterCount = null; + this._id = null; + this.chapter = secondPartTableContents.chapter; + this.title = secondPartTableContents.title; + this._id = secondPartTableContents._id; + this.episodePerChapterCount = secondPartTableContents.userDiary.length; + } +} +exports.SecondPartMainPageTableContents = SecondPartMainPageTableContents; +class SecondPartMainPageFirstPartBook { + constructor(book) { + this._id = null; + this.bookImg = null; + this.author = null; + this.date = null; + this._id = book._id; + this.bookImg = book.imgs; + this.author = book.author; + this.date = book.date; + } +} +exports.SecondPartMainPageFirstPartBook = SecondPartMainPageFirstPartBook; +//# sourceMappingURL=SecondPartMainPageResDto.js.map \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartMainPageResDto.js.map b/dist/dto/secondPart/SecondPartMainPageResDto.js.map new file mode 100644 index 0000000..f918933 --- /dev/null +++ b/dist/dto/secondPart/SecondPartMainPageResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SecondPartMainPageResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/index.js b/dist/index.js new file mode 100644 index 0000000..432fd34 --- /dev/null +++ b/dist/index.js @@ -0,0 +1,35 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const express_1 = __importDefault(require("express")); +const app = express_1.default(); +const db_1 = __importDefault(require("./logger/db")); +// Connect Database +db_1.default(); +app.use(express_1.default.json()); +// Define Routes +app.use('/api', require('./api/router/index')); +// error handler +app.use(function (err, req, res, next) { + // set locals, only providing error in development + res.locals.message = err.message; + res.locals.error = req.app.get("env") === "production" ? err : {}; + // render the error page + res.status(err.status || 500); + res.render("error"); +}); +app + .listen(5000, () => { + console.log(` + ################################################ + 🛡️ Server listening on port: 5000 🛡️ + ################################################ + `); +}) + .on("error", (err) => { + console.error(err); + process.exit(1); +}); +//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map new file mode 100644 index 0000000..388ab0f --- /dev/null +++ b/dist/index.js.map @@ -0,0 +1 @@ +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,MAAM,GAAG,GAAG,iBAAO,EAAE,CAAC;AACtB,qDAAoC;AAEpC,mBAAmB;AACnB,YAAS,EAAE,CAAC;AACZ,GAAG,CAAC,GAAG,CAAC,iBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AAExB,gBAAgB;AAChB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAA;AAE7C,gBAAgB;AAChB,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI;IACnC,kDAAkD;IAClD,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IACjC,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAElE,wBAAwB;IACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC9B,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,GAAG;KACA,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;IACjB,OAAO,CAAC,GAAG,CAAC;;;;GAIb,CAAC,CAAC;AACH,CAAC,CAAC;KACD,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;IACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/dist/interfaces/book/IBook.js b/dist/interfaces/book/IBook.js new file mode 100644 index 0000000..750d35d --- /dev/null +++ b/dist/interfaces/book/IBook.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IBook.js.map \ No newline at end of file diff --git a/dist/interfaces/book/IBook.js.map b/dist/interfaces/book/IBook.js.map new file mode 100644 index 0000000..aa0591d --- /dev/null +++ b/dist/interfaces/book/IBook.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IBook.js","sourceRoot":"","sources":["../../../src/interfaces/book/IBook.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/diary/IPetDiary.js b/dist/interfaces/diary/IPetDiary.js new file mode 100644 index 0000000..efb2d5b --- /dev/null +++ b/dist/interfaces/diary/IPetDiary.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IPetDiary.js.map \ No newline at end of file diff --git a/dist/interfaces/diary/IPetDiary.js.map b/dist/interfaces/diary/IPetDiary.js.map new file mode 100644 index 0000000..2bd1b44 --- /dev/null +++ b/dist/interfaces/diary/IPetDiary.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IPetDiary.js","sourceRoot":"","sources":["../../../src/interfaces/diary/IPetDiary.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/diary/IPetEmotions.js b/dist/interfaces/diary/IPetEmotions.js new file mode 100644 index 0000000..a7e1451 --- /dev/null +++ b/dist/interfaces/diary/IPetEmotions.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IPetEmotions.js.map \ No newline at end of file diff --git a/dist/interfaces/diary/IPetEmotions.js.map b/dist/interfaces/diary/IPetEmotions.js.map new file mode 100644 index 0000000..fe5177b --- /dev/null +++ b/dist/interfaces/diary/IPetEmotions.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IPetEmotions.js","sourceRoot":"","sources":["../../../src/interfaces/diary/IPetEmotions.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/diary/IUserDiary.js b/dist/interfaces/diary/IUserDiary.js new file mode 100644 index 0000000..e4e5240 --- /dev/null +++ b/dist/interfaces/diary/IUserDiary.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IUserDiary.js.map \ No newline at end of file diff --git a/dist/interfaces/diary/IUserDiary.js.map b/dist/interfaces/diary/IUserDiary.js.map new file mode 100644 index 0000000..0d7cff3 --- /dev/null +++ b/dist/interfaces/diary/IUserDiary.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IUserDiary.js","sourceRoot":"","sources":["../../../src/interfaces/diary/IUserDiary.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/etc/IComments.js b/dist/interfaces/etc/IComments.js new file mode 100644 index 0000000..a6ab680 --- /dev/null +++ b/dist/interfaces/etc/IComments.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IComments.js.map \ No newline at end of file diff --git a/dist/interfaces/etc/IComments.js.map b/dist/interfaces/etc/IComments.js.map new file mode 100644 index 0000000..cd64731 --- /dev/null +++ b/dist/interfaces/etc/IComments.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IComments.js","sourceRoot":"","sources":["../../../src/interfaces/etc/IComments.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/etc/IHelp.js b/dist/interfaces/etc/IHelp.js new file mode 100644 index 0000000..ae2cfc1 --- /dev/null +++ b/dist/interfaces/etc/IHelp.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IHelp.js.map \ No newline at end of file diff --git a/dist/interfaces/etc/IHelp.js.map b/dist/interfaces/etc/IHelp.js.map new file mode 100644 index 0000000..5cbcc4e --- /dev/null +++ b/dist/interfaces/etc/IHelp.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IHelp.js","sourceRoot":"","sources":["../../../src/interfaces/etc/IHelp.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/etc/IInstitution.js b/dist/interfaces/etc/IInstitution.js new file mode 100644 index 0000000..1aadbc6 --- /dev/null +++ b/dist/interfaces/etc/IInstitution.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IInstitution.js.map \ No newline at end of file diff --git a/dist/interfaces/etc/IInstitution.js.map b/dist/interfaces/etc/IInstitution.js.map new file mode 100644 index 0000000..e0d79ea --- /dev/null +++ b/dist/interfaces/etc/IInstitution.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IInstitution.js","sourceRoot":"","sources":["../../../src/interfaces/etc/IInstitution.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/pet/IPet.js b/dist/interfaces/pet/IPet.js new file mode 100644 index 0000000..ceb9c8b --- /dev/null +++ b/dist/interfaces/pet/IPet.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IPet.js.map \ No newline at end of file diff --git a/dist/interfaces/pet/IPet.js.map b/dist/interfaces/pet/IPet.js.map new file mode 100644 index 0000000..4ad0dc8 --- /dev/null +++ b/dist/interfaces/pet/IPet.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IPet.js","sourceRoot":"","sources":["../../../src/interfaces/pet/IPet.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/tableContents/IFirstPartTableContents.js b/dist/interfaces/tableContents/IFirstPartTableContents.js new file mode 100644 index 0000000..34f9ddb --- /dev/null +++ b/dist/interfaces/tableContents/IFirstPartTableContents.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IFirstPartTableContents.js.map \ No newline at end of file diff --git a/dist/interfaces/tableContents/IFirstPartTableContents.js.map b/dist/interfaces/tableContents/IFirstPartTableContents.js.map new file mode 100644 index 0000000..fc8df07 --- /dev/null +++ b/dist/interfaces/tableContents/IFirstPartTableContents.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IFirstPartTableContents.js","sourceRoot":"","sources":["../../../src/interfaces/tableContents/IFirstPartTableContents.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/tableContents/ISecondPartTableContents.js b/dist/interfaces/tableContents/ISecondPartTableContents.js new file mode 100644 index 0000000..1e9e772 --- /dev/null +++ b/dist/interfaces/tableContents/ISecondPartTableContents.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=ISecondPartTableContents.js.map \ No newline at end of file diff --git a/dist/interfaces/tableContents/ISecondPartTableContents.js.map b/dist/interfaces/tableContents/ISecondPartTableContents.js.map new file mode 100644 index 0000000..8b2dd82 --- /dev/null +++ b/dist/interfaces/tableContents/ISecondPartTableContents.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ISecondPartTableContents.js","sourceRoot":"","sources":["../../../src/interfaces/tableContents/ISecondPartTableContents.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/tableContents/ITableContents.js b/dist/interfaces/tableContents/ITableContents.js new file mode 100644 index 0000000..f7ff167 --- /dev/null +++ b/dist/interfaces/tableContents/ITableContents.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=ITableContents.js.map \ No newline at end of file diff --git a/dist/interfaces/tableContents/ITableContents.js.map b/dist/interfaces/tableContents/ITableContents.js.map new file mode 100644 index 0000000..3178875 --- /dev/null +++ b/dist/interfaces/tableContents/ITableContents.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ITableContents.js","sourceRoot":"","sources":["../../../src/interfaces/tableContents/ITableContents.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/interfaces/user/IUser.js b/dist/interfaces/user/IUser.js new file mode 100644 index 0000000..6d13f68 --- /dev/null +++ b/dist/interfaces/user/IUser.js @@ -0,0 +1,3 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//# sourceMappingURL=IUser.js.map \ No newline at end of file diff --git a/dist/interfaces/user/IUser.js.map b/dist/interfaces/user/IUser.js.map new file mode 100644 index 0000000..b4ab6fd --- /dev/null +++ b/dist/interfaces/user/IUser.js.map @@ -0,0 +1 @@ +{"version":3,"file":"IUser.js","sourceRoot":"","sources":["../../../src/interfaces/user/IUser.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/logger/db.js b/dist/logger/db.js new file mode 100644 index 0000000..3d6940a --- /dev/null +++ b/dist/logger/db.js @@ -0,0 +1,32 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const config_1 = __importDefault(require("../config")); +const connectDB = () => __awaiter(void 0, void 0, void 0, function* () { + try { + yield mongoose_1.default.connect(config_1.default.mongoURI, { + useNewUrlParser: true, + useCreateIndex: true, + useUnifiedTopology: true, + }); + console.log("Mongoose Connected ..."); + } + catch (err) { + console.error(err.message); + process.exit(1); + } +}); +exports.default = connectDB; +//# sourceMappingURL=db.js.map \ No newline at end of file diff --git a/dist/logger/db.js.map b/dist/logger/db.js.map new file mode 100644 index 0000000..8074f6e --- /dev/null +++ b/dist/logger/db.js.map @@ -0,0 +1 @@ +{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/logger/db.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAAgC;AAChC,uDAA+B;AAE/B,MAAM,SAAS,GAAG,GAAS,EAAE;IAC3B,IAAI;QACF,MAAM,kBAAQ,CAAC,OAAO,CAAC,gBAAM,CAAC,QAAQ,EAAE;YACtC,eAAe,EAAE,IAAI;YACrB,cAAc,EAAE,IAAI;YACpB,kBAAkB,EAAE,IAAI;SACzB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;KACvC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAA,CAAC;AAEF,kBAAe,SAAS,CAAC"} \ No newline at end of file diff --git a/dist/models/book/Book.js b/dist/models/book/Book.js new file mode 100644 index 0000000..b92d0da --- /dev/null +++ b/dist/models/book/Book.js @@ -0,0 +1,35 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const BookSchema = new mongoose_1.default.Schema({ + title: { type: String }, + author: { type: String }, + imgs: { type: String }, + tableContents: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "TableContents" + }, + date: { + type: Date, + default: Date.now() + } +}); +BookSchema.methods.setTableContents = function (tableContents) { + return __awaiter(this, void 0, void 0, function* () { + this.tableContents = tableContents; + }); +}; +exports.default = mongoose_1.default.model("Book", BookSchema, "books"); +//# sourceMappingURL=Book.js.map \ No newline at end of file diff --git a/dist/models/book/Book.js.map b/dist/models/book/Book.js.map new file mode 100644 index 0000000..f3048d9 --- /dev/null +++ b/dist/models/book/Book.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Book.js","sourceRoot":"","sources":["../../../src/models/book/Book.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAI3C,MAAM,UAAU,GAA0B,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC1D,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvB,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACxB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACtB,aAAa,EAAE;QACX,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACnC,GAAG,EAAE,eAAe;KACvB;IACD,IAAI,EAAG;QACH,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AACF,UAAU,CAAC,OAAO,CAAC,gBAAgB,GAAC,UAAe,aAA6B;;QAC5E,IAAI,CAAC,aAAa,GAAC,aAAa,CAAA;IACpC,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA4B,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/diary/PetDiary.js b/dist/models/diary/PetDiary.js new file mode 100644 index 0000000..2fd5b48 --- /dev/null +++ b/dist/models/diary/PetDiary.js @@ -0,0 +1,71 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const PetDiarySchema = new mongoose_1.default.Schema({ + pets: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "Pet" + } + ], + tableContents: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "FirstPartTableContents" + }, + title: { + type: String + }, + contents: { + type: String + }, + imgs: [ + { + type: String, + default: [] + } + ], + petEmotions: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "PetEmotions", + default: [] + } + ], + episode: { + type: Number, + default: 0 + }, + date: { + type: Date, + default: Date.now() + } +}); +PetDiarySchema.methods.setPet = function (pet) { + return __awaiter(this, void 0, void 0, function* () { + this.pets.push(pet); + }); +}; +PetDiarySchema.methods.setTableContents = function (tableContents) { + return __awaiter(this, void 0, void 0, function* () { + this.tableContents = tableContents; + }); +}; +PetDiarySchema.methods.setPetEmotions = function (petEmotions) { + return __awaiter(this, void 0, void 0, function* () { + this.petEmotions.push(petEmotions); + }); +}; +exports.default = mongoose_1.default.model("PetDiary", PetDiarySchema, "petDiaries"); +//# sourceMappingURL=PetDiary.js.map \ No newline at end of file diff --git a/dist/models/diary/PetDiary.js.map b/dist/models/diary/PetDiary.js.map new file mode 100644 index 0000000..0d90339 --- /dev/null +++ b/dist/models/diary/PetDiary.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetDiary.js","sourceRoot":"","sources":["../../../src/models/diary/PetDiary.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAAwC;AAMxC,MAAM,cAAc,GAA8B,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAClE,IAAI,EAAG;QACH;YACI,IAAI,EAAG,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACpC,GAAG,EAAG,KAAK;SACd;KACJ;IACD,aAAa,EAAG;QACZ,IAAI,EAAG,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACpC,GAAG,EAAE,wBAAwB;KAChC;IACD,KAAK,EAAG;QACJ,IAAI,EAAG,MAAM;KAChB;IACD,QAAQ,EAAG;QACP,IAAI,EAAG,MAAM;KAChB;IACD,IAAI,EAAG;QACH;YACI,IAAI,EAAG,MAAM;YACb,OAAO,EAAG,EAAE;SACf;KACJ;IACD,WAAW,EAAG;QACV;YACI,IAAI,EAAG,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACpC,GAAG,EAAG,aAAa;YACnB,OAAO,EAAG,EAAE;SACf;KACJ;IACD,OAAO,EAAG;QACN,IAAI,EAAG,MAAM;QACb,OAAO,EAAG,CAAC;KACd;IACD,IAAI,EAAG;QACH,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AAEF,cAAc,CAAC,OAAO,CAAC,MAAM,GAAG,UAAe,GAAU;;QACrD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC;CAAA,CAAA;AAED,cAAc,CAAC,OAAO,CAAC,gBAAgB,GAAG,UAAe,aAAuC;;QAC5F,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACtC,CAAC;CAAA,CAAA;AAED,cAAc,CAAC,OAAO,CAAC,cAAc,GAAG,UAAe,WAA0B;;QAC7E,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACtC,CAAC;CAAA,CAAA;AAID,kBAAe,kBAAQ,CAAC,KAAK,CAAoC,UAAU,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/diary/PetEmotions.js b/dist/models/diary/PetEmotions.js new file mode 100644 index 0000000..16c257b --- /dev/null +++ b/dist/models/diary/PetEmotions.js @@ -0,0 +1,36 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const PetEmotionsSchema = new mongoose_1.default.Schema({ + petDiary: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "PetDiary" + }, + pet: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "Pet" + }, + feeling: { + type: Number, + default: 0 + } +}); +PetEmotionsSchema.methods.setPetDiary = function (petDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.petDiary = petDiary; + }); +}; +exports.default = mongoose_1.default.model("PetEmotions", PetEmotionsSchema, "petEmotions"); +//# sourceMappingURL=PetEmotions.js.map \ No newline at end of file diff --git a/dist/models/diary/PetEmotions.js.map b/dist/models/diary/PetEmotions.js.map new file mode 100644 index 0000000..4f2642e --- /dev/null +++ b/dist/models/diary/PetEmotions.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetEmotions.js","sourceRoot":"","sources":["../../../src/models/diary/PetEmotions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAI3C,MAAM,iBAAiB,GAAiC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IACxE,QAAQ,EAAE;QACN,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACnC,GAAG,EAAE,UAAU;KAClB;IACD,GAAG,EAAE;QACD,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACnC,GAAG,EAAE,KAAK;KACb;IACD,OAAO,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAG,CAAC;KACd;CACJ,CAAC,CAAA;AAEF,iBAAiB,CAAC,OAAO,CAAC,WAAW,GAAG,UAAgB,QAAmB;;QACvE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA0C,aAAa,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/diary/UserDiary.js b/dist/models/diary/UserDiary.js new file mode 100644 index 0000000..b80ef25 --- /dev/null +++ b/dist/models/diary/UserDiary.js @@ -0,0 +1,45 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const UserDiarySchema = new mongoose_1.default.Schema({ + title: { type: String }, + contents: { type: String }, + imgs: [ + { + type: String, + default: [] + } + ], + feeling: { type: Number }, + tableContents: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "SecondPartTableContents" + }, + episode: { + type: Number, + default: 0 + }, + date: { + type: Date, + default: Date.now() + } +}); +UserDiarySchema.methods.setTableContents = function (tableContents) { + return __awaiter(this, void 0, void 0, function* () { + this.tableContents = tableContents; + }); +}; +exports.default = mongoose_1.default.model("UserDiary", UserDiarySchema, "userDiaries"); +//# sourceMappingURL=UserDiary.js.map \ No newline at end of file diff --git a/dist/models/diary/UserDiary.js.map b/dist/models/diary/UserDiary.js.map new file mode 100644 index 0000000..8b29f8e --- /dev/null +++ b/dist/models/diary/UserDiary.js.map @@ -0,0 +1 @@ +{"version":3,"file":"UserDiary.js","sourceRoot":"","sources":["../../../src/models/diary/UserDiary.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAAwC;AAIxC,MAAM,eAAe,GAAgC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IACrE,KAAK,EAAG,EAAE,IAAI,EAAG,MAAM,EAAC;IACxB,QAAQ,EAAG,EAAC,IAAI,EAAG,MAAM,EAAC;IAC1B,IAAI,EAAG;QACH;YACI,IAAI,EAAG,MAAM;YACb,OAAO,EAAG,EAAE;SACf;KACJ;IACD,OAAO,EAAG,EAAC,IAAI,EAAG,MAAM,EAAC;IACzB,aAAa,EAAG;QACZ,IAAI,EAAG,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACpC,GAAG,EAAG,yBAAyB;KAClC;IACD,OAAO,EAAG;QACN,IAAI,EAAG,MAAM;QACb,OAAO,EAAG,CAAC;KACd;IACD,IAAI,EAAG;QACH,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AAEF,eAAe,CAAC,OAAO,CAAC,gBAAgB,GAAG,UAAe,aAAwC;;QAC9F,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACtC,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAAsC,WAAW,EAAC,eAAe,EAAC,aAAa,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/etc/Comments.js b/dist/models/etc/Comments.js new file mode 100644 index 0000000..1c1c9c7 --- /dev/null +++ b/dist/models/etc/Comments.js @@ -0,0 +1,13 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const CommentsSchema = new mongoose_1.default.Schema({ + feeling: { type: Number }, + comments: { type: String }, + classification: { type: Number } +}); +exports.default = mongoose_1.default.model("Comments", CommentsSchema, "comments"); +//# sourceMappingURL=Comments.js.map \ No newline at end of file diff --git a/dist/models/etc/Comments.js.map b/dist/models/etc/Comments.js.map new file mode 100644 index 0000000..9c60ce1 --- /dev/null +++ b/dist/models/etc/Comments.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Comments.js","sourceRoot":"","sources":["../../../src/models/etc/Comments.ts"],"names":[],"mappings":";;;;;AAAA,wDAA2C;AAG3C,MAAM,cAAc,GAA8B,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAClE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1B,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;CACnC,CAAC,CAAA;AAEF,kBAAe,kBAAQ,CAAC,KAAK,CAAoC,UAAU,EAAE,cAAc,EAAE,UAAU,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/etc/Help.js b/dist/models/etc/Help.js new file mode 100644 index 0000000..7c2c85f --- /dev/null +++ b/dist/models/etc/Help.js @@ -0,0 +1,13 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const HelpSchema = new mongoose_1.default.Schema({ + classification: { type: String }, + title: { type: String }, + url: { type: String } +}); +exports.default = mongoose_1.default.model("Help", HelpSchema, "helps"); +//# sourceMappingURL=Help.js.map \ No newline at end of file diff --git a/dist/models/etc/Help.js.map b/dist/models/etc/Help.js.map new file mode 100644 index 0000000..11e528c --- /dev/null +++ b/dist/models/etc/Help.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Help.js","sourceRoot":"","sources":["../../../src/models/etc/Help.ts"],"names":[],"mappings":";;;;;AAAA,wDAA2C;AAG3C,MAAM,UAAU,GAA0B,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC1D,cAAc,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAChC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvB,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;CACxB,CAAC,CAAA;AAEF,kBAAe,kBAAQ,CAAC,KAAK,CAA4B,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/etc/Institution.js b/dist/models/etc/Institution.js new file mode 100644 index 0000000..7a14085 --- /dev/null +++ b/dist/models/etc/Institution.js @@ -0,0 +1,14 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const InstitutionSchema = new mongoose_1.default.Schema({ + feeling: { type: Number }, + type: { type: Number }, + contents: { type: String }, + url: { type: String } +}); +exports.default = mongoose_1.default.model("Institutions", InstitutionSchema, "institutions"); +//# sourceMappingURL=Institution.js.map \ No newline at end of file diff --git a/dist/models/etc/Institution.js.map b/dist/models/etc/Institution.js.map new file mode 100644 index 0000000..90bbed8 --- /dev/null +++ b/dist/models/etc/Institution.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Institution.js","sourceRoot":"","sources":["../../../src/models/etc/Institution.ts"],"names":[],"mappings":";;;;;AAAA,wDAAwC;AAGxC,MAAM,iBAAiB,GAAiC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IACxE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACzB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACtB,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1B,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;CACxB,CAAC,CAAA;AAEF,kBAAe,kBAAQ,CAAC,KAAK,CAA0C,cAAc,EAAC,iBAAiB,EAAC,cAAc,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/pet/Pet.js b/dist/models/pet/Pet.js new file mode 100644 index 0000000..abf6056 --- /dev/null +++ b/dist/models/pet/Pet.js @@ -0,0 +1,50 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const PetSchema = new mongoose_1.default.Schema({ + name: { type: String }, + kind: { type: Number }, + gender: { type: Number }, + imgs: { + type: String + }, + user: { + type: mongoose_1.default.SchemaTypes.ObjectId, ref: "User" + }, + book: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "Book:" + }, + rainbow: { + type: Boolean, + default: false + }, + startDate: { + type: Date, + default: Date.now() + } +}); +PetSchema.methods.setUser = function (user) { + return __awaiter(this, void 0, void 0, function* () { + this.user = user; + }); +}; +PetSchema.methods.setBook = function (book) { + return __awaiter(this, void 0, void 0, function* () { + this.book = book; + }); +}; +exports.default = mongoose_1.default.model("Pet", PetSchema, "pets"); +//# sourceMappingURL=Pet.js.map \ No newline at end of file diff --git a/dist/models/pet/Pet.js.map b/dist/models/pet/Pet.js.map new file mode 100644 index 0000000..59aca84 --- /dev/null +++ b/dist/models/pet/Pet.js.map @@ -0,0 +1 @@ +{"version":3,"file":"Pet.js","sourceRoot":"","sources":["../../../src/models/pet/Pet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAK3C,MAAM,SAAS,GAAyB,IAAI,kBAAQ,CAAC,MAAM,CAAC;IACxD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACtB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACtB,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACxB,IAAI,EAAE;QACF,IAAI,EAAE,MAAM;KACf;IACD,IAAI,EAAE;QACF,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM;KACnD;IACD,IAAI,EAAE;QACF,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACnC,GAAG,EAAE,OAAO;KACf;IACD,OAAO,EAAE;QACL,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,KAAK;KACjB;IACD,SAAS,EAAE;QACP,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB;CACJ,CAAC,CAAA;AAGF,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,UAAgB,IAAW;;QACnD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;CAAA,CAAA;AAED,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,UAAgB,IAAW;;QACnD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA0B,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/tableContents/FirstPartTableContents.js b/dist/models/tableContents/FirstPartTableContents.js new file mode 100644 index 0000000..2086c12 --- /dev/null +++ b/dist/models/tableContents/FirstPartTableContents.js @@ -0,0 +1,42 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const FirstPartTableContentsSchema = new mongoose_1.default.Schema({ + chapter: { + type: Number, + default: 0 + }, + title: { + type: String + }, + contents: { + type: String, + default: null + }, + petDiary: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "PetDiary", + default: [] + } + ] +}); +FirstPartTableContentsSchema.methods.setPetDiary = function (petDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.petDiary.push(petDiary); + }); +}; +exports.default = mongoose_1.default.model("FirstPartTableContents", FirstPartTableContentsSchema, "firstPartTableContents"); +//# sourceMappingURL=FirstPartTableContents.js.map \ No newline at end of file diff --git a/dist/models/tableContents/FirstPartTableContents.js.map b/dist/models/tableContents/FirstPartTableContents.js.map new file mode 100644 index 0000000..f64a92b --- /dev/null +++ b/dist/models/tableContents/FirstPartTableContents.js.map @@ -0,0 +1 @@ +{"version":3,"file":"FirstPartTableContents.js","sourceRoot":"","sources":["../../../src/models/tableContents/FirstPartTableContents.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAI3C,MAAM,4BAA4B,GAA4C,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC9F,OAAO,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAG,CAAC;KACd;IACD,KAAK,EAAE;QACH,IAAI,EAAE,MAAM;KACf;IACD,QAAQ,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,OAAO,EAAG,IAAI;KACjB;IACD,QAAQ,EAAE;QACN;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,UAAU;YACf,OAAO,EAAG,EAAE;SACf;KACJ;CACJ,CAAC,CAAA;AAEF,4BAA4B,CAAC,OAAO,CAAC,WAAW,GAAG,UAAgB,QAAmB;;QAClF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAAgE,wBAAwB,EAAE,4BAA4B,EAAE,wBAAwB,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/tableContents/SecondPartTableContent.js b/dist/models/tableContents/SecondPartTableContent.js new file mode 100644 index 0000000..86479ad --- /dev/null +++ b/dist/models/tableContents/SecondPartTableContent.js @@ -0,0 +1,43 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const SecondPartTableContentsSchema = new mongoose_1.default.Schema({ + chapter: { + type: Number, + default: 0 + }, + title: { + type: String, + default: null + }, + contents: { + type: String, + default: null + }, + userDiary: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "UserDiary", + default: [] + } + ] +}); +SecondPartTableContentsSchema.methods.setUserDiary = function (userDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.userDiary.push(userDiary); + }); +}; +exports.default = mongoose_1.default.model("SecondPartTableContents", SecondPartTableContentsSchema, "secondPartTableContents"); +//# sourceMappingURL=SecondPartTableContent.js.map \ No newline at end of file diff --git a/dist/models/tableContents/SecondPartTableContent.js.map b/dist/models/tableContents/SecondPartTableContent.js.map new file mode 100644 index 0000000..e40e3b0 --- /dev/null +++ b/dist/models/tableContents/SecondPartTableContent.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SecondPartTableContent.js","sourceRoot":"","sources":["../../../src/models/tableContents/SecondPartTableContent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAI3C,MAAM,6BAA6B,GAA6C,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAChG,OAAO,EAAE;QACL,IAAI,EAAE,MAAM;QACZ,OAAO,EAAG,CAAC;KACd;IACD,KAAK,EAAE;QACH,IAAI,EAAE,MAAM;QACZ,OAAO,EAAG,IAAI;KACjB;IACD,QAAQ,EAAG;QACP,IAAI,EAAG,MAAM;QACb,OAAO,EAAG,IAAI;KACjB;IACD,SAAS,EAAE;QACP;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,WAAW;YAChB,OAAO,EAAE,EAAE;SACd;KACJ;CACJ,CAAC,CAAA;AAEF,6BAA6B,CAAC,OAAO,CAAC,YAAY,GAAG,UAAgB,SAAqB;;QACtF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAClC,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAAkE,yBAAyB,EAAE,6BAA6B,EAAE,yBAAyB,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/tableContents/TableContents.js b/dist/models/tableContents/TableContents.js new file mode 100644 index 0000000..93a6990 --- /dev/null +++ b/dist/models/tableContents/TableContents.js @@ -0,0 +1,45 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const TableContentsSchema = new mongoose_1.default.Schema({ + firstPartTableContents: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "FirstPartTableContents" + } + ], + secondPartTableContents: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "SecondPartTableContents" + } + ], + secondPartStartDate: { + type: Date, + default: Date.now() + } +}); +TableContentsSchema.methods.setFirstPartTableContents = function (tableContents) { + return __awaiter(this, void 0, void 0, function* () { + this.firstPartTableContents.push(tableContents); + }); +}; +TableContentsSchema.methods.setSecondPartTableContents = function (tableContents) { + return __awaiter(this, void 0, void 0, function* () { + this.secondPartTableContents.push(tableContents); + }); +}; +exports.default = mongoose_1.default.model("TableContents", TableContentsSchema, "tableContents"); +//# sourceMappingURL=TableContents.js.map \ No newline at end of file diff --git a/dist/models/tableContents/TableContents.js.map b/dist/models/tableContents/TableContents.js.map new file mode 100644 index 0000000..2e4f155 --- /dev/null +++ b/dist/models/tableContents/TableContents.js.map @@ -0,0 +1 @@ +{"version":3,"file":"TableContents.js","sourceRoot":"","sources":["../../../src/models/tableContents/TableContents.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAK3C,MAAM,mBAAmB,GAAmC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC5E,sBAAsB,EAAE;QACpB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,wBAAwB;SAChC;KACJ;IACD,uBAAuB,EAAE;QACrB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,yBAAyB;SACjC;KACJ;IACD,mBAAmB,EAAG;QAClB,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AAEF,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,GAAG,UAAgB,aAAsC;;QAC1G,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACnD,CAAC;CAAA,CAAA;AAED,mBAAmB,CAAC,OAAO,CAAC,0BAA0B,GAAG,UAAgB,aAAuC;;QAC5G,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACpD,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA8C,eAAe,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/user/User.js b/dist/models/user/User.js new file mode 100644 index 0000000..57550cd --- /dev/null +++ b/dist/models/user/User.js @@ -0,0 +1,42 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const mongoose_1 = __importDefault(require("mongoose")); +const UserSchema = new mongoose_1.default.Schema({ + email: { type: String }, + password: { type: String }, + pets: [ + { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "Pet" + } + ], + book: { + type: mongoose_1.default.SchemaTypes.ObjectId, + ref: "Book" + }, + feelingCount: { type: Number } +}); +UserSchema.methods.setPet = function (pet) { + return __awaiter(this, void 0, void 0, function* () { + this.pets.push(pet); + }); +}; +UserSchema.methods.setBook = function (book) { + return __awaiter(this, void 0, void 0, function* () { + this.book = book; + }); +}; +exports.default = mongoose_1.default.model("User", UserSchema, "users"); +//# sourceMappingURL=User.js.map \ No newline at end of file diff --git a/dist/models/user/User.js.map b/dist/models/user/User.js.map new file mode 100644 index 0000000..7e60227 --- /dev/null +++ b/dist/models/user/User.js.map @@ -0,0 +1 @@ +{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/models/user/User.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAK3C,MAAM,UAAU,GAA0B,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC1D,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvB,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1B,IAAI,EAAE;QACF;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,KAAK;SACb;KACJ;IACD,IAAI,EAAE;QACF,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;QACnC,GAAG,EAAE,MAAM;KACd;IACD,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;CACjC,CAAC,CAAA;AAEF,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,UAAgB,GAAS;;QACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvB,CAAC;CAAA,CAAA;AAED,UAAU,CAAC,OAAO,CAAC,OAAO,GAAG,UAAgB,IAAW;;QACpD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IACpB,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA4B,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/modules/dateMethod.js b/dist/modules/dateMethod.js new file mode 100644 index 0000000..9fcd579 --- /dev/null +++ b/dist/modules/dateMethod.js @@ -0,0 +1,51 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +module.exports = { + toStringByFormatting: (source) => __awaiter(this, void 0, void 0, function* () { + const year = source.getFullYear(); + const month = leftPad(source.getMonth() + 1); + const day = leftPad(source.getDate()); + return [year, month, day].join('.'); + function leftPad(value) { + if (value >= 10) { + return value; + } + return `0${value}`; + } + }), + toKoreanByFormatting: (source) => __awaiter(this, void 0, void 0, function* () { + const year = source.getFullYear(); + const month = leftPad(source.getMonth() + 1); + const day = leftPad(source.getDate()); + return year + "년 " + month + "월 " + day + "일"; + function leftPad(value) { + if (value >= 10) { + return value; + } + return `0${value}`; + } + }), + getElapsedDay: (startDate) => __awaiter(this, void 0, void 0, function* () { + const now = new Date(); + const year = now.getFullYear(); + const month = now.getMonth(); + const day = now.getDate(); + startDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate()); + const endDate = new Date(year, month, day); + const elapsedMs = endDate.getTime() - startDate.getTime(); + const elapsedDay = elapsedMs / (1000 * 60 * 60 * 24); + return elapsedDay; + }), + getLastDateOfMonth: (year, month) => __awaiter(this, void 0, void 0, function* () { + const lastDate = new Date(year, month, 0); + return lastDate.getDate(); + }) +}; +//# sourceMappingURL=dateMethod.js.map \ No newline at end of file diff --git a/dist/modules/dateMethod.js.map b/dist/modules/dateMethod.js.map new file mode 100644 index 0000000..1ad0e0f --- /dev/null +++ b/dist/modules/dateMethod.js.map @@ -0,0 +1 @@ +{"version":3,"file":"dateMethod.js","sourceRoot":"","sources":["../../src/modules/dateMethod.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG;IACb,oBAAoB,EAAG,CAAM,MAAM,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QAErC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEnC,SAAS,OAAO,CAAC,KAAK;YAClB,IAAG,KAAK,IAAI,EAAE,EAAC;gBACX,OAAO,KAAK,CAAA;aACf;YACD,OAAO,IAAI,KAAK,EAAE,CAAA;QACtB,CAAC;IACL,CAAC,CAAA;IACD,oBAAoB,EAAG,CAAM,MAAM,EAAE,EAAE;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,EAAE,CAAA;QACjC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QAErC,OAAO,IAAI,GAAC,IAAI,GAAC,KAAK,GAAC,IAAI,GAAC,GAAG,GAAC,GAAG,CAAA;QAEnC,SAAS,OAAO,CAAC,KAAK;YAClB,IAAG,KAAK,IAAI,EAAE,EAAC;gBACX,OAAO,KAAK,CAAA;aACf;YACD,OAAO,IAAI,KAAK,EAAE,CAAA;QACtB,CAAC;IACL,CAAC,CAAA;IAED,aAAa,EAAG,CAAM,SAAgB,EAAE,EAAE;QACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;QACtB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;QAC5B,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,CAAA;QAEzB,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAA;QACxF,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,EAAC,KAAK,EAAC,GAAG,CAAC,CAAA;QAExC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAA;QACzD,MAAM,UAAU,GAAG,SAAS,GAAG,CAAC,IAAI,GAAC,EAAE,GAAC,EAAE,GAAC,EAAE,CAAC,CAAA;QAE9C,OAAO,UAAU,CAAA;IACrB,CAAC,CAAA;IAED,kBAAkB,EAAG,CAAM,IAAI,EAAE,KAAK,EAAC,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,EAAC,KAAK,EAAC,CAAC,CAAC,CAAA;QACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAA;IAC7B,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/modules/multer.js b/dist/modules/multer.js new file mode 100644 index 0000000..f708768 --- /dev/null +++ b/dist/modules/multer.js @@ -0,0 +1,17 @@ +const multer = require('multer'); +const multerS3 = require('multer-s3'); +const aws = require('aws-sdk'); +aws.config.loadFromPath(__dirname + '/../config/s3.json'); +const s3 = new aws.S3(); +var upload = multer({ + storage: multerS3({ + s3, + bucket: 'watcha', + acl: 'public-read', + key: function (req, file, cb) { + cb(null, 'images/origin/' + Date.now() + '.' + file.originalname.split('.').pop()); + } + }) +}); +module.exports = upload; +//# sourceMappingURL=multer.js.map \ No newline at end of file diff --git a/dist/modules/multer.js.map b/dist/modules/multer.js.map new file mode 100644 index 0000000..5b1baf5 --- /dev/null +++ b/dist/modules/multer.js.map @@ -0,0 +1 @@ +{"version":3,"file":"multer.js","sourceRoot":"","sources":["../../src/modules/multer.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AACrC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAC9B,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,GAAC,oBAAoB,CAAC,CAAA;AAEvD,MAAM,EAAE,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;AACxB,IAAI,MAAM,GAAG,MAAM,CAAC;IAChB,OAAO,EAAG,QAAQ,CAAC;QACf,EAAE;QACF,MAAM,EAAG,QAAQ;QACjB,GAAG,EAAG,aAAa;QACnB,GAAG,EAAC,UAAS,GAAG,EAAC,IAAI,EAAC,EAAE;YACpB,EAAE,CAAC,IAAI,EAAE,gBAAgB,GAAC,IAAI,CAAC,GAAG,EAAE,GAAC,GAAG,GAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QAChF,CAAC;KACJ,CAAC;CACL,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,GAAC,MAAM,CAAA"} \ No newline at end of file diff --git a/dist/modules/responseMessage.js b/dist/modules/responseMessage.js new file mode 100644 index 0000000..e1e0046 --- /dev/null +++ b/dist/modules/responseMessage.js @@ -0,0 +1,55 @@ +module.exports = { + NULL_VALUE: "필요한 값이 없습니다.", + OUT_OF_VALUE: "파라미터 값이 잘못 되었습니다.", + UNAUTHORIZED: "권한없음", + /* 회원가입 */ + SIGN_UP_SUCCESS: "회원가입성공", + SIGN_UP_FAIL: "회원 가입 실패", + ALREADY_ID: "존재하는 ID 입니다.", + EMPTY_ID: "이메일을 입력해주세요", + WRONG_FORM: "유효하지 않은 형식입니다.", + /* 로그인 */ + SIGN_IN_SUCCESS: "로그인 성공", + SIGN_IN_FAIL: "로그인 실패", + NO_USER: "존재하지않는 유저 id 입니다.", + MISS_MATCH_PW: "비밀번호가 일치하지 않습니다", + MISS_MATCH: "아이디나 비밀번호가 일치하지 않습니다.", + /*1부(by.sol) */ + NO_BOOK: "존재하지 않는 책 id입니다.", + NO_DIARY: "존재하지 않는 다이어리 id입니다.", + NO_CONTENTS: "존재하지 않는 정보입니다.", + SUCCESS_POST_PETDIARY: "반려동물 다이어리 작성 성공", + SUCCESS_EDIT_PETDIARY: "반려동물 다이어리 수정 성공", + SUCCESS_DELETE_PETDIARY: "반려동물 다이어리 삭제 성공", + SUCCESS_GET_CHAPTER_PETDIARY: "목차별 다이어리 조회 성공", + SUCCESS_GET_CHAPTERLIST: "목차 리스트 조회 성공", + SUCCESS_POST_CHAPTERLIST: "목차 리스트 추가 성공", + SUCCESS_EDIT_CHAPTERLIST: "목차 리스트 수정 성공", + SUCCESS_DELETE_CHAPTERLIST: "목차 리스트 삭제 성공", + SUCCESS_REGISTER_PET: "반려동물 등록 성공", + SUCCESS_GET_FIRSTPART_MAINPAGE: "1부 메인뷰 불러오기 성공", + /** 1.5부 무지개다리 (by 현종) */ + SUCCESS_GET_RAINBOW_MAIN_PAGE: "무지개 메인뷰 불러오기 성공", + SUCCESS_GET_RAINBOW_PET: "무지개 건넌 동물 불러오기 성공", + SUCCESS_GET_PARTING_PET_COMMENT: "이별하는 무지개 다리 멘트 불러오기 성공", + SUCCESS_DELETE_PARTING_PET: "반려동물 이별 과정 취소 성공", + SUCCESS_GET_READY_PARTING_PET_COMMENT: "이별에 준비하는 작가의 기록 시작 멘트 불러오기 성공", + SUCCESS_GET_BEST_MOMENT: "최고의 순간 불러오기 성공", + SUCCESS_GET_PARTING_PETNAME: "이별할 동물 이름 가져오기 성공", + SUCCESS_POST_EPILOGUE: "1부 끝 작가의말 - 에필로그 작성 성공", + SUCCESS_GET_RAINBOW_SUB_PAGE: "무지개 서브뷰 불러오기 성공", + /**캘린더 */ + SUCCESS_GET_MONTH_CALENDAR: "해당 월의 캘린더 가져오기 성공", + SUCCESS_GET_YEAR_CALENDAR: "해당 년의 캘린더 가져오기 성공", + /**2부 */ + SUCCESS_GET_SECOND_PART_MAIN_PAGE: "2부 메인페이지 불러오기 성공", + SUCCESS_GET_SECOND_PART_DIARY_OF_TABLECONTENTS: "2부 목차별 일기 불러오기 성공", + SUCCESS_GET_SECOND_PART_CHAPTER_LIST: "2부 목차 리스트 불러오기 성공", + SUCCESS_POST_SECOND_PART_ADD_CHAPTER: "2부 목차 추가 성공", + SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER: "2부 목차 수정 성공", + SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER: "2부 목차 삭제 성공", + FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS: "잘못된 2부 목차의 ID입니다.", + /* 서버에러 */ + INTERNAL_SERVER_ERROR: "서버 내부 오류", +}; +//# sourceMappingURL=responseMessage.js.map \ No newline at end of file diff --git a/dist/modules/responseMessage.js.map b/dist/modules/responseMessage.js.map new file mode 100644 index 0000000..dbf4d78 --- /dev/null +++ b/dist/modules/responseMessage.js.map @@ -0,0 +1 @@ +{"version":3,"file":"responseMessage.js","sourceRoot":"","sources":["../../src/modules/responseMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,UAAU,EAAE,cAAc;IAC1B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,MAAM;IAEpB,UAAU;IACV,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAC,gBAAgB;IAE3B,SAAS;IACT,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,mBAAmB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,uBAAuB;IAEnC,eAAe;IACf,OAAO,EAAC,kBAAkB;IAC1B,QAAQ,EAAC,qBAAqB;IAC9B,WAAW,EAAC,gBAAgB;IAC5B,qBAAqB,EAAC,iBAAiB;IACvC,qBAAqB,EAAC,iBAAiB;IACvC,uBAAuB,EAAC,iBAAiB;IACzC,4BAA4B,EAAC,gBAAgB;IAC7C,uBAAuB,EAAE,cAAc;IACvC,wBAAwB,EAAE,cAAc;IACxC,wBAAwB,EAAE,cAAc;IACxC,0BAA0B,EAAE,cAAc;IAC1C,oBAAoB,EAAE,YAAY;IAClC,8BAA8B,EAAC,gBAAgB;IAE/C,yBAAyB;IACzB,6BAA6B,EAAG,iBAAiB;IACjD,uBAAuB,EAAG,mBAAmB;IAC7C,+BAA+B,EAAG,wBAAwB;IAC1D,0BAA0B,EAAG,kBAAkB;IAC/C,qCAAqC,EAAG,+BAA+B;IACvE,uBAAuB,EAAG,gBAAgB;IAC1C,2BAA2B,EAAG,mBAAmB;IACjD,qBAAqB,EAAG,wBAAwB;IAChD,4BAA4B,EAAG,iBAAiB;IAEhD,SAAS;IACT,0BAA0B,EAAG,mBAAmB;IAChD,yBAAyB,EAAG,mBAAmB;IAE/C,QAAQ;IACR,iCAAiC,EAAG,kBAAkB;IACtD,8CAA8C,EAAG,mBAAmB;IACpE,oCAAoC,EAAG,mBAAmB;IAC1D,oCAAoC,EAAG,aAAa;IACpD,sCAAsC,EAAE,aAAa;IACrD,yCAAyC,EAAG,aAAa;IACzD,sCAAsC,EAAG,mBAAmB;IAE5D,UAAU;IACV,qBAAqB,EAAE,UAAU;CACpC,CAAA"} \ No newline at end of file diff --git a/dist/modules/statusCode.js b/dist/modules/statusCode.js new file mode 100644 index 0000000..d8ed705 --- /dev/null +++ b/dist/modules/statusCode.js @@ -0,0 +1,14 @@ +module.exports = { + OK: 200, + CREATED: 201, + NO_CONTENT: 204, + RESET_CONTENT: 205, + NOT_MODIFIED: 304, + BAD_REQUEST: 400, + UNAUTHORIZED: 401, + FORBIDDEN: 403, + NOT_FOUND: 404, + INTERNAL_SERVER_ERROR: 500, + SERVICE_UNAVAILABLE: 503 +}; +//# sourceMappingURL=statusCode.js.map \ No newline at end of file diff --git a/dist/modules/statusCode.js.map b/dist/modules/statusCode.js.map new file mode 100644 index 0000000..adb5427 --- /dev/null +++ b/dist/modules/statusCode.js.map @@ -0,0 +1 @@ +{"version":3,"file":"statusCode.js","sourceRoot":"","sources":["../../src/modules/statusCode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,EAAE,EAAE,GAAG;IACP,OAAO,EAAE,GAAG;IACZ,UAAU,EAAE,GAAG;IACf,aAAa,EAAE,GAAG;IAClB,YAAY,EAAE,GAAG;IACjB,WAAW,EAAE,GAAG;IAChB,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,GAAG;IACd,SAAS,EAAE,GAAG;IACd,qBAAqB,EAAE,GAAG;IAC1B,mBAAmB,EAAE,GAAG;CAC3B,CAAA"} \ No newline at end of file diff --git a/dist/modules/swagger.js b/dist/modules/swagger.js new file mode 100644 index 0000000..f38ddbb --- /dev/null +++ b/dist/modules/swagger.js @@ -0,0 +1 @@ +//# sourceMappingURL=swagger.js.map \ No newline at end of file diff --git a/dist/modules/swagger.js.map b/dist/modules/swagger.js.map new file mode 100644 index 0000000..3f7a83a --- /dev/null +++ b/dist/modules/swagger.js.map @@ -0,0 +1 @@ +{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../src/modules/swagger.ts"],"names":[],"mappings":""} \ No newline at end of file diff --git a/dist/modules/util.js b/dist/modules/util.js new file mode 100644 index 0000000..0edee7f --- /dev/null +++ b/dist/modules/util.js @@ -0,0 +1,14 @@ +module.exports = { + success: (status, message, data) => ({ + status, + success: true, + message, + data + }), + fail: (status, message) => ({ + status, + success: false, + message + }) +}; +//# sourceMappingURL=util.js.map \ No newline at end of file diff --git a/dist/modules/util.js.map b/dist/modules/util.js.map new file mode 100644 index 0000000..0d386ec --- /dev/null +++ b/dist/modules/util.js.map @@ -0,0 +1 @@ +{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/modules/util.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM;QACN,OAAO,EAAE,IAAI;QACb,OAAO;QACP,IAAI;KACP,CAAC;IACF,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACxB,MAAM;QACN,OAAO,EAAE,KAAK;QACd,OAAO;KACV,CAAC;CACL,CAAA"} \ No newline at end of file diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index f9c6abd..bcd2004 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -7,9 +7,9 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { let reqData=req.body; - console.log(req.body) + const images = req.files.map(img => img.location) try { - const result = await petService.registerPet(reqData); + await petService.registerPet(reqData,images); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, "")) } catch (err) { if (err.statusCode == null) { @@ -20,10 +20,4 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, - setImages:async(req,res)=>{ - const imagesUrls = req.files.map(file=>file.location) - res.send({ - imagesUrls - }) - } } \ No newline at end of file diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index 284ff1d..e973dbd 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -1,7 +1,8 @@ var express = require('express') var router = express.Router() var petController = require('../../controller/petController') +var upload = require('../../../modules/multer') -router.post('/register',petController.registerPet) //register pet +router.post('/register',upload.array('images',4),petController.registerPet) //register pet module.exports = router; \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 96f5ecf..e16ca2e 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -10,7 +10,7 @@ var mongoose = require('mongoose') require("../../models/user/User") require("../../models/pet/Pet") module.exports = { - registerPet: async (reqData) => { + registerPet: async (reqData, images) => { try{ //error handling let pets=[]; @@ -21,7 +21,7 @@ module.exports = { name: reqData.pets[i].name, kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, - imgs: reqData.pets[i].petImages, + imgs: images[i], user: mongoose.Types.ObjectId(reqData._id), rainbow: false, startDate: new Date(startDate) @@ -37,7 +37,6 @@ module.exports = { for (let i = 0; i < pets.length; i++) { await pets[i].save(); } - return responseMessage.SUCCESS_REGISTER_PET; }catch(err){ console.log(err) throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; From 4d481cf80a779316a831e9b6569cb542a0685c9b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 03:22:39 +0900 Subject: [PATCH 074/168] refactor : resolve fisrtPartController --- src/api/router/firstPart/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/router/firstPart/index.ts b/src/api/router/firstPart/index.ts index 6a1937d..5b5e832 100644 --- a/src/api/router/firstPart/index.ts +++ b/src/api/router/firstPart/index.ts @@ -1,6 +1,6 @@ import express from "express" const router = express.Router() -const firstPartController = require('../../controller/FirstPartController') +const firstPartController = require('../../controller/firstPartController') //1부 메인페이지 불러오기 router.get('/main/:userId', firstPartController.mainPage) From 0503653901cbbdb310ccee5bc672db9046612148 Mon Sep 17 00:00:00 2001 From: sol Date: Tue, 13 Jul 2021 03:52:38 +0900 Subject: [PATCH 075/168] =?UTF-8?q?feat:=202=EB=B6=80=20=EC=9D=BC=EA=B8=B0?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 33 +++++----- src/api/router/secondPart/index.ts | 6 +- src/api/service/secondPartService.ts | 72 +++++++++++++++++----- src/modules/responseMessage.ts | 3 + 4 files changed, 79 insertions(+), 35 deletions(-) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index 0418b05..11a8aeb 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -1,3 +1,5 @@ +import { Result } from "express-validator" + var util = require('../../modules/util') var responseMessage = require('../../modules/responseMessage') var statusCode = require('../../modules/statusCode') @@ -75,51 +77,52 @@ module.exports = { getSecondPartDiary: async (req, res) => { const { diaryId } = req.params try { - await secondPartService.getSecondPartDiary(diaryId) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + const result=await secondPartService.getSecondPartDiary(diaryId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_DIARY,result)) } catch (err) { console.error(err) if (err.statusCode === 400) { - return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_DIARY_ID)) } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, addSecondPartDiary: async (req, res) => { - const { userData } = req.body + const diaryData = req.body try { - await secondPartService.addSecondPartDiary(userData) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + await secondPartService.addSecondPartDiary(diaryData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_DIARY)) } catch (err) { console.error(err) if (err.statusCode === 400) { - return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_POST_SECOND_PART_DIARY)) } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, modifySecondPartDiary: async (req, res) => { - const { diaryId } = req.params.id + const { diaryId } = req.params + const diaryData=req.body try { - await secondPartService.modifySecondPartDiary(diaryId) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + await secondPartService.modifySecondPartDiary(diaryId,diaryData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_DIARY)) } catch (err) { console.error(err) if (err.statusCode === 400) { - return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_PUT_SECOND_PART_DIARY)) } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } }, deleteSecondPartDiary: async (req, res) => { - const { diaryId } = req.params.id + const { diaryId } = req.params try { - await secondPartService.getSecondPartDiary(diaryId) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + await secondPartService.deleteSecondPartDiary(diaryId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_DIARY)) } catch (err) { console.error(err) if (err.statusCode === 400) { - return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS)) + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_DELETE_SECOND_PART_DIARY)) } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) } diff --git a/src/api/router/secondPart/index.ts b/src/api/router/secondPart/index.ts index e7f48f3..1a63aed 100644 --- a/src/api/router/secondPart/index.ts +++ b/src/api/router/secondPart/index.ts @@ -9,7 +9,7 @@ router.post('/chapter', secondPartController.addSecondPartChapter) router.put('/chapter/:chapterId', secondPartController.modifySecondPartChapterInfo) router.delete('/chapter/:chapterId', secondPartController.deleteSecondPartChapter) router.get('/diary/user/:diaryId',secondPartController.getSecondPartDiary)//2부 일기 조회 -// router.post('/diary/user',secondPartController.addSecondPartDiary)//2부 일기 작성 -// router.put('/diary/user/:diaryId',secondPartController.modifySecondPartUserDiary)//2부 일기 수정 -// router.delete('/diary/user/:diaryId',secondPartController.deleteSecondPartDiary)//2부 일기 삭제 +router.post('/diary/user',secondPartController.addSecondPartDiary)//2부 일기 작성 +router.put('/diary/user/:diaryId',secondPartController.modifySecondPartDiary)//2부 일기 수정 +router.delete('/diary/user/:diaryId',secondPartController.deleteSecondPartDiary)//2부 일기 삭제 module.exports = router \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index cef5737..683b8b0 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -138,8 +138,8 @@ module.exports = { const findSecondPartChapter = await SecondPartTableContent.findById(chapterId).populate({ path: "userDiary" }) - if(findSecondPartChapter === null){ - throw { statusCode : 400 } + if (findSecondPartChapter === null) { + throw { statusCode: 400 } } //전체 2부 목차 const tableContents = (await TableContents.find().populate({ @@ -152,46 +152,84 @@ module.exports = { secondPartTable.chapter -= 1 await secondPartTable.save() }) - //2부 목차에서 해당 목차 삭제 - await SecondPartTableContent.deleteOne({_id: `${chapterId}`}) + await SecondPartTableContent.deleteOne({ _id: `${chapterId}` }) //2부 목차에 들어있던 userDiary 삭제 const userDiaries = findSecondPartChapter.userDiary; userDiaries.forEach(async userDiary => { - await UserDiary.deleteOne({_id:`${userDiary._id}`}) + await UserDiary.deleteOne({ _id: `${userDiary._id}` }) }) //총 목차(1부,2부)에서 해당 목차 secondPartTableContents배열에서 삭제 const idx = tableContents.secondPartTableContents.findIndex(secondPartTable => secondPartTable._id == chapterId) - tableContents.secondPartTableContents.splice(idx,1) + tableContents.secondPartTableContents.splice(idx, 1) await tableContents.save() } catch (err) { throw err } - },getSecondPartDiary:async(diaryId)=>{ + }, getSecondPartDiary: async (diaryId) => { try { console.log(diaryId) - console.log(await UserDiary.findById(diaryId)) const findSecondPartDiary = await UserDiary.findById(diaryId).populate('users').populate('tableContents'); console.log(findSecondPartDiary) let secondPartDiaryResDto = await new SecondPartDiaryResDto(findSecondPartDiary) - + console.log(secondPartDiaryResDto) return secondPartDiaryResDto } catch (err) { console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + throw { statusCode: 400 } } + }, addSecondPartDiary: async (diaryData) => { + const secondPartTableContents = await SecondPartTableContent.findById(diaryData.chapterId).populate('userDiary') + console.log("length: ", secondPartTableContents.userDiary.length) + let newUserDiary = new UserDiary({ + tableContents: diaryData.chapterId, + episode: secondPartTableContents.userDiary.length, + imgs: diaryData.diaryImages, + title: diaryData.title, + contents: diaryData.contents, + feeling: diaryData.feeling + }) + secondPartTableContents.setUserDiary(newUserDiary) + await secondPartTableContents.save() + try { + console.log(newUserDiary) + await newUserDiary.save() + } catch (err) { + console.log(err) + throw { statusCode: 400 } + } + } + , + modifySecondPartDiary: async (diaryId, diaryData) => { + try { + await UserDiary.updateOne( + { _id: diaryId }, + { $set: { imgs: diaryData.diaryImages, title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling } } + ) + } catch (err) { + throw err + } + }, deleteSecondPartDiary: async (diaryId) => { + try{ + const findDiary=await UserDiary.findById(diaryId).populate('tableConents'); + console.log(findDiary) + const userDiaries=(await SecondPartTableContent.findOne({chapter:{$eq:findDiary.tableContents.chapter}})).userDiary + for(let i=0;i{ - - // },modifySecondPartDiary:async(diaryId)=>{ - - // },deleteSecondPartDiary:async(diaryId)=>{ - - // } } \ No newline at end of file diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index cdca6c7..d5e80b2 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -49,6 +49,9 @@ module.exports = { SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER : "2부 목차 삭제 성공", FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS : "잘못된 2부 목차의 ID입니다.", SUCCESS_GET_SECOND_PART_DIARY:"2부 일기 불러오기 성공", + FAIL_TO_GET_SECOND_PART_DIARY_ID:"잘못된 2부 일기의 ID입니다.", + SUCCESS_POST_SECOND_PART_DIARY:"2부 일기 작성 성공", + FAIL_TO_POST_SECOND_PART_DIARY:"2부 일기 작성 실패", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", From 6e9a488886777dec5e07abab879b21996938b3ea Mon Sep 17 00:00:00 2001 From: sol Date: Tue, 13 Jul 2021 04:15:31 +0900 Subject: [PATCH 076/168] =?UTF-8?q?feat=20:=202=EB=B6=80=20=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0=20=EC=82=AD=EC=A0=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/secondPartService.ts | 19 +++++++++---------- src/modules/responseMessage.ts | 5 +++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 683b8b0..966de07 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -216,19 +216,18 @@ module.exports = { throw err } }, deleteSecondPartDiary: async (diaryId) => { - try{ - const findDiary=await UserDiary.findById(diaryId).populate('tableConents'); - console.log(findDiary) - const userDiaries=(await SecondPartTableContent.findOne({chapter:{$eq:findDiary.tableContents.chapter}})).userDiary - for(let i=0;i Date: Tue, 13 Jul 2021 14:15:12 +0900 Subject: [PATCH 077/168] refactor : s3.json --- src/config/s3.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/config/s3.json diff --git a/src/config/s3.json b/src/config/s3.json new file mode 100644 index 0000000..626b115 --- /dev/null +++ b/src/config/s3.json @@ -0,0 +1,5 @@ +{ + "accessKeyId": "AKIAYBR5NJVMWLVU4RNJ", + "secretAccessKey": "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", + "region": "ap-northeast-2" +} \ No newline at end of file From 576bb4e4faa739a51de81bc7ed26370edf65660b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 17:59:09 +0900 Subject: [PATCH 078/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=EC=9D=BC?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95=20&=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=9D=B4=EC=8A=88=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 28 ++++++++++++++----- .../mainPageDto/FirstPartMainPageResDto.ts | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index c98437a..f8ccfe2 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -13,6 +13,7 @@ require("../../models/pet/Pet") require('../../models/tableContents/TableContents') require('../../models/tableContents/FirstPartTableContents') require('../../models/diary/PetDiary') +require('../../models/diary/PetEmotions') const util = require('../../modules/util') const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') @@ -67,14 +68,15 @@ module.exports = { //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { - const petData = await Pet.findById(diaryData.character[0]._id).populate('_id') + const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') newPetDiary.setPet(petData) //save emotions const petEmotion = new PetEmotions({ - pet: diaryData.character[0]._id, - feeling: diaryData.character[0].feeling + pet: diaryData.character[i]._id, + feeling: diaryData.character[i].feeling }) newPetDiary.setPetEmotions(petEmotion) + await petEmotion.save() } console.log(newPetDiary) @@ -116,7 +118,7 @@ module.exports = { //save petinfo let petN = diaryData.character.length for (let i = 0; i < petN; i++) { - const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') + const petData = await Pet.findById(diaryData.character[i]._id) findPetDiary.setPet(petData) //save emotions let emotion = new PetEmotions() @@ -136,11 +138,17 @@ module.exports = { }, deletePetDiary: async (petDiaryId) => { try { - let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents'); - console.log(findPetDiary) + let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents').populate('petEmotions'); + console.log('!!!!! : '+findPetDiary) //화 정렬 순서 맞추기 //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 // let allDiaries=await (PetDiary.find({}).populate('tableContents')) + let thisDiariesTableContent = findPetDiary.tableContents + for(let j = 0;j{ + await PetEmotions.deleteOne({_id:petEmotion._id}) + }) + await PetDiary.deleteOne({ _id: findPetDiary }) + await thisDiariesTableContent.save() console.log(findPetDiary) return responseMessage.SUCCESS_DELETE_PETDIARY; } catch (err) { @@ -159,4 +173,4 @@ module.exports = { } } -} +} \ No newline at end of file diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 3a83aab..cfa4348 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -69,7 +69,7 @@ export class TableContentsResDto { this.chapterId = firstPartTableContents._id //목차 Id this.chapter = firstPartTableContents.chapter; this.chapterName = firstPartTableContents.title; - this.episodePerchapterCount = firstPartTableContents.petDiary.length; + this.episodePerchapterCount = firstPartTableContents.petDiary.length < 1 ? 0 : firstPartTableContents.petDiary.length; } } From 3dfc5ea49e73d56b90f9869cc2e29e8fa121c387 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 18:32:22 +0900 Subject: [PATCH 079/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0,=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EC=82=AD=EC=A0=9C=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/chapterService.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index d36cffc..9d1a554 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -77,7 +77,7 @@ module.exports = { max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter) } } - newFirstPartTable.chapter = max + newFirstPartTable.chapter = max+1 newFirstPartTable.title = chapterTitle await newFirstPartTable.save() @@ -126,7 +126,16 @@ module.exports = { console.log(allFirstTableContents) //해당 목차 삭제 - findChapter=null; + await FirstPartTableContents.deleteOne({_id:chapterId}) + + const tableContents = (await TableContents.find())[0] + for(let j = 0;j Date: Tue, 13 Jul 2021 18:42:03 +0900 Subject: [PATCH 080/168] =?UTF-8?q?refactor=20:=20=ED=94=84=EB=A1=A4?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EB=93=B1=EB=A1=9D=20=EC=B1=85=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20s3=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index f8ccfe2..88e9916 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -19,12 +19,12 @@ const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') module.exports = { - postPrologue: async (bookData) => { + postPrologue: async (bookData,bookImage) => { try { // add book info let book = await Book.findById(bookData._id); book.title = bookData.title; - book.imgs = bookData.image; + book.imgs = bookImage; book.author = bookData.userName; console.log(book) //add tableContents info From 135702847c55d4b7c57450302cd780ebcac884d1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 18:45:23 +0900 Subject: [PATCH 081/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=EB=B0=98?= =?UTF-8?q?=EB=A0=A4=EB=8F=99=EB=AC=BC=20=EC=9D=BC=EA=B8=B0=20=EC=82=AC?= =?UTF-8?q?=EC=A7=84=20s3=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/diaryController.ts | 6 ++++-- src/api/router/diary/index.ts | 5 +++-- src/api/service/diaryService.ts | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 3631175..28e1f38 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -5,8 +5,9 @@ var diaryService = require('../service/diaryService') module.exports = { postPrologue: async (req, res) => { const bookData = req.body; + const bookImage = req.file.location try { - const result = await diaryService.postPrologue(bookData) + const result = await diaryService.postPrologue(bookData,bookImage) res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PROLOGUE, "")) } catch (err) { console.error(err) @@ -19,8 +20,9 @@ module.exports = { }, postPetDiary: async (req, res) => { const diaryData = req.body; + const diaryImages = req.files.map(file=>file.location) try { - const result = await diaryService.postPetDiary(diaryData) + const result = await diaryService.postPetDiary(diaryData,diaryImages) res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PETDIARY, "")) } catch (err) { console.error(err) diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 16b9773..06f84c1 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -1,9 +1,10 @@ var express = require('express') var router = express.Router() var diaryController = require('../../controller/diaryController') +var upload = require('../../../modules/multer') -router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 -router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 +router.post('/prologue',upload.single('images'),diaryController.postPrologue) //1부 프롤로그 작성 +router.post('/pet',upload.array('images',5),diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 88e9916..914f57a 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -48,7 +48,7 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK } } }, - postPetDiary: async (diaryData) => { + postPetDiary: async (diaryData,diaryImages) => { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) @@ -58,7 +58,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: diaryData.diaryImages, + imgs: diaryImages, title: diaryData.title, contents: diaryData.contents From 540dc58038fda388643fefaf1053b84b404d0156 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 20:05:25 +0900 Subject: [PATCH 082/168] =?UTF-8?q?refactor=20:1.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EB=B0=98=EB=A0=A4=EB=8F=99=EB=AC=BC=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20&=20=EC=9D=B4=EB=B3=84=ED=95=98=EB=8A=94?= =?UTF-8?q?=20=EB=AC=B4=EC=A7=80=EA=B0=9C=20=EB=8B=A4=EB=A6=AC=20=EB=A9=98?= =?UTF-8?q?=ED=8A=B8api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/router/rainbow/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/router/rainbow/index.ts b/src/api/router/rainbow/index.ts index d38e477..c319b56 100644 --- a/src/api/router/rainbow/index.ts +++ b/src/api/router/rainbow/index.ts @@ -4,7 +4,7 @@ let rainbowController = require('../../controller/rainbowController') router.get('/main/:userId/:petId',rainbowController.mainPage) //1.5부 무지개 홈 화면 불러오기 router.get('/pet',rainbowController.selectRainbowPet) //1.5부 무지개 반려동물 선택 화면 불러오기 -router.get('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 +router.put('/pet/:petId',rainbowController.setRainbowPet) //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 router.delete('/pet/:petId',rainbowController.cancelPartingPet) //1.5부 무지개 반려동물 떠나보내기 취소 router.get('/record/:petId',rainbowController.getReadyPartingPetComment) //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 router.get('/moment/:userId/:petId',rainbowController.theBestMoment) //1.5부 무지개 최고의 순간 From bc70d89e38b56d2ac935f3cdd52e728858a1117d Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Tue, 13 Jul 2021 20:31:20 +0900 Subject: [PATCH 083/168] =?UTF-8?q?refactor=20:=201.5=EB=B6=80=20=EC=9E=91?= =?UTF-8?q?=EA=B0=80=EC=9D=98=20=EC=9D=B4=EB=B3=84=EC=A4=80=EB=B9=84=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91=20dto=20=ED=95=84=EB=93=9C=EA=B0=92=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadyPartingAndStartRecordResDto.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts index 9fb07e9..277aaf4 100644 --- a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts +++ b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts @@ -15,9 +15,11 @@ export class ReadyPartingAndStartRecordResDto{ export class BookInfoResDto{ title = null; bookImg = null; - + author = null; constructor(book : IBook){ + console.log('!!!!!!! : '+book) this.title = book.title this.bookImg = book.imgs + this.author = book.author } } \ No newline at end of file From 29e62e8715413bddfdbded994339a49c3e1feb3f Mon Sep 17 00:00:00 2001 From: sol Date: Tue, 13 Jul 2021 23:27:47 +0900 Subject: [PATCH 084/168] =?UTF-8?q?refactor=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20=ED=94=84=EB=A1=A4=EB=A1=9C=EA=B7=B8=20API=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 7 +- src/api/controller/diaryController.ts | 7 +- src/api/router/diary/index.ts | 2 +- src/api/router/user/index.ts | 2 +- src/api/service/diaryService.ts | 209 ++++++++++++---------- src/api/service/userService.ts | 23 +-- src/models/tableContents/TableContents.ts | 6 +- src/models/user/User.ts | 4 +- yarn.lock | 25 --- 9 files changed, 137 insertions(+), 148 deletions(-) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity index 4c74967..b98e877 100644 --- a/node_modules/.yarn-integrity +++ b/node_modules/.yarn-integrity @@ -1,5 +1,5 @@ { - "systemParams": "win32-x64-72", + "systemParams": "win32-x64-83", "modulesFolders": [ "node_modules" ], @@ -13,7 +13,6 @@ "dotenv@^10.0.0", "express-validator@^6.12.0", "express@^4.17.1", - "global@^4.4.0", "mongoose@^5.13.0", "multer-s3@^2.9.0", "multer@^1.4.2", @@ -97,7 +96,6 @@ "destroy@~1.0.4": "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80", "dicer@0.2.5": "https://registry.yarnpkg.com/dicer/-/dicer-0.2.5.tgz#5996c086bb33218c812c090bddc09cd12facb70f", "diff@^4.0.1": "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d", - "dom-walk@^0.1.0": "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84", "dot-prop@^5.2.0": "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88", "dotenv@^10.0.0": "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81", "duplexer3@^0.1.4": "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2", @@ -122,7 +120,6 @@ "get-stream@^5.1.0": "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3", "glob-parent@~5.1.2": "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4", "global-dirs@^2.0.1": "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d", - "global@^4.4.0": "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406", "got@^9.6.0": "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85", "graceful-fs@^4.1.2": "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee", "has-flag@^3.0.0": "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd", @@ -184,7 +181,6 @@ "mime@1.6.0": "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1", "mimic-response@^1.0.0": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", "mimic-response@^1.0.1": "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b", - "min-document@^2.19.0": "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685", "minimatch@^3.0.4": "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083", "minimist@^1.2.0": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", "minimist@^1.2.5": "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602", @@ -220,7 +216,6 @@ "picomatch@^2.2.1": "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972", "prepend-http@^2.0.0": "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897", "process-nextick-args@~2.0.0": "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2", - "process@^0.11.10": "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182", "proxy-addr@~2.0.5": "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025", "pstree.remy@^1.1.7": "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a", "pump@^3.0.0": "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64", diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 3631175..22696be 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -2,12 +2,15 @@ var util = require('../../modules/util') var responseMessage = require('../../modules/responseMessage') var statusCode = require('../../modules/statusCode') var diaryService = require('../service/diaryService') +var firstPartService=require('../service/firstPartService') module.exports = { postPrologue: async (req, res) => { + const {userId}=req.params const bookData = req.body; try { - const result = await diaryService.postPrologue(bookData) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PROLOGUE, "")) + await diaryService.postPrologue(userId,bookData) + //const result=await firstPartService.getMainPage(userId) + res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PROLOGUE)) } catch (err) { console.error(err) if (err.statusCode == null) { diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 16b9773..d4ba963 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -2,7 +2,7 @@ var express = require('express') var router = express.Router() var diaryController = require('../../controller/diaryController') -router.post('/prologue',diaryController.postPrologue) //1부 프롤로그 작성 +router.post('/prologue/:userId',diaryController.postPrologue) //1부 프롤로그 작성 router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 diff --git a/src/api/router/user/index.ts b/src/api/router/user/index.ts index 18bdb53..a33bf76 100644 --- a/src/api/router/user/index.ts +++ b/src/api/router/user/index.ts @@ -3,7 +3,7 @@ const router = express.Router() const userController = require('../../controller/userController') import { check, validationResult } from "express-validator"; -router.post('/register',userController.register) //user register +router.post('/register/',userController.register) //user register router.post('/login',userController.login) //user login module.exports=router; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 4a95400..b0d4fe3 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -18,35 +18,62 @@ const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') module.exports = { - postPrologue: async (bookData) => { + postPrologue: async (userId, bookData) => { try { - // add book info - let book = await Book.findById(bookData._id); - book.title = bookData.title; - book.imgs = bookData.image; - book.author = bookData.userName; - console.log(book) - //add tableContents info - let tc = await new TableContents(); - let ftc = await new FirstPartTableContents({ - chapter: 0, - title: bookData.prologueTitle, - contents: bookData.prologueContents - }) + console.log(userId) + //Create user object + const user = await User.findById(userId).populate('book') + console.log('user : '+user) + // await Book.update( + // {_id: user.book._id }, + // {$set: {title: bookData.title, imgs: bookData.image,author: bookData.userName}} + // ) + const setBook = user.book + setBook.title = bookData.title, + setBook.imgs = bookData.imgs, + setBook.author = bookData.userName - await tc.setFirstPartTableContents(ftc); - await book.setTableContents(tc); - //save db - await book.save() + //user.book = book + // await book.save() + // await user.save() + //await book.save() - return responseMessage.SUCCESS_POST_PROLOGUE; + //Create tableContents object + const tableContents = new TableContents() + setBook.tableContents = tableContents + await tableContents.save() + await user.save() + await setBook.save() + //Create firstPartTableContents object + const firstPartPrologue = new FirstPartTableContents({ + chapter: 0, + title: bookData.title, + contents: bookData.contents + }) + await firstPartPrologue.save() + console.log(tableContents) + await tableContents.firstPartTableContents.push(firstPartPrologue) - //error handling - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK } + const season = ["봄", "여름", "가을", "겨울"] + for (let i = 0; i < 4; i++) { + let chapter = 1 + const dummyFirstPartTableContents = new FirstPartTableContents({ + chapter, + title: `${user.book.author}의 ${season[i]}` + }) + dummyFirstPartTableContents.save() + await tableContents.firstPartTableContents.push(dummyFirstPartTableContents) + chapter = chapter + 1 } - }, + await tableContents.save() + + return user.book._id + //error handling + } catch(err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } + } +}, postPetDiary: async (diaryData) => { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); @@ -90,77 +117,77 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } }, - getPetDiary: async (petDiaryId) => { - try { - const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); - let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 - // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) - - for (let i = 0; i < findPetDiary.petEmotions.length; i++) { - let feelingList = new FeelingListDto(findPetDiary.pets[i]) - feelingList.setFeeling(findPetDiary.petEmotions[i]) - petDiaryPageResDto.setFeelingList(feelingList) - } - return petDiaryPageResDto + getPetDiary: async (petDiaryId) => { + try { + const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); + let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 + // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } - } - }, - putPetDiary: async (petDiaryId, diaryData) => { - try { - let findPetDiary = await PetDiary.findById(petDiaryId); - findPetDiary.tableContents = findPetDiary.tableContents - findPetDiary.episode = findPetDiary.episode - findPetDiary.date = findPetDiary.date - findPetDiary.imgs = diaryData.diaryImages - findPetDiary.title = diaryData.title - findPetDiary.contents = diaryData.contents - //save petinfo - let petN = diaryData.character.length - for (let i = 0; i < petN; i++) { - const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') - findPetDiary.setPet(petData) - //save emotions - let emotion = new PetEmotions() - emotion.pet = diaryData.character[i]._id - emotion.feeling = diaryData.character[i].feeling - emotion.setPetDiary(findPetDiary) - await emotion.save() + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { + let feelingList = new FeelingListDto(findPetDiary.pets[i]) + feelingList.setFeeling(findPetDiary.petEmotions[i]) + petDiaryPageResDto.setFeelingList(feelingList) + } + return petDiaryPageResDto + + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } - await findPetDiary.save() - return responseMessage.SUCCESS_EDIT_PETDIARY; + }, + putPetDiary: async (petDiaryId, diaryData) => { + try { + let findPetDiary = await PetDiary.findById(petDiaryId); + findPetDiary.tableContents = findPetDiary.tableContents + findPetDiary.episode = findPetDiary.episode + findPetDiary.date = findPetDiary.date + findPetDiary.imgs = diaryData.diaryImages + findPetDiary.title = diaryData.title + findPetDiary.contents = diaryData.contents + //save petinfo + let petN = diaryData.character.length + for (let i = 0; i < petN; i++) { + const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') + findPetDiary.setPet(petData) + //save emotions + let emotion = new PetEmotions() + emotion.pet = diaryData.character[i]._id + emotion.feeling = diaryData.character[i].feeling + emotion.setPetDiary(findPetDiary) + await emotion.save() + } + await findPetDiary.save() + return responseMessage.SUCCESS_EDIT_PETDIARY; - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } - } + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } - }, - deletePetDiary: async (petDiaryId) => { - try { - let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents'); - console.log(findPetDiary) - //화 정렬 순서 맞추기 - //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 - // let allDiaries=await (PetDiary.find({}).populate('tableContents')) - let petDiaries = (await FirstPartTableContents.findOne({ chapter: { $eq: findPetDiary.tableContents.chapter } })).petDiary - - for (let i = 0; i < petDiaries.length; i++) { - let temp = await PetDiary.findById(petDiaries[i]) - if (findPetDiary.episode <= temp.episode) { - temp.episode = Number(temp.episode) - 1 - await temp.save() + }, + deletePetDiary: async (petDiaryId) => { + try { + let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents'); + console.log(findPetDiary) + //화 정렬 순서 맞추기 + //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 + // let allDiaries=await (PetDiary.find({}).populate('tableContents')) + let petDiaries = (await FirstPartTableContents.findOne({ chapter: { $eq: findPetDiary.tableContents.chapter } })).petDiary + + for (let i = 0; i < petDiaries.length; i++) { + let temp = await PetDiary.findById(petDiaries[i]) + if (findPetDiary.episode <= temp.episode) { + temp.episode = Number(temp.episode) - 1 + await temp.save() + } + } + await PetDiary.deleteOne({ _id: findPetDiary }) + console.log(findPetDiary) + return responseMessage.SUCCESS_DELETE_PETDIARY; + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } } - } - await PetDiary.deleteOne({ _id: findPetDiary }) - console.log(findPetDiary) - return responseMessage.SUCCESS_DELETE_PETDIARY; - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } - } - } } diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index 161a012..69e5a5b 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -31,31 +31,18 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.ALREADY_ID }; } + const book=new Book() user = new User({ email, - password + password, + book }); + await book.save() //Encrpyt password const salt = await bcrypt.genSalt(10); user.password = await bcrypt.hash(password, salt); - - //Create book object - const book = new Book() - - //Create tableContents object - const tableContents = new TableContents() - - //Create firstPartTableContents object - const firstPart = new FirstPartTableContents() - tableContents.setFirstPartTableContents(firstPart) - book.setTableContents(tableContents) - user.setBook(book); - - //db save - await user.save(); - - return { bookId: book._id }; + user.save() }, login: async (email, password) => { try { diff --git a/src/models/tableContents/TableContents.ts b/src/models/tableContents/TableContents.ts index c837fbc..a5974af 100644 --- a/src/models/tableContents/TableContents.ts +++ b/src/models/tableContents/TableContents.ts @@ -7,13 +7,15 @@ const TableContentsSchema: Schema = new mongoose.Schema( firstPartTableContents: [ { type: mongoose.SchemaTypes.ObjectId, - ref: "FirstPartTableContents" + ref: "FirstPartTableContents", + default:[] } ], secondPartTableContents: [ { type: mongoose.SchemaTypes.ObjectId, - ref: "SecondPartTableContents" + ref: "SecondPartTableContents", + default:[] } ], secondPartStartDate : { diff --git a/src/models/user/User.ts b/src/models/user/User.ts index b4da057..816ada8 100644 --- a/src/models/user/User.ts +++ b/src/models/user/User.ts @@ -9,12 +9,12 @@ const UserSchema: Schema = new mongoose.Schema({ pets: [ { type: mongoose.SchemaTypes.ObjectId, - ref: "Pet" + ref: "Pet", } ], book: { type: mongoose.SchemaTypes.ObjectId, - ref: "Book" + ref: "Book", }, feelingCount: { type: Number } }) diff --git a/yarn.lock b/yarn.lock index f7cb3e9..b781658 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,11 +496,6 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -dom-walk@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" - integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== - dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -677,14 +672,6 @@ global-dirs@^2.0.1: dependencies: ini "1.3.7" -global@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" - integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== - dependencies: - min-document "^2.19.0" - process "^0.11.10" - got@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -1000,13 +987,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= - dependencies: - dom-walk "^0.1.0" - minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1223,11 +1203,6 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= - proxy-addr@~2.0.5: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" From 9758ac37ef981d920fe4ca006548d94c6deb93c0 Mon Sep 17 00:00:00 2001 From: sol Date: Tue, 13 Jul 2021 23:27:53 +0900 Subject: [PATCH 085/168] =?UTF-8?q?refactor=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20=ED=94=84=EB=A1=A4=EB=A1=9C=EA=B7=B8=20API=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/userController.ts | 2 +- src/api/service/userService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 3f93a7d..40bdc23 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -26,7 +26,7 @@ module.exports = { try { const result = await userService.login(email, password); console.log('얘가나오면 안되는데 : ', result) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS)) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS,{userId:result})) } catch (err) { console.log('bbbbb : ' + err.statusCode) diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index 69e5a5b..d3b43ad 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -61,7 +61,7 @@ module.exports = { if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } - + return user._id } catch (err) { throw err } From 659d390583dac31b2d092320abd7153a3de6b233 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 00:07:35 +0900 Subject: [PATCH 086/168] refactor : rainbowService isuue solve --- src/api/service/rainbowService.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index d244dd8..2755ee2 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -152,6 +152,8 @@ module.exports = { findPet.rainbow = true await findPet.save() const user = findPet.user + // for() + let diaryCount = 0 user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length) From 4583dc36d08f203d23c2c06a03939712a757c316 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 00:23:30 +0900 Subject: [PATCH 087/168] =?UTF-8?q?refactor=20:=20login=20add=20field=20us?= =?UTF-8?q?erId,petId=20,=20solves=20=EB=AC=B4=EC=A7=80=EA=B0=9C=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EC=84=A0=ED=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/userController.ts | 2 +- src/api/service/rainbowService.ts | 2 +- src/api/service/userService.ts | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 40bdc23..26cc3f2 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -26,7 +26,7 @@ module.exports = { try { const result = await userService.login(email, password); console.log('얘가나오면 안되는데 : ', result) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS,{userId:result})) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS,result)) } catch (err) { console.log('bbbbb : ' + err.statusCode) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 2755ee2..02aeb6c 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -126,7 +126,7 @@ module.exports = { const findUser = await User.find().populate({ path: "pets" }) - const rainbowPetResDto = findUser[0].pets.map(pet => + const rainbowPetResDto = findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => new MyPetInfoResDto(pet)) return rainbowPetResDto diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index d3b43ad..7e2ada6 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -50,7 +50,9 @@ module.exports = { if (!errors.isEmpty()) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; } - let user = await User.findOne({ email }); + let user = await User.findOne({ email }).populate({ + path : "pets" + }); if (!user) { //등록되지 않은 email throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; @@ -61,7 +63,8 @@ module.exports = { if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } - return user._id + const petId = user.pets[0]._id + return { userId : user._id, petId : petId} } catch (err) { throw err } From 911b7908c029e6b9e38006e21aa0966de3c43c8f Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 00:28:49 +0900 Subject: [PATCH 088/168] =?UTF-8?q?refacotr=20:=201.5=EB=B6=80=20=EB=AC=B4?= =?UTF-8?q?=EC=A7=80=EA=B0=9C=20=EC=9E=91=EA=B0=80=EC=9D=98=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EC=8B=9C=EC=9E=91=20field=EA=B0=92=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadyPartingAndStartRecordResDto.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts index 277aaf4..8b39abc 100644 --- a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts +++ b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts @@ -17,7 +17,6 @@ export class BookInfoResDto{ bookImg = null; author = null; constructor(book : IBook){ - console.log('!!!!!!! : '+book) this.title = book.title this.bookImg = book.imgs this.author = book.author From 6649eac29ca109a40a8c2d7ebf27455cbc69cf13 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 01:30:19 +0900 Subject: [PATCH 089/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EA=B0=84=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 5 ++++- src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 02aeb6c..54c867a 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -27,6 +27,7 @@ require('../../models/diary/PetEmotions') require('../../models/tableContents/SecondPartTableContent') require('../../models/diary/UserDiary') require("../../models/etc/Help") +require("../../models/etc/Comments") module.exports = { getMainPage: async (userId, petId) => { @@ -213,6 +214,7 @@ module.exports = { for (let i = 0; i < 6; i++) { console.log(i) const diaries = (await PetEmotions.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary) + console.log('diaries : '+diaries) if (diaries.length < 1) { diaryPerFeeling.push(null) } else { @@ -222,7 +224,8 @@ module.exports = { const theBestMomentsResDto = new TheBestMomentsResDto() for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - const commentPerFeeling = await Comments.findOne({ feeling: j, classification: 2 }) + const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) + const test = await Comments.find() let theBestMoment = null if (j < 3) { theBestMoment = new TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])) diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index b6715e5..c36b147 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -52,6 +52,7 @@ export class TheBestMomentDiary{ } async init(diaryPerFeeling : IPetDiary){ + console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : '+diaryPerFeeling) this.chapter = diaryPerFeeling.tableContents.chapter this.episode = diaryPerFeeling.episode this.title = diaryPerFeeling.title From 82c2bdc9f7e469c6a08ddff4bcfb36b82f1c1880 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 02:20:32 +0900 Subject: [PATCH 090/168] refactor : dist update --- dist/api/controller/diaryController.js | 11 ++- dist/api/controller/diaryController.js.map | 2 +- dist/api/controller/secondPartController.js | 71 +++++++++++++-- .../controller/secondPartController.js.map | 2 +- dist/api/controller/userController.js | 2 +- dist/api/controller/userController.js.map | 2 +- dist/api/router/diary/index.js | 5 +- dist/api/router/diary/index.js.map | 2 +- dist/api/router/firstPart/index.js | 2 +- dist/api/router/index.js | 2 +- dist/api/router/index.js.map | 2 +- dist/api/router/rainbow/index.js | 2 +- dist/api/router/secondPart/index.js | 4 + dist/api/router/secondPart/index.js.map | 2 +- dist/api/router/user/index.js | 2 +- dist/api/router/user/index.js.map | 2 +- dist/api/service/chapterService.js | 11 ++- dist/api/service/chapterService.js.map | 2 +- dist/api/service/diaryService.js | 91 +++++++++++++------ dist/api/service/diaryService.js.map | 2 +- dist/api/service/firstPartService.js | 1 + dist/api/service/firstPartService.js.map | 2 +- dist/api/service/rainbowService.js | 6 +- dist/api/service/rainbowService.js.map | 2 +- dist/api/service/secondPartService.js | 59 ++++++++++++ dist/api/service/secondPartService.js.map | 2 +- dist/api/service/userService.js | 26 ++---- dist/api/service/userService.js.map | 2 +- .../mainPageDto/FirstPartMainPageResDto.js | 3 +- .../FirstPartMainPageResDto.js.map | 2 +- dist/dto/petDiary/PetDiaryPageResDto.js | 24 ++++- dist/dto/petDiary/PetDiaryPageResDto.js.map | 2 +- .../ReadyPartingAndStartRecordResDto.js | 2 + .../ReadyPartingAndStartRecordResDto.js.map | 2 +- .../theBestMomentDto/TheBestMomentResDto.js | 1 + .../TheBestMomentResDto.js.map | 2 +- dist/dto/secondPart/SecondPartDiaryResDto.js | 49 ++++++++++ .../secondPart/SecondPartDiaryResDto.js.map | 1 + dist/models/tableContents/TableContents.js | 6 +- .../models/tableContents/TableContents.js.map | 2 +- dist/models/user/User.js | 4 +- dist/modules/responseMessage.js | 8 ++ dist/modules/responseMessage.js.map | 2 +- src/api/service/firstPartService.ts | 1 + src/api/service/rainbowService.ts | 2 - .../mainPageDto/FirstPartMainPageResDto.ts | 1 + 46 files changed, 341 insertions(+), 94 deletions(-) create mode 100644 dist/dto/secondPart/SecondPartDiaryResDto.js create mode 100644 dist/dto/secondPart/SecondPartDiaryResDto.js.map diff --git a/dist/api/controller/diaryController.js b/dist/api/controller/diaryController.js index afc0bc1..c0ad9a0 100644 --- a/dist/api/controller/diaryController.js +++ b/dist/api/controller/diaryController.js @@ -11,12 +11,16 @@ var util = require('../../modules/util'); var responseMessage = require('../../modules/responseMessage'); var statusCode = require('../../modules/statusCode'); var diaryService = require('../service/diaryService'); +var firstPartService = require('../service/firstPartService'); module.exports = { postPrologue: (req, res) => __awaiter(this, void 0, void 0, function* () { + const { userId } = req.params; const bookData = req.body; + const bookImage = req.file.location; try { - const result = yield diaryService.postPrologue(bookData); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PROLOGUE, "")); + yield diaryService.postPrologue(userId, bookData); + //const result=await firstPartService.getMainPage(userId) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PROLOGUE)); } catch (err) { console.error(err); @@ -29,8 +33,9 @@ module.exports = { }), postPetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { const diaryData = req.body; + const diaryImages = req.files.map(file => file.location); try { - const result = yield diaryService.postPetDiary(diaryData); + const result = yield diaryService.postPetDiary(diaryData, diaryImages); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PETDIARY, "")); } catch (err) { diff --git a/dist/api/controller/diaryController.js.map b/dist/api/controller/diaryController.js.map index 5d977e1..52a95f5 100644 --- a/dist/api/controller/diaryController.js.map +++ b/dist/api/controller/diaryController.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/secondPartController.js b/dist/api/controller/secondPartController.js index 1aef08d..6eea63c 100644 --- a/dist/api/controller/secondPartController.js +++ b/dist/api/controller/secondPartController.js @@ -1,3 +1,4 @@ +"use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -7,12 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); var util = require('../../modules/util'); var responseMessage = require('../../modules/responseMessage'); var statusCode = require('../../modules/statusCode'); const secondPartService = require('../service/secondPartService'); module.exports = { - getMainPage: (req, res) => __awaiter(this, void 0, void 0, function* () { + getMainPage: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { userId } = req.params; try { const result = yield secondPartService.getMainPage(userId); @@ -23,7 +25,7 @@ module.exports = { return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } }), - getDiaryOfTableContents: (req, res) => __awaiter(this, void 0, void 0, function* () { + getDiaryOfTableContents: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { tableContentsId } = req.params; try { const result = yield secondPartService.getDiaryOfTableContents(tableContentsId); @@ -34,7 +36,7 @@ module.exports = { return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } }), - getSecondPartChapterList: (req, res) => __awaiter(this, void 0, void 0, function* () { + getSecondPartChapterList: (req, res) => __awaiter(void 0, void 0, void 0, function* () { try { const result = yield secondPartService.getSecondPartChapterList(); return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_CHAPTER_LIST, result)); @@ -44,7 +46,7 @@ module.exports = { return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } }), - addSecondPartChapter: (req, res) => __awaiter(this, void 0, void 0, function* () { + addSecondPartChapter: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const chapterData = req.body; try { yield secondPartService.addSecondPartChapter(chapterData); @@ -55,7 +57,7 @@ module.exports = { return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } }), - modifySecondPartChapterInfo: (req, res) => __awaiter(this, void 0, void 0, function* () { + modifySecondPartChapterInfo: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { chapterId } = req.params; const modifyChapterData = req.body; try { @@ -67,7 +69,7 @@ module.exports = { return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } }), - deleteSecondPartChapter: (req, res) => __awaiter(this, void 0, void 0, function* () { + deleteSecondPartChapter: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { chapterId } = req.params; try { yield secondPartService.deleteSecondPartChapter(chapterId); @@ -80,6 +82,63 @@ module.exports = { } return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); } + }), + getSecondPartDiary: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { diaryId } = req.params; + try { + const result = yield secondPartService.getSecondPartDiary(diaryId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_SECOND_PART_DIARY, result)); + } + catch (err) { + console.error(err); + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_GET_SECOND_PART_DIARY_ID)); + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + addSecondPartDiary: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const diaryData = req.body; + try { + yield secondPartService.addSecondPartDiary(diaryData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_DIARY)); + } + catch (err) { + console.error(err); + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_POST_SECOND_PART_DIARY)); + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + modifySecondPartDiary: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { diaryId } = req.params; + const diaryData = req.body; + try { + yield secondPartService.modifySecondPartDiary(diaryId, diaryData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_DIARY)); + } + catch (err) { + console.error(err); + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_PUT_SECOND_PART_DIARY)); + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), + deleteSecondPartDiary: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + const { diaryId } = req.params; + try { + yield secondPartService.deleteSecondPartDiary(diaryId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_DIARY)); + } + catch (err) { + console.error(err); + if (err.statusCode === 400) { + return res.status(statusCode.BAD_REQUEST).send(util.fail(statusCode.BAD_REQUEST, responseMessage.FAIL_TO_DELETE_SECOND_PART_DIARY)); + } + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } }) }; //# sourceMappingURL=secondPartController.js.map \ No newline at end of file diff --git a/dist/api/controller/secondPartController.js.map b/dist/api/controller/secondPartController.js.map index a14ab64..5cdc7ee 100644 --- a/dist/api/controller/secondPartController.js.map +++ b/dist/api/controller/secondPartController.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartController.js","sourceRoot":"","sources":["../../../src/api/controller/secondPartController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartController.js","sourceRoot":"","sources":["../../../src/api/controller/secondPartController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/userController.js b/dist/api/controller/userController.js index 9aacac2..4272776 100644 --- a/dist/api/controller/userController.js +++ b/dist/api/controller/userController.js @@ -35,7 +35,7 @@ module.exports = { try { const result = yield userService.login(email, password); console.log('얘가나오면 안되는데 : ', result); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS)); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS, result)); } catch (err) { console.log('bbbbb : ' + err.statusCode); diff --git a/dist/api/controller/userController.js.map b/dist/api/controller/userController.js.map index acb10a0..46fb2de 100644 --- a/dist/api/controller/userController.js.map +++ b/dist/api/controller/userController.js.map @@ -1 +1 @@ -{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACpC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAA;SAE/F;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACpC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAC,MAAM,CAAC,CAAC,CAAA;SAEtG;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/router/diary/index.js b/dist/api/router/diary/index.js index f78ab36..5ef5f6f 100644 --- a/dist/api/router/diary/index.js +++ b/dist/api/router/diary/index.js @@ -1,8 +1,9 @@ var express = require('express'); var router = express.Router(); var diaryController = require('../../controller/diaryController'); -router.post('/prologue', diaryController.postPrologue); //1부 프롤로그 작성 -router.post('/pet', diaryController.postPetDiary); //반려동물 일기 작성 +var upload = require('../../../modules/multer'); +router.post('/prologue/:userId', diaryController.postPrologue); //1부 프롤로그 작성 +router.post('/pet', upload.array('images', 5), diaryController.postPetDiary); //반려동물 일기 작성 router.get('/pet/:id', diaryController.getPetDiary); //반려동물 일기 상세 조회 router.put('/pet/:id', diaryController.putPetDiary); //반려동물 일기 수정 router.delete('/pet/:id', diaryController.deletePetDiary); //반려동물 일기 삭제 diff --git a/dist/api/router/diary/index.js.map b/dist/api/router/diary/index.js.map index a8c692b..f5a005f 100644 --- a/dist/api/router/diary/index.js.map +++ b/dist/api/router/diary/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AAEjE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAClE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AAC5D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AACjE,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAC1E,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AACrF,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/firstPart/index.js b/dist/api/router/firstPart/index.js index ff9318d..d49ccff 100644 --- a/dist/api/router/firstPart/index.js +++ b/dist/api/router/firstPart/index.js @@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const express_1 = __importDefault(require("express")); const router = express_1.default.Router(); -const firstPartController = require('../../controller/FirstPartController'); +const firstPartController = require('../../controller/firstPartController'); //1부 메인페이지 불러오기 router.get('/main/:userId', firstPartController.mainPage); module.exports = router; diff --git a/dist/api/router/index.js b/dist/api/router/index.js index 56978b3..0bd8994 100644 --- a/dist/api/router/index.js +++ b/dist/api/router/index.js @@ -9,7 +9,7 @@ router.use('/user', require('./user')); //user router.use('/pet', require('./pet')); //pet router.use('/chapter', require('./chapter')); //1부 목차 router.use('/diary', require('./diary')); //1부 일기 -router.use('/rainbow', require('./rainbow')); //무지개\ +router.use('/rainbow', require('./rainbow')); //무지개 router.use('/calendar', require('./calendar')); //캘린더 router.use('/firstPart', require('./firstPart')); //1부 router.use('/secondPart', require('./secondPart')); //2부 diff --git a/dist/api/router/index.js.map b/dist/api/router/index.js.map index 56a3724..eb34018 100644 --- a/dist/api/router/index.js.map +++ b/dist/api/router/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/router/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAC7B,IAAI,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAE9B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA,CAAA,MAAM;AAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA,CAAA,KAAK;AACxC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA,OAAO;AACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA,OAAO;AAC/C,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA,CAAC,MAAM;AACnD,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA,CAAC,KAAK;AACpD,MAAM,CAAC,GAAG,CAAC,YAAY,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA,CAAC,IAAI;AACpD,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAA,CAAA,IAAI;AAEtD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/router/index.ts"],"names":[],"mappings":";;;;;AAAA,sDAA6B;AAC7B,IAAI,MAAM,GAAG,iBAAO,CAAC,MAAM,EAAE,CAAC;AAE9B,MAAM,CAAC,GAAG,CAAC,OAAO,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA,CAAA,MAAM;AAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA,CAAA,KAAK;AACxC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA,OAAO;AACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA,OAAO;AAC/C,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA,CAAC,KAAK;AAClD,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA,CAAC,KAAK;AACpD,MAAM,CAAC,GAAG,CAAC,YAAY,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA,CAAC,IAAI;AACpD,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAA,CAAA,IAAI;AAEtD,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/rainbow/index.js b/dist/api/router/rainbow/index.js index 78b1372..33e4897 100644 --- a/dist/api/router/rainbow/index.js +++ b/dist/api/router/rainbow/index.js @@ -3,7 +3,7 @@ var router = express.Router(); let rainbowController = require('../../controller/rainbowController'); router.get('/main/:userId/:petId', rainbowController.mainPage); //1.5부 무지개 홈 화면 불러오기 router.get('/pet', rainbowController.selectRainbowPet); //1.5부 무지개 반려동물 선택 화면 불러오기 -router.get('/pet/:petId', rainbowController.setRainbowPet); //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 +router.put('/pet/:petId', rainbowController.setRainbowPet); //1.5부 무지개 반려동물 선택 적용 & 이별하는 무지개 다리 멘트 router.delete('/pet/:petId', rainbowController.cancelPartingPet); //1.5부 무지개 반려동물 떠나보내기 취소 router.get('/record/:petId', rainbowController.getReadyPartingPetComment); //1.5부 이별을 준비하는 작가의 기록 시작 멘트 불러오기 router.get('/moment/:userId/:petId', rainbowController.theBestMoment); //1.5부 무지개 최고의 순간 diff --git a/dist/api/router/secondPart/index.js b/dist/api/router/secondPart/index.js index 431e10b..b23112a 100644 --- a/dist/api/router/secondPart/index.js +++ b/dist/api/router/secondPart/index.js @@ -7,5 +7,9 @@ router.get('/chapter/list', secondPartController.getSecondPartChapterList); router.post('/chapter', secondPartController.addSecondPartChapter); router.put('/chapter/:chapterId', secondPartController.modifySecondPartChapterInfo); router.delete('/chapter/:chapterId', secondPartController.deleteSecondPartChapter); +router.get('/diary/user/:diaryId', secondPartController.getSecondPartDiary); //2부 일기 조회 +router.post('/diary/user', secondPartController.addSecondPartDiary); //2부 일기 작성 +router.put('/diary/user/:diaryId', secondPartController.modifySecondPartDiary); //2부 일기 수정 +router.delete('/diary/user/:diaryId', secondPartController.deleteSecondPartDiary); //2부 일기 삭제 module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/secondPart/index.js.map b/dist/api/router/secondPart/index.js.map index d41fb65..5574bdb 100644 --- a/dist/api/router/secondPart/index.js.map +++ b/dist/api/router/secondPart/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/secondPart/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,MAAM,oBAAoB,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAC7D,MAAM,CAAC,GAAG,CAAC,gCAAgC,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAC1F,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,CAAA;AAC1E,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,CAAA;AAClE,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,CAAA;AACnF,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAElF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/secondPart/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,MAAM,oBAAoB,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAA;AAE7E,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,WAAW,CAAC,CAAA;AAC7D,MAAM,CAAC,GAAG,CAAC,gCAAgC,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAC1F,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,CAAC,CAAA;AAC1E,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,oBAAoB,CAAC,CAAA;AAClE,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,2BAA2B,CAAC,CAAA;AACnF,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,uBAAuB,CAAC,CAAA;AAClF,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAA,CAAA,UAAU;AACpF,MAAM,CAAC,IAAI,CAAC,aAAa,EAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAA,CAAA,UAAU;AAC5E,MAAM,CAAC,GAAG,CAAC,sBAAsB,EAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAA,CAAA,UAAU;AACvF,MAAM,CAAC,MAAM,CAAC,sBAAsB,EAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAA,CAAA,UAAU;AAC1F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAA"} \ No newline at end of file diff --git a/dist/api/router/user/index.js b/dist/api/router/user/index.js index 5703847..ca21112 100644 --- a/dist/api/router/user/index.js +++ b/dist/api/router/user/index.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const express = require('express'); const router = express.Router(); const userController = require('../../controller/userController'); -router.post('/register', userController.register); //user register +router.post('/register/', userController.register); //user register router.post('/login', userController.login); //user login module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/user/index.js.map b/dist/api/router/user/index.js.map index 3f3b973..c2afcf4 100644 --- a/dist/api/router/user/index.js.map +++ b/dist/api/router/user/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/user/index.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAA;AAGjE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAA,CAAC,eAAe;AAChE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC,cAAc,CAAC,KAAK,CAAC,CAAA,CAAC,YAAY;AAEvD,MAAM,CAAC,OAAO,GAAC,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/user/index.ts"],"names":[],"mappings":";;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAClC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAA;AAGjE,MAAM,CAAC,IAAI,CAAC,YAAY,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAA,CAAC,eAAe;AACjE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAC,cAAc,CAAC,KAAK,CAAC,CAAA,CAAC,YAAY;AAEvD,MAAM,CAAC,OAAO,GAAC,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/chapterService.js b/dist/api/service/chapterService.js index 425f096..67c896e 100644 --- a/dist/api/service/chapterService.js +++ b/dist/api/service/chapterService.js @@ -81,7 +81,7 @@ module.exports = { max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter); } } - newFirstPartTable.chapter = max; + newFirstPartTable.chapter = max + 1; newFirstPartTable.title = chapterTitle; yield newFirstPartTable.save(); findUserChapter.book.tableContents.firstPartTableContents.push(newFirstPartTable); @@ -126,7 +126,14 @@ module.exports = { } console.log(allFirstTableContents); //해당 목차 삭제 - findChapter = null; + yield FirstPartTableContents_1.default.deleteOne({ _id: chapterId }); + const tableContents = (yield TableContents_1.default.find())[0]; + for (let j = 0; j < tableContents.firstPartTableContents.length; j++) { + if (tableContents.firstPartTableContents[j] == chapterId) { + tableContents.firstPartTableContents.splice(j, 1); + } + } + yield tableContents.save(); return responseMessage.SUCCESS_DELETE_CHAPTERLIST; } catch (err) { diff --git a/dist/api/service/chapterService.js.map b/dist/api/service/chapterService.js.map index 5f6a825..50fba57 100644 --- a/dist/api/service/chapterService.js.map +++ b/dist/api/service/chapterService.js.map @@ -1 +1 @@ -{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,6FAAoE;AACpE,+GAAsF;AAKtF,0EAA+G;AAC/G,kEAAyC;AACzC,kEAAmF;AACnF,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe,EAAE,CAAO,SAAS,EAAE,EAAE;QACjC,IAAI;YACA,cAAc;YAEd,MAAM,sBAAsB,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;YACzJ,8DAA8D;YAE9D,IAAI,eAAe,GAAG,IAAI,uCAAqB,CAAC,sBAAsB,CAAC,CAAA;YAEvE,SAAS;YACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC1B,IAAI,GAAG,GAAG,CAAC,CAAC;gBACZ,MAAM;gBACN,IAAI,OAAO,GAAG,IAAI,oCAAkB,EAAE,CAAA;gBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAC7D,IAAI,CAAC,IAAI,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;wBACzD,GAAG,EAAE,CAAC;wBACN,IAAI,QAAQ,GAAG,IAAI,+BAAa,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA,CAAA,4BAA4B;wBAChG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;wBAC5B,wEAAwE;qBAC3E;iBACJ;gBACD,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;gBAC1B,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACnB,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;aACtC;YACD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAC5B,OAAO,eAAe,CAAA;SAEzB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,cAAc,EAAE,CAAO,MAAM,EAAE,EAAE;QAC7B,MAAM,eAAe,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACtK,IAAI,WAAW,GAAG,IAAI,+BAAiB,EAAE,CAAA;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvF,IAAI,UAAU,GAAG,IAAI,2BAAa,CAAC,IAAI,gCAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5H,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;SACzC;QACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QACxB,OAAO,WAAW,CAAA;IACtB,CAAC,CAAA;IACD,eAAe,EAAE,CAAO,MAAM,EAAE,YAAY,EAAE,EAAE;QAC5C,IAAI;YACA,MAAM,eAAe,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACtK,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,EAAE,CAAC,CAAA,eAAe;YACtE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAC5B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACzB,IAAI,GAAG,GAAG,CAAC,CAAA;YAEX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACvF,IAAI,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;oBAC5E,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;iBACrF;aACJ;YACD,iBAAiB,CAAC,OAAO,GAAG,GAAG,CAAA;YAC/B,iBAAiB,CAAC,KAAK,GAAG,YAAY,CAAA;YAEtC,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YACjF,IAAI,gBAAgB,GAAG,IAAI,uBAAa,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YAC5E,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAA;YAE7B,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAE7B,OAAO,eAAe,CAAC,wBAAwB,CAAC;SACnD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,CAAA;SAC7F;IACL,CAAC,CAAA;IACD,cAAc,EAAE,CAAO,SAAS,EAAE,YAAY,EAAE,EAAE;QAC9C,IAAI;YACA,MAAM,WAAW,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrE,WAAW,CAAC,KAAK,GAAG,YAAY,CAAA;YAChC,MAAM,0BAA0B,GAAG,IAAI,gCAAsB,CAAC,WAAW,CAAC,CAAA;YAC1E,MAAM,0BAA0B,CAAC,IAAI,EAAE,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YAEvC,OAAO,eAAe,CAAC,uBAAuB,CAAC;SAClD;QACD,OAAO,GAAG,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,CAAA;SAC7F;IACL,CAAC,CAAA;IACD,iBAAiB,EAAE,CAAO,SAAS,EAAE,EAAE;QACnC,IAAI;YACA,IAAI,WAAW,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACnE,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAA;YACtC,MAAM,qBAAqB,GAAG,MAAM,gCAAsB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpE,IAAI,SAAS,GAAC,IAAI,gCAAsB,EAAE,CAAA;YAC1C,kBAAkB;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnD,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,UAAU,EAAE;oBAC/C,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBACnF;gBACD,SAAS;gBACT,SAAS,GAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;gBAClC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;aACzB;YACD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;YAElC,UAAU;YACV,WAAW,GAAC,IAAI,CAAC;YACjB,OAAO,eAAe,CAAC,0BAA0B,CAAC;SACrD;QACD,OAAO,GAAG,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,CAAA;SAC7F;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index cb1c177..f8a6843 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -const Book_1 = __importDefault(require("../../models/book/Book")); +const User_1 = __importDefault(require("../../models/user/User")); const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); const Pet_1 = __importDefault(require("../../models/pet/Pet")); @@ -25,38 +25,61 @@ require("../../models/pet/Pet"); require('../../models/tableContents/TableContents'); require('../../models/tableContents/FirstPartTableContents'); require('../../models/diary/PetDiary'); +require('../../models/diary/PetEmotions'); const util = require('../../modules/util'); const responseMessage = require('../../modules/responseMessage'); const statusCode = require('../../modules/statusCode'); module.exports = { - postPrologue: (bookData) => __awaiter(void 0, void 0, void 0, function* () { + postPrologue: (userId, bookData) => __awaiter(void 0, void 0, void 0, function* () { try { - // add book info - let book = yield Book_1.default.findById(bookData._id); - book.title = bookData.title; - book.imgs = bookData.image; - book.author = bookData.userName; - console.log(book); - //add tableContents info - let tc = yield new TableContents_1.default(); - let ftc = yield new FirstPartTableContents_1.default({ + console.log(userId); + //Create user object + const user = yield User_1.default.findById(userId).populate('book'); + console.log('user : ' + user); + // await Book.update( + // {_id: user.book._id }, + // {$set: {title: bookData.title, imgs: bookData.image,author: bookData.userName}} + // ) + const setBook = user.book; + setBook.title = bookData.title, + setBook.imgs = bookData.imgs, + setBook.author = bookData.userName; + //Create tableContents object + const tableContents = new TableContents_1.default(); + setBook.tableContents = tableContents; + yield tableContents.save(); + yield user.save(); + yield setBook.save(); + //Create firstPartTableContents object + const firstPartPrologue = new FirstPartTableContents_1.default({ chapter: 0, - title: bookData.prologueTitle, - contents: bookData.prologueContents + title: bookData.title, + contents: bookData.contents }); - yield tc.setFirstPartTableContents(ftc); - yield book.setTableContents(tc); - //save db - yield book.save(); - return responseMessage.SUCCESS_POST_PROLOGUE; + yield firstPartPrologue.save(); + console.log(tableContents); + yield tableContents.firstPartTableContents.push(firstPartPrologue); + const season = ["봄", "여름", "가을", "겨울"]; + for (let i = 0; i < 4; i++) { + let chapter = 1; + const dummyFirstPartTableContents = new FirstPartTableContents_1.default({ + chapter, + title: `${user.book.author}의 ${season[i]}` + }); + dummyFirstPartTableContents.save(); + yield tableContents.firstPartTableContents.push(dummyFirstPartTableContents); + chapter = chapter + 1; + } + yield tableContents.save(); + return user.book._id; //error handling } catch (err) { console.log(err); - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_BOOK }; + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; } }), - postPetDiary: (diaryData) => __awaiter(void 0, void 0, void 0, function* () { + postPetDiary: (diaryData, diaryImages) => __awaiter(void 0, void 0, void 0, function* () { const writeDate = yield new Date(diaryData.date); writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) @@ -66,7 +89,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: diaryData.diaryImages, + imgs: diaryImages, title: diaryData.title, contents: diaryData.contents }); @@ -74,14 +97,15 @@ module.exports = { //save petinfo let petN = diaryData.character.length; for (let i = 0; i < petN; i++) { - const petData = yield Pet_1.default.findById(diaryData.character[0]._id).populate('_id'); + const petData = yield Pet_1.default.findById(diaryData.character[i]._id).populate('_id'); newPetDiary.setPet(petData); //save emotions const petEmotion = new PetEmotions_1.default({ - pet: diaryData.character[0]._id, - feeling: diaryData.character[0].feeling + pet: diaryData.character[i]._id, + feeling: diaryData.character[i].feeling }); newPetDiary.setPetEmotions(petEmotion); + yield petEmotion.save(); } console.log(newPetDiary); yield newPetDiary.save(); @@ -99,8 +123,11 @@ module.exports = { try { const findPetDiary = yield PetDiary_1.default.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); let petDiaryPageResDto = yield new PetDiaryPageResDto_1.PetDiaryPageResDto(findPetDiary); //이부분 + // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) for (let i = 0; i < findPetDiary.petEmotions.length; i++) { - petDiaryPageResDto.setFeelingList(findPetDiary.petEmotions[i]); + let feelingList = new PetDiaryPageResDto_1.FeelingListDto(findPetDiary.pets[i]); + feelingList.setFeeling(findPetDiary.petEmotions[i]); + petDiaryPageResDto.setFeelingList(feelingList); } return petDiaryPageResDto; } @@ -140,11 +167,17 @@ module.exports = { }), deletePetDiary: (petDiaryId) => __awaiter(void 0, void 0, void 0, function* () { try { - let findPetDiary = yield PetDiary_1.default.findById(petDiaryId).populate('tableContents'); - console.log(findPetDiary); + let findPetDiary = yield PetDiary_1.default.findById(petDiaryId).populate('tableContents').populate('petEmotions'); + console.log('!!!!! : ' + findPetDiary); //화 정렬 순서 맞추기 //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 // let allDiaries=await (PetDiary.find({}).populate('tableContents')) + let thisDiariesTableContent = findPetDiary.tableContents; + for (let j = 0; j < thisDiariesTableContent.petDiary.length; j++) { + if (thisDiariesTableContent.petDiary[j]._id == petDiaryId) { + thisDiariesTableContent.petDiary.splice(j, 1); + } + } let petDiaries = (yield FirstPartTableContents_1.default.findOne({ chapter: { $eq: findPetDiary.tableContents.chapter } })).petDiary; for (let i = 0; i < petDiaries.length; i++) { let temp = yield PetDiary_1.default.findById(petDiaries[i]); @@ -153,7 +186,11 @@ module.exports = { yield temp.save(); } } + findPetDiary.petEmotions.forEach((petEmotion) => __awaiter(void 0, void 0, void 0, function* () { + yield PetEmotions_1.default.deleteOne({ _id: petEmotion._id }); + })); yield PetDiary_1.default.deleteOne({ _id: findPetDiary }); + yield thisDiariesTableContent.save(); console.log(findPetDiary); return responseMessage.SUCCESS_DELETE_PETDIARY; } diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 3c749e2..db4b98d 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/firstPartService.js b/dist/api/service/firstPartService.js index 98813b9..0c4d29f 100644 --- a/dist/api/service/firstPartService.js +++ b/dist/api/service/firstPartService.js @@ -66,6 +66,7 @@ module.exports = { } const firstPartMainPageResDto = new FirstPartMainPageResDto_1.FirstPartMainPageResDto(findUser.book); let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length - 1; + console.log('11111 : ' + lastTableNumber); //console.log("#:",lastTableNumber) const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]); //tableContents diff --git a/dist/api/service/firstPartService.js.map b/dist/api/service/firstPartService.js.map index 19fd747..26aa021 100644 --- a/dist/api/service/firstPartService.js.map +++ b/dist/api/service/firstPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 7abd99d..411878d 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -37,6 +37,7 @@ require('../../models/diary/PetEmotions'); require('../../models/tableContents/SecondPartTableContent'); require('../../models/diary/UserDiary'); require("../../models/etc/Help"); +require("../../models/etc/Comments"); module.exports = { getMainPage: (userId, petId) => __awaiter(void 0, void 0, void 0, function* () { try { @@ -125,7 +126,7 @@ module.exports = { const findUser = yield User_1.default.find().populate({ path: "pets" }); - const rainbowPetResDto = findUser[0].pets.map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); + const rainbowPetResDto = findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); return rainbowPetResDto; } catch (err) { @@ -149,6 +150,7 @@ module.exports = { findPet.rainbow = true; yield findPet.save(); const user = findPet.user; + // for() let diaryCount = 0; user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length); return new PartingRainbowResDto_1.PartingRainbowResDto(diaryCount, findPet.name); @@ -199,7 +201,6 @@ module.exports = { const TheBestMomentPetInfo = new TheBestMomentResDto_1.TheBestMomentPetInformation(pet); const diaryPerFeeling = []; for (let i = 0; i < 6; i++) { - console.log(i); const diaries = (yield PetEmotions_1.default.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary); if (diaries.length < 1) { diaryPerFeeling.push(null); @@ -211,6 +212,7 @@ module.exports = { const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(); for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); + const test = yield Comments_1.default.find(); let theBestMoment = null; if (j < 3) { theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])); diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index ca69053..5360bda 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index f6e079f..e9cb9c0 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -18,6 +18,7 @@ const User_1 = __importDefault(require("../../models/user/User")); const SecondPartMainPageResDto_1 = require("../../dto/secondPart/SecondPartMainPageResDto"); const SecondPartDiariesOfMonthResDto_1 = require("../../dto/secondPart/SecondPartDiariesOfMonthResDto"); const SecondPartChapterListResDto_1 = require("../../dto/secondPart/SecondPartChapterListResDto"); +const SecondPartDiaryResDto_1 = require("../../dto/secondPart/SecondPartDiaryResDto"); const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); const dateMethod = require("../../modules/dateMethod"); require('../../models/tableContents/FirstPartTableContents'); @@ -158,6 +159,64 @@ module.exports = { catch (err) { throw err; } + }), getSecondPartDiary: (diaryId) => __awaiter(void 0, void 0, void 0, function* () { + try { + console.log(diaryId); + const findSecondPartDiary = yield UserDiary_1.default.findById(diaryId).populate('users').populate('tableContents'); + console.log(findSecondPartDiary); + let secondPartDiaryResDto = yield new SecondPartDiaryResDto_1.SecondPartDiaryResDto(findSecondPartDiary); + console.log(secondPartDiaryResDto); + return secondPartDiaryResDto; + } + catch (err) { + console.log(err); + throw { statusCode: 400 }; + } + }), addSecondPartDiary: (diaryData) => __awaiter(void 0, void 0, void 0, function* () { + const secondPartTableContents = yield SecondPartTableContent_1.default.findById(diaryData.chapterId).populate('userDiary'); + console.log("length: ", secondPartTableContents.userDiary.length); + let newUserDiary = new UserDiary_1.default({ + tableContents: diaryData.chapterId, + episode: secondPartTableContents.userDiary.length, + imgs: diaryData.diaryImages, + title: diaryData.title, + contents: diaryData.contents, + feeling: diaryData.feeling + }); + secondPartTableContents.setUserDiary(newUserDiary); + yield secondPartTableContents.save(); + try { + console.log(newUserDiary); + yield newUserDiary.save(); + } + catch (err) { + console.log(err); + throw { statusCode: 400 }; + } + }), + modifySecondPartDiary: (diaryId, diaryData) => __awaiter(void 0, void 0, void 0, function* () { + try { + yield UserDiary_1.default.updateOne({ _id: diaryId }, { $set: { imgs: diaryData.diaryImages, title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling } }); + } + catch (err) { + throw err; + } + }), deleteSecondPartDiary: (diaryId) => __awaiter(void 0, void 0, void 0, function* () { + try { + const findDiary = yield UserDiary_1.default.findById(diaryId).populate('tableContents'); + const userDiaries = (yield SecondPartTableContent_1.default.findOne({ chapter: { $eq: findDiary.tableContents.chapter } })).userDiary; + for (let i = 0; i < userDiaries.length; i++) { + let userChapter = yield UserDiary_1.default.findById(userDiaries[i]); + if (findDiary.episode <= userChapter.episode) { + userChapter.episode = Number(userChapter.episode) - 1; + yield userChapter.save(); + } + } + yield UserDiary_1.default.deleteOne({ _id: findDiary }); + } + catch (err) { + throw err; + } }) }; //# sourceMappingURL=secondPartService.js.map \ No newline at end of file diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index b2889bb..7696d9d 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/userService.js b/dist/api/service/userService.js index 977a540..ba5bb23 100644 --- a/dist/api/service/userService.js +++ b/dist/api/service/userService.js @@ -14,8 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const User_1 = __importDefault(require("../../models/user/User")); const Book_1 = __importDefault(require("../../models/book/Book")); -const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); -const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); const bcryptjs_1 = __importDefault(require("bcryptjs")); const express_validator_1 = require("express-validator"); const validator = require('validator'); @@ -39,25 +37,17 @@ module.exports = { if (user) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.ALREADY_ID }; } + const book = new Book_1.default(); user = new User_1.default({ email, - password + password, + book }); + yield book.save(); //Encrpyt password const salt = yield bcryptjs_1.default.genSalt(10); user.password = yield bcryptjs_1.default.hash(password, salt); - //Create book object - const book = new Book_1.default(); - //Create tableContents object - const tableContents = new TableContents_1.default(); - //Create firstPartTableContents object - const firstPart = new FirstPartTableContents_1.default(); - tableContents.setFirstPartTableContents(firstPart); - book.setTableContents(tableContents); - user.setBook(book); - //db save - yield user.save(); - return { bookId: book._id }; + user.save(); }), login: (email, password) => __awaiter(void 0, void 0, void 0, function* () { try { @@ -65,7 +55,9 @@ module.exports = { if (!errors.isEmpty()) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.EMPTY_ID }; } - let user = yield User_1.default.findOne({ email }); + let user = yield User_1.default.findOne({ email }).populate({ + path: "pets" + }); if (!user) { //등록되지 않은 email throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; @@ -75,6 +67,8 @@ module.exports = { if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } + const petId = user.pets[0]._id; + return { userId: user._id, petId: petId }; } catch (err) { throw err; diff --git a/dist/api/service/userService.js.map b/dist/api/service/userService.js.map index 4143458..452760b 100644 --- a/dist/api/service/userService.js.map +++ b/dist/api/service/userService.js.map @@ -1 +1 @@ -{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js index cf7ad97..da90467 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -38,6 +38,7 @@ exports.FirstPartMainPageResDto = FirstPartMainPageResDto; class DiaryResDto { //가장 마지막 화 들어감 constructor(firstPartTableContents) { + console.log('bbbbbb : ' + firstPartTableContents); this.init(firstPartTableContents); } init(firstPartTableContents) { @@ -60,7 +61,7 @@ class TableContentsResDto { this.chapterId = firstPartTableContents._id; //목차 Id this.chapter = firstPartTableContents.chapter; this.chapterName = firstPartTableContents.title; - this.episodePerchapterCount = firstPartTableContents.petDiary.length; + this.episodePerchapterCount = firstPartTableContents.petDiary.length < 1 ? 0 : firstPartTableContents.petDiary.length; } } exports.TableContentsResDto = TableContentsResDto; diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map index be3910d..b20c20f 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petDiary/PetDiaryPageResDto.js b/dist/dto/petDiary/PetDiaryPageResDto.js index 9fc494a..270ceba 100644 --- a/dist/dto/petDiary/PetDiaryPageResDto.js +++ b/dist/dto/petDiary/PetDiaryPageResDto.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.PetDiaryPageResDto = void 0; +exports.FeelingListDto = exports.PetDiaryPageResDto = void 0; require("../../models/user/User"); require("../../models/book/Book"); require("../../models/pet/Pet"); @@ -27,8 +27,9 @@ class PetDiaryPageResDto { date: null, contents: null, timeTogether: null, - kind: null, + // kind: null, feelingList: [] + //feeling,kind,img }; this.init(petDiary); } @@ -41,13 +42,26 @@ class PetDiaryPageResDto { this.petDiary.date = yield dateMethod.toKoreanByFormatting(petDiary.date); this.petDiary.episode = petDiary.episode; this.petDiary.contents = petDiary.contents; - this.petDiary.kind = petDiary.pets[0].kind; + // this.petDiary.kind = petDiary.pets[0].kind this.petDiary.timeTogether = yield dateMethod.getElapsedDay(petDiary.pets[0].startDate); }); } - setFeelingList(emotion) { - this.petDiary.feelingList.push(emotion.feeling); + setFeelingList(feelingList) { + this.petDiary.feelingList.push(feelingList); } } exports.PetDiaryPageResDto = PetDiaryPageResDto; +class FeelingListDto { + constructor(pet) { + this.feeling = null; + this.kind = null; + this.petImgs = null; + this.kind = pet.kind; + this.petImgs = pet.imgs; + } + setFeeling(emotion) { + this.feeling = emotion.feeling; + } +} +exports.FeelingListDto = FeelingListDto; //# sourceMappingURL=PetDiaryPageResDto.js.map \ No newline at end of file diff --git a/dist/dto/petDiary/PetDiaryPageResDto.js.map b/dist/dto/petDiary/PetDiaryPageResDto.js.map index c92a228..4de9aed 100644 --- a/dist/dto/petDiary/PetDiaryPageResDto.js.map +++ b/dist/dto/petDiary/PetDiaryPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"PetDiaryPageResDto.js","sourceRoot":"","sources":["../../../src/dto/petDiary/PetDiaryPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,kBAAkB;IAe3B,YAAY,QAAmB;QAdxB,aAAQ,GAAG;YACd,GAAG,EAAE,IAAI;YACT,eAAe;YACf,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,EAAE;SAClB,CAAA;QAIG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IACK,IAAI,CAAC,QAAmB;;YAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAA;YAChC,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;YACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAA;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACzE,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;YACxC,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC3F,CAAC;KAAA;IACD,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACnD,CAAC;CAEJ;AAjCD,gDAiCC"} \ No newline at end of file +{"version":3,"file":"PetDiaryPageResDto.js","sourceRoot":"","sources":["../../../src/dto/petDiary/PetDiaryPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,kBAAkB;IAgB3B,YAAY,QAAmB;QAfxB,aAAQ,GAAG;YACd,GAAG,EAAE,IAAI;YACT,eAAe;YACf,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,IAAI;YAClB,cAAc;YACd,WAAW,EAAE,EAAE;YACf,kBAAkB;SACrB,CAAA;QAIG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IACK,IAAI,CAAC,QAAmB;;YAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAA;YAChC,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;YACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAA;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACzE,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;YACxC,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAC1C,6CAA6C;YAC7C,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAC3F,CAAC;KAAA;IACD,cAAc,CAAC,WAA0B;QACrC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC/C,CAAC;CAEJ;AAlCD,gDAkCC;AAED,MAAa,cAAc;IAIvB,YAAY,GAAQ;QAHR,YAAO,GAAC,IAAI,CAAA;QACZ,SAAI,GAAC,IAAI,CAAA;QACT,YAAO,GAAC,IAAI,CAAA;QAEpB,IAAI,CAAC,IAAI,GAAC,GAAG,CAAC,IAAI,CAAA;QAClB,IAAI,CAAC,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;IACzB,CAAC;IACD,UAAU,CAAC,OAAoB;QAC3B,IAAI,CAAC,OAAO,GAAC,OAAO,CAAC,OAAO,CAAA;IAChC,CAAC;CAKJ;AAfD,wCAeC"} \ No newline at end of file diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js index 685698e..042ad54 100644 --- a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js @@ -16,8 +16,10 @@ class BookInfoResDto { constructor(book) { this.title = null; this.bookImg = null; + this.author = null; this.title = book.title; this.bookImg = book.imgs; + this.author = book.author; } } exports.BookInfoResDto = BookInfoResDto; diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map index df79062..2fbb76e 100644 --- a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"ReadyPartingAndStartRecordResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gCAAgC;IAKzC,YAAY,UAAmB,EAAE,WAAoB,EAAE,QAAyB;QAJhF,eAAU,GAAG,CAAC,CAAC;QACf,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,EAAE,CAAA;QAGT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAVD,4EAUC;AAED,MAAa,cAAc;IAIvB,YAAY,IAAY;QAHxB,UAAK,GAAG,IAAI,CAAC;QACb,YAAO,GAAG,IAAI,CAAC;QAGX,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC5B,CAAC;CACJ;AARD,wCAQC"} \ No newline at end of file +{"version":3,"file":"ReadyPartingAndStartRecordResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gCAAgC;IAKzC,YAAY,UAAmB,EAAE,WAAoB,EAAE,QAAyB;QAJhF,eAAU,GAAG,CAAC,CAAC;QACf,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,EAAE,CAAA;QAGT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAVD,4EAUC;AAED,MAAa,cAAc;IAIvB,YAAY,IAAY;QAHxB,UAAK,GAAG,IAAI,CAAC;QACb,YAAO,GAAG,IAAI,CAAC;QACf,WAAM,GAAG,IAAI,CAAC;QAEV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;IAC7B,CAAC;CACJ;AATD,wCASC"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js index 56d55ac..34d9312 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -55,6 +55,7 @@ class TheBestMomentDiary { } init(diaryPerFeeling) { return __awaiter(this, void 0, void 0, function* () { + console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling); this.chapter = diaryPerFeeling.tableContents.chapter; this.episode = diaryPerFeeling.episode; this.title = diaryPerFeeling.title; diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 822a9f3..9743235 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAA6B,EAAE,kBAAyC;QAJ5E,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAlBD,gDAkBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAA6B,EAAE,kBAAyC;QAJ5E,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAC,eAAe,CAAC,CAAA;YAC3D,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAnBD,gDAmBC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiaryResDto.js b/dist/dto/secondPart/SecondPartDiaryResDto.js new file mode 100644 index 0000000..08d0a3a --- /dev/null +++ b/dist/dto/secondPart/SecondPartDiaryResDto.js @@ -0,0 +1,49 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SecondPartDiaryResDto = void 0; +require("../../models/user/User"); +require("../../models/book/Book"); +require("../../models/pet/Pet"); +require('../../models/tableContents/TableContents'); +require('../../models/tableContents/SecondPartTableContent'); +const dateMethod = require('../../modules/dateMethod'); +class SecondPartDiaryResDto { + constructor(userDiary) { + this.secondPartDiary = { + _id: null, + episode: null, + title: null, + diaryImg: [], + date: null, + contents: null, + feelingList: [] + }; + this.init(userDiary); + } + init(userDiary) { + return __awaiter(this, void 0, void 0, function* () { + this.secondPartDiary._id = userDiary._id; + this.secondPartDiary.title = userDiary.title; + this.secondPartDiary.diaryImg = userDiary.imgs; + this.secondPartDiary.date = yield dateMethod.toKoreanByFormatting(userDiary.date); + this.secondPartDiary.episode = userDiary.episode; + this.secondPartDiary.contents = userDiary.contents; + this.secondPartDiary.feelingList[0] = { + kind: 0, + petImgs: null, + feeling: userDiary.feeling + }; + }); + } +} +exports.SecondPartDiaryResDto = SecondPartDiaryResDto; +//# sourceMappingURL=SecondPartDiaryResDto.js.map \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiaryResDto.js.map b/dist/dto/secondPart/SecondPartDiaryResDto.js.map new file mode 100644 index 0000000..f8b03ae --- /dev/null +++ b/dist/dto/secondPart/SecondPartDiaryResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SecondPartDiaryResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiaryResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,qBAAqB;IAW9B,YAAY,SAAqB;QAV1B,oBAAe,GAAG;YACrB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,EAAE;SAClB,CAAA;QAGG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACxB,CAAC;IACK,IAAI,CAAC,SAAqB;;YAC5B,IAAI,CAAC,eAAe,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAA;YACxC,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YAC5C,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAA;YAC9C,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACjF,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;YAChD,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;YAClD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,GAAC;gBAChC,IAAI,EAAC,CAAC;gBACN,OAAO,EAAC,IAAI;gBACZ,OAAO,EAAC,SAAS,CAAC,OAAO;aAC5B,CAAA;QACL,CAAC;KAAA;CACJ;AA3BD,sDA2BC"} \ No newline at end of file diff --git a/dist/models/tableContents/TableContents.js b/dist/models/tableContents/TableContents.js index 93a6990..266806e 100644 --- a/dist/models/tableContents/TableContents.js +++ b/dist/models/tableContents/TableContents.js @@ -17,13 +17,15 @@ const TableContentsSchema = new mongoose_1.default.Schema({ firstPartTableContents: [ { type: mongoose_1.default.SchemaTypes.ObjectId, - ref: "FirstPartTableContents" + ref: "FirstPartTableContents", + default: [] } ], secondPartTableContents: [ { type: mongoose_1.default.SchemaTypes.ObjectId, - ref: "SecondPartTableContents" + ref: "SecondPartTableContents", + default: [] } ], secondPartStartDate: { diff --git a/dist/models/tableContents/TableContents.js.map b/dist/models/tableContents/TableContents.js.map index 2e4f155..083ef68 100644 --- a/dist/models/tableContents/TableContents.js.map +++ b/dist/models/tableContents/TableContents.js.map @@ -1 +1 @@ -{"version":3,"file":"TableContents.js","sourceRoot":"","sources":["../../../src/models/tableContents/TableContents.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAK3C,MAAM,mBAAmB,GAAmC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC5E,sBAAsB,EAAE;QACpB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,wBAAwB;SAChC;KACJ;IACD,uBAAuB,EAAE;QACrB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,yBAAyB;SACjC;KACJ;IACD,mBAAmB,EAAG;QAClB,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AAEF,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,GAAG,UAAgB,aAAsC;;QAC1G,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACnD,CAAC;CAAA,CAAA;AAED,mBAAmB,CAAC,OAAO,CAAC,0BAA0B,GAAG,UAAgB,aAAuC;;QAC5G,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACpD,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA8C,eAAe,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"TableContents.js","sourceRoot":"","sources":["../../../src/models/tableContents/TableContents.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wDAA2C;AAK3C,MAAM,mBAAmB,GAAmC,IAAI,kBAAQ,CAAC,MAAM,CAAC;IAC5E,sBAAsB,EAAE;QACpB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,wBAAwB;YAC7B,OAAO,EAAC,EAAE;SACb;KACJ;IACD,uBAAuB,EAAE;QACrB;YACI,IAAI,EAAE,kBAAQ,CAAC,WAAW,CAAC,QAAQ;YACnC,GAAG,EAAE,yBAAyB;YAC9B,OAAO,EAAC,EAAE;SACb;KACJ;IACD,mBAAmB,EAAG;QAClB,IAAI,EAAG,IAAI;QACX,OAAO,EAAG,IAAI,CAAC,GAAG,EAAE;KACvB;CACJ,CAAC,CAAA;AAEF,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,GAAG,UAAgB,aAAsC;;QAC1G,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACnD,CAAC;CAAA,CAAA;AAED,mBAAmB,CAAC,OAAO,CAAC,0BAA0B,GAAG,UAAgB,aAAuC;;QAC5G,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACpD,CAAC;CAAA,CAAA;AAED,kBAAe,kBAAQ,CAAC,KAAK,CAA8C,eAAe,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/models/user/User.js b/dist/models/user/User.js index 57550cd..8d31938 100644 --- a/dist/models/user/User.js +++ b/dist/models/user/User.js @@ -19,12 +19,12 @@ const UserSchema = new mongoose_1.default.Schema({ pets: [ { type: mongoose_1.default.SchemaTypes.ObjectId, - ref: "Pet" + ref: "Pet", } ], book: { type: mongoose_1.default.SchemaTypes.ObjectId, - ref: "Book" + ref: "Book", }, feelingCount: { type: Number } }); diff --git a/dist/modules/responseMessage.js b/dist/modules/responseMessage.js index e1e0046..4f6e518 100644 --- a/dist/modules/responseMessage.js +++ b/dist/modules/responseMessage.js @@ -49,6 +49,14 @@ module.exports = { SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER: "2부 목차 수정 성공", SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER: "2부 목차 삭제 성공", FAIL_TO_GET_SECOND_PART_TABLE_CONTENTS: "잘못된 2부 목차의 ID입니다.", + SUCCESS_GET_SECOND_PART_DIARY: "2부 일기 불러오기 성공", + FAIL_TO_GET_SECOND_PART_DIARY_ID: "잘못된 2부 일기의 ID입니다.", + SUCCESS_POST_SECOND_PART_DIARY: "2부 일기 작성 성공", + FAIL_TO_POST_SECOND_PART_DIARY: "2부 일기 작성 실패", + SUCCESS_PUT_SECOND_PART_DIARY: "2부 일기 수정 성공", + FAIL_TO_PUT_SECOND_PART_DIARY: "2부 일기 수정 실패", + SUCCESS_DELETE_SECOND_PART_DELETE_DIARY: "2부 일기 삭제 성공", + FAIL_TO_DELETE_SECOND_PART_DIARY: "2부 일기 삭제 실패", /* 서버에러 */ INTERNAL_SERVER_ERROR: "서버 내부 오류", }; diff --git a/dist/modules/responseMessage.js.map b/dist/modules/responseMessage.js.map index dbf4d78..8a335bf 100644 --- a/dist/modules/responseMessage.js.map +++ b/dist/modules/responseMessage.js.map @@ -1 +1 @@ -{"version":3,"file":"responseMessage.js","sourceRoot":"","sources":["../../src/modules/responseMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,UAAU,EAAE,cAAc;IAC1B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,MAAM;IAEpB,UAAU;IACV,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAC,gBAAgB;IAE3B,SAAS;IACT,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,mBAAmB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,uBAAuB;IAEnC,eAAe;IACf,OAAO,EAAC,kBAAkB;IAC1B,QAAQ,EAAC,qBAAqB;IAC9B,WAAW,EAAC,gBAAgB;IAC5B,qBAAqB,EAAC,iBAAiB;IACvC,qBAAqB,EAAC,iBAAiB;IACvC,uBAAuB,EAAC,iBAAiB;IACzC,4BAA4B,EAAC,gBAAgB;IAC7C,uBAAuB,EAAE,cAAc;IACvC,wBAAwB,EAAE,cAAc;IACxC,wBAAwB,EAAE,cAAc;IACxC,0BAA0B,EAAE,cAAc;IAC1C,oBAAoB,EAAE,YAAY;IAClC,8BAA8B,EAAC,gBAAgB;IAE/C,yBAAyB;IACzB,6BAA6B,EAAG,iBAAiB;IACjD,uBAAuB,EAAG,mBAAmB;IAC7C,+BAA+B,EAAG,wBAAwB;IAC1D,0BAA0B,EAAG,kBAAkB;IAC/C,qCAAqC,EAAG,+BAA+B;IACvE,uBAAuB,EAAG,gBAAgB;IAC1C,2BAA2B,EAAG,mBAAmB;IACjD,qBAAqB,EAAG,wBAAwB;IAChD,4BAA4B,EAAG,iBAAiB;IAEhD,SAAS;IACT,0BAA0B,EAAG,mBAAmB;IAChD,yBAAyB,EAAG,mBAAmB;IAE/C,QAAQ;IACR,iCAAiC,EAAG,kBAAkB;IACtD,8CAA8C,EAAG,mBAAmB;IACpE,oCAAoC,EAAG,mBAAmB;IAC1D,oCAAoC,EAAG,aAAa;IACpD,sCAAsC,EAAE,aAAa;IACrD,yCAAyC,EAAG,aAAa;IACzD,sCAAsC,EAAG,mBAAmB;IAE5D,UAAU;IACV,qBAAqB,EAAE,UAAU;CACpC,CAAA"} \ No newline at end of file +{"version":3,"file":"responseMessage.js","sourceRoot":"","sources":["../../src/modules/responseMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,UAAU,EAAE,cAAc;IAC1B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,MAAM;IAEpB,UAAU;IACV,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAC,gBAAgB;IAE3B,SAAS;IACT,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,mBAAmB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,uBAAuB;IAEnC,eAAe;IACf,OAAO,EAAC,kBAAkB;IAC1B,QAAQ,EAAC,qBAAqB;IAC9B,WAAW,EAAC,gBAAgB;IAC5B,qBAAqB,EAAC,iBAAiB;IACvC,qBAAqB,EAAC,iBAAiB;IACvC,uBAAuB,EAAC,iBAAiB;IACzC,4BAA4B,EAAC,gBAAgB;IAC7C,uBAAuB,EAAE,cAAc;IACvC,wBAAwB,EAAE,cAAc;IACxC,wBAAwB,EAAE,cAAc;IACxC,0BAA0B,EAAE,cAAc;IAC1C,oBAAoB,EAAE,YAAY;IAClC,8BAA8B,EAAC,gBAAgB;IAE/C,yBAAyB;IACzB,6BAA6B,EAAG,iBAAiB;IACjD,uBAAuB,EAAG,mBAAmB;IAC7C,+BAA+B,EAAG,wBAAwB;IAC1D,0BAA0B,EAAG,kBAAkB;IAC/C,qCAAqC,EAAG,+BAA+B;IACvE,uBAAuB,EAAG,gBAAgB;IAC1C,2BAA2B,EAAG,mBAAmB;IACjD,qBAAqB,EAAG,wBAAwB;IAChD,4BAA4B,EAAG,iBAAiB;IAEhD,SAAS;IACT,0BAA0B,EAAG,mBAAmB;IAChD,yBAAyB,EAAG,mBAAmB;IAE/C,QAAQ;IACR,iCAAiC,EAAG,kBAAkB;IACtD,8CAA8C,EAAG,mBAAmB;IACpE,oCAAoC,EAAG,mBAAmB;IAC1D,oCAAoC,EAAG,aAAa;IACpD,sCAAsC,EAAE,aAAa;IACrD,yCAAyC,EAAG,aAAa;IACzD,sCAAsC,EAAG,mBAAmB;IAC5D,6BAA6B,EAAC,eAAe;IAC7C,gCAAgC,EAAC,mBAAmB;IACpD,8BAA8B,EAAC,aAAa;IAC5C,8BAA8B,EAAC,aAAa;IAC5C,6BAA6B,EAAC,aAAa;IAC3C,6BAA6B,EAAC,aAAa;IAC3C,uCAAuC,EAAC,aAAa;IACrD,gCAAgC,EAAC,aAAa;IAG9C,UAAU;IACV,qBAAqB,EAAE,UAAU;CACpC,CAAA"} \ No newline at end of file diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index 04812b3..27c8220 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -58,6 +58,7 @@ module.exports = { const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length-1 + console.log('11111 : '+lastTableNumber) //console.log("#:",lastTableNumber) const lastDiary = new DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 54c867a..748d58f 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -212,9 +212,7 @@ module.exports = { const diaryPerFeeling = [] for (let i = 0; i < 6; i++) { - console.log(i) const diaries = (await PetEmotions.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary) - console.log('diaries : '+diaries) if (diaries.length < 1) { diaryPerFeeling.push(null) } else { diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index cfa4348..73b0a0c 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -43,6 +43,7 @@ export class DiaryResDto { //가장 마지막 화 들어감 constructor(firstPartTableContents: IFirstPartTableContents) { + console.log('bbbbbb : '+firstPartTableContents) this.init(firstPartTableContents) } From 43d3ff1f55c29d81633ce9b58de38e77204dd85a Mon Sep 17 00:00:00 2001 From: hyunjong-96 <57162257+hyunjong-96@users.noreply.github.com> Date: Wed, 14 Jul 2021 02:33:25 +0900 Subject: [PATCH 091/168] Delete s3.json --- src/config/s3.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/config/s3.json diff --git a/src/config/s3.json b/src/config/s3.json deleted file mode 100644 index 626b115..0000000 --- a/src/config/s3.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "accessKeyId": "AKIAYBR5NJVMWLVU4RNJ", - "secretAccessKey": "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", - "region": "ap-northeast-2" -} \ No newline at end of file From 5db9504bf54e763521b4fe71860e19312ef24d7a Mon Sep 17 00:00:00 2001 From: sol Date: Wed, 14 Jul 2021 03:55:32 +0900 Subject: [PATCH 092/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=ED=99=94=EB=A9=B4=20api=20-=20=EC=B5=9C=EA=B7=BC?= =?UTF-8?q?=20=EC=9D=BC=EA=B8=B0=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EA=B8=B0=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/firstPartService.ts | 24 +++++++++--- .../mainPageDto/FirstPartMainPageResDto.ts | 39 +++++++++---------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index 04812b3..9dd05bd 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -8,7 +8,7 @@ const statusCode = require('../../modules/statusCode') import Book from "../../models/book/Book" import TableContents from "../../models/tableContents/TableContents" import FirstPartTableContents from "../../models/tableContents/FirstPartTableContents" - +import PetDiary from "../../models/diary/PetDiary" require("../../models/user/User") require("../../models/pet/Pet") require("../../models/book/Book") @@ -39,7 +39,7 @@ module.exports = { }) }) }) - + console.log("user",findUser) let newBook=new Book() let newTableContents=new TableContents() let newFirstPartTableContents=new FirstPartTableContents() @@ -57,11 +57,25 @@ module.exports = { } const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) - let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length-1 - //console.log("#:",lastTableNumber) + let allPetDiaries = await PetDiary.find({}).populate('tableContents') + let petDiaryNumber=(await allPetDiaries).length + // //prologue + // if(petDiaryNumber==0){ + // let prologue=findUser.book.tableContents.firstPartTableContents[0] + // const prologueDiary=new Diary({ + // chapter=0, + // episode=0, + // _id="60ed4a6a1d5f293a94db7e3d", + // title=prologue.title, + // contents=prologue.contents + // }) + // } + //가장 마지막 일기 + const lastDiary = new DiaryResDto(allPetDiaries[petDiaryNumber-1]) - const lastDiary = new DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]) //tableContents + let lastTableNumber=findUser.book.tableContents.firstPartTableContents.length + console.log("lastTable", TableContents) for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]) firstPartMainPageResDto.setTableContents(tableContentsResDto) diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 3a83aab..d2341bc 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -5,7 +5,7 @@ import { IBook } from "../../../interfaces/book/IBook"; import { IFirstPartTableContents } from "../../../interfaces/tableContents/IFirstPartTableContents"; import { ITableContents } from "../../../interfaces/tableContents/ITableContents"; import { IUser } from "../../../interfaces/user/IUser"; -const dateMethod=require('../../../modules/dateMethod') +const dateMethod = require('../../../modules/dateMethod') export class FirstPartMainPageResDto { public firstPartMainPage = { @@ -13,7 +13,7 @@ export class FirstPartMainPageResDto { bookImg: null, diary: {}, tableContents: [], - secondPartBook : null + secondPartBook: null } constructor(book: IBook) { @@ -28,7 +28,7 @@ export class FirstPartMainPageResDto { setTableContents(tableContents: TableContentsResDto) { this.firstPartMainPage.tableContents.push(tableContents) } - setSecondPartBook(user : IUser){ + setSecondPartBook(user: IUser) { this.firstPartMainPage.secondPartBook = new SecondPartBookResDto(user) } } @@ -42,20 +42,19 @@ export class DiaryResDto { private date; //가장 마지막 화 들어감 - constructor(firstPartTableContents: IFirstPartTableContents) { - this.init(firstPartTableContents) + constructor(petDiary: IPetDiary) { + this.init(petDiary) } - async init(firstPartTableContents: IFirstPartTableContents){ - console.log('!!!!!!!!!!!!!!! : '+firstPartTableContents) + async init(petDiary: IPetDiary) { + const firstPartTableContents = petDiary.tableContents this.chapter = firstPartTableContents.chapter this.episode = firstPartTableContents.petDiary.length; - console.log('@@@@@@@ : '+this.episode) - console.log('######## : '+firstPartTableContents.petDiary[this.episode-1]) - this._id = firstPartTableContents.petDiary[this.episode-1]._id - this.title = firstPartTableContents.petDiary[this.episode-1].title; - this.contents = firstPartTableContents.petDiary[this.episode-1].contents; - this.date = await dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode-1].date); + + this._id = petDiary._id + this.title = petDiary.title; + this.contents = petDiary.contents; + this.date = await dateMethod.toStringByFormatting(petDiary.date); } } @@ -66,24 +65,24 @@ export class TableContentsResDto { private episodePerchapterCount; constructor(firstPartTableContents: IFirstPartTableContents) { - this.chapterId = firstPartTableContents._id //목차 Id - this.chapter = firstPartTableContents.chapter; - this.chapterName = firstPartTableContents.title; - this.episodePerchapterCount = firstPartTableContents.petDiary.length; + this.chapterId = firstPartTableContents._id //목차 Id + this.chapter = firstPartTableContents.chapter; + this.chapterName = firstPartTableContents.title; + this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } -export class SecondPartBookResDto{ +export class SecondPartBookResDto { private userId private imgs private author private date - constructor(user : IUser){ + constructor(user: IUser) { this.init(user) } - async init(user : IUser){ + async init(user: IUser) { this.userId = user._id this.imgs = user.book.imgs this.author = user.book.author From 8b28843f33b0c071a72ebce1d9e08b1360a6c858 Mon Sep 17 00:00:00 2001 From: sol Date: Wed, 14 Jul 2021 04:44:19 +0900 Subject: [PATCH 093/168] =?UTF-8?q?refactor=20:=20=EC=9D=BC=EA=B8=B0=20?= =?UTF-8?q?=EB=AA=A9=EC=B0=A8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20api=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/chapterService.ts | 20 +++++++++++-------- src/api/service/firstPartService.ts | 1 - src/api/service/userService.ts | 3 ++- .../mainPageDto/FirstPartMainPageResDto.ts | 7 +++++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 9d1a554..a42361e 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -30,18 +30,22 @@ module.exports = { let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) //월별로 자르기 - for (let m = 1; m <= 12; m++) { + for (let m = 12; m >= 1; m--) { let cnt = 0; //1화부터 let monthly = new MonthlyDiaryResDto() + for (let i = 0; i < findFirstTableContents.petDiary.length; i++) { + if (m == findFirstTableContents.petDiary[i].date.getMonth()) { cnt++; let newDiary = new DiariesResDto(findFirstTableContents.petDiary[i])//diary monthly.setDiaries(newDiary) //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } + } + if (cnt == 0) continue monthly.setMonthCount(cnt) monthly.setMonth(m) newChapterDiary.setMonthly(monthly) @@ -77,7 +81,7 @@ module.exports = { max = Number(findUserChapter.book.tableContents.firstPartTableContents[i].chapter) } } - newFirstPartTable.chapter = max+1 + newFirstPartTable.chapter = max + 1 newFirstPartTable.title = chapterTitle await newFirstPartTable.save() @@ -113,25 +117,25 @@ module.exports = { let findChapter = await FirstPartTableContents.findById(chapterId); const curChapter = findChapter.chapter const allFirstTableContents = await FirstPartTableContents.find({}); - let updateFTC=new FirstPartTableContents() + let updateFTC = new FirstPartTableContents() //해당 목차보다 큰 목차 -=1 for (let i = 0; i < allFirstTableContents.length; i++) { if (allFirstTableContents[i].chapter > curChapter) { allFirstTableContents[i].chapter = Number(allFirstTableContents[i].chapter) - 1; } //db save - updateFTC=allFirstTableContents[i] + updateFTC = allFirstTableContents[i] await updateFTC.save() } console.log(allFirstTableContents) //해당 목차 삭제 - await FirstPartTableContents.deleteOne({_id:chapterId}) + await FirstPartTableContents.deleteOne({ _id: chapterId }) const tableContents = (await TableContents.find())[0] - for(let j = 0;j 1){ firstPartMainPageResDto.setSecondPartBook(findUser) } - return firstPartMainPageResDto } catch (err) { diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index 7e2ada6..1a8849e 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -42,7 +42,8 @@ module.exports = { //Encrpyt password const salt = await bcrypt.genSalt(10); user.password = await bcrypt.hash(password, salt); - user.save() + await user.save() + }, login: async (email, password) => { try { diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index d2341bc..51fb1a0 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -50,8 +50,11 @@ export class DiaryResDto { const firstPartTableContents = petDiary.tableContents this.chapter = firstPartTableContents.chapter this.episode = firstPartTableContents.petDiary.length; - - this._id = petDiary._id + //if(this.chapter==0){ + // this._id="60ed3acde5003a744892ce27" + //}else{ + this._id=petDiary._id + //} this.title = petDiary.title; this.contents = petDiary.contents; this.date = await dateMethod.toStringByFormatting(petDiary.date); From 92ea0f60be592327bfd0154a606dadba340511e7 Mon Sep 17 00:00:00 2001 From: sol Date: Wed, 14 Jul 2021 15:43:07 +0900 Subject: [PATCH 094/168] =?UTF-8?q?refactor=20:=20=EB=AA=A9=EC=B0=A8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=EC=82=AD=EC=A0=9C,=EC=88=98=EC=A0=95=20api?= =?UTF-8?q?=20=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/userController.ts | 4 +-- src/api/service/chapterService.ts | 32 ++++++++++++++++--- .../mainPageDto/FirstPartMainPageResDto.ts | 6 ++-- src/dto/petChapter/ChapterList.ts | 3 ++ 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 26cc3f2..3274931 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -24,8 +24,8 @@ module.exports = { login: async (req, res) => { const { email, password } = req.body; try { - const result = await userService.login(email, password); - console.log('얘가나오면 안되는데 : ', result) + const result = await userService.login(email, password); + console.log('얘가나오면 안되는데 : ', result) res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_IN_SUCCESS,result)) } catch (err) { diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index a42361e..2f758d5 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -26,7 +26,6 @@ module.exports = { const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); //.populate({path:"petDiary",populate:({path:"petEmotions"})}) - let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) //월별로 자르기 @@ -43,7 +42,6 @@ module.exports = { monthly.setDiaries(newDiary) //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } - } if (cnt == 0) continue monthly.setMonthCount(cnt) @@ -90,8 +88,14 @@ module.exports = { await newTableContents.save() console.log(newTableContents) + let chapterList = new ChapterListResDto() + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + let newChapter = new ChapterResDto(new FirstPartTableContents(findUserChapter.book.tableContents.firstPartTableContents[i])) + chapterList.setChapterList(newChapter) + } + console.log(chapterList) - return responseMessage.SUCCESS_POST_CHAPTERLIST; + return chapterList; } catch (err) { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_CONTENTS } @@ -105,7 +109,16 @@ module.exports = { await editFirstPartTableContents.save() console.log(editFirstPartTableContents) - return responseMessage.SUCCESS_PUT_CHAPTERLIST; + let chapterList = new ChapterListResDto() + let tableContents=await TableContents.find({}).populate('firstPartTableContents') + for (let i = 0; i < tableContents[0].firstPartTableContents.length; i++) { + let newChapter = new ChapterResDto(new FirstPartTableContents(tableContents[0].firstPartTableContents[i])) + chapterList.setChapterList(newChapter) + } + + // console.log(chapterList) + + return chapterList; } catch (err) { console.log(err) @@ -140,7 +153,16 @@ module.exports = { } await tableContents.save() - return responseMessage.SUCCESS_DELETE_CHAPTERLIST; + + let chapterList = new ChapterListResDto() + let allTableContents=await TableContents.find({}).populate('firstPartTableContents') + for (let i = 0; i < allTableContents[0].firstPartTableContents.length; i++) { + let newChapter = new ChapterResDto(new FirstPartTableContents(allTableContents[0].firstPartTableContents[i])) + chapterList.setChapterList(newChapter) + } + console.log(chapterList) + + return chapterList; } catch (err) { console.log(err) diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 51fb1a0..48509bf 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -64,13 +64,13 @@ export class DiaryResDto { export class TableContentsResDto { private chapterId; private chapter; - private chapterName; + private chapterTitle; private episodePerchapterCount; constructor(firstPartTableContents: IFirstPartTableContents) { this.chapterId = firstPartTableContents._id //목차 Id - this.chapter = firstPartTableContents.chapter; - this.chapterName = firstPartTableContents.title; + this.chapterTitle = firstPartTableContents.chapter; + this.chapter = firstPartTableContents.title; this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } diff --git a/src/dto/petChapter/ChapterList.ts b/src/dto/petChapter/ChapterList.ts index 5b6cb06..e504ebc 100644 --- a/src/dto/petChapter/ChapterList.ts +++ b/src/dto/petChapter/ChapterList.ts @@ -20,11 +20,14 @@ export class ChapterResDto{ public chapterId=null public chapter=null public chapterTitle=null + public episodePerchapterCount=null + constructor(firstPartTableContents:IFirstPartTableContents){ this.chapterId=firstPartTableContents._id this.chapter=firstPartTableContents.chapter this.chapterTitle=firstPartTableContents.title + this.episodePerchapterCount } } From 97a4e83c7ea90f603057bf5f3d641566d3b59137 Mon Sep 17 00:00:00 2001 From: sol Date: Wed, 14 Jul 2021 16:17:54 +0900 Subject: [PATCH 095/168] =?UTF-8?q?refactor:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=20=EC=B6=94=EA=B0=80,=EC=82=AD=EC=A0=9C,=EC=88=98?= =?UTF-8?q?=EC=A0=95=20api=20=EC=B6=9C=EB=A0=A5=EA=B0=92=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/secondPartController.ts | 12 ++++++------ src/api/service/secondPartService.ts | 10 +++++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/api/controller/secondPartController.ts b/src/api/controller/secondPartController.ts index 11a8aeb..fd8f992 100644 --- a/src/api/controller/secondPartController.ts +++ b/src/api/controller/secondPartController.ts @@ -41,8 +41,8 @@ module.exports = { addSecondPartChapter: async (req, res) => { const chapterData = req.body try { - await secondPartService.addSecondPartChapter(chapterData) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER)) + const result =await secondPartService.addSecondPartChapter(chapterData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER,result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -53,8 +53,8 @@ module.exports = { const { chapterId } = req.params const modifyChapterData = req.body try { - await secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER)) + const result = await secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER,result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) @@ -64,8 +64,8 @@ module.exports = { deleteSecondPartChapter: async (req, res) => { const { chapterId } = req.params try { - await secondPartService.deleteSecondPartChapter(chapterId) - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)) + const result=await secondPartService.deleteSecondPartChapter(chapterId) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER,result)) } catch (err) { console.error(err) if (err.statusCode === 400) { diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index b717067..c26302c 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -109,6 +109,9 @@ module.exports = { await tableContents.setSecondPartTableContents(newChapter) await tableContents.save() + const chapterList = await SecondPartTableContent.find() + return new SecondPartChapterListResDto(chapterList) + } catch (err) { throw err } @@ -123,10 +126,12 @@ module.exports = { modifySecondPartChapterInfo: async (chapterId, modifyChapterData) => { try { - await SecondPartTableContent.update( + await SecondPartTableContent.updateOne( { _id: chapterId }, { $set: { title: modifyChapterData.chapterTitle } } ) + const chapterList = await SecondPartTableContent.find() + return new SecondPartChapterListResDto(chapterList) } catch (err) { throw err } @@ -168,6 +173,9 @@ module.exports = { const idx = tableContents.secondPartTableContents.findIndex(secondPartTable => secondPartTable._id == chapterId) tableContents.secondPartTableContents.splice(idx, 1) await tableContents.save() + + const chapterList = await SecondPartTableContent.find() + return new SecondPartChapterListResDto(chapterList) } catch (err) { throw err } From 2aa17c2fe74a735f0bbb53208438f3f42af7d3c5 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 16:25:34 +0900 Subject: [PATCH 096/168] =?UTF-8?q?refactgor=20:=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 4 ++++ src/api/service/userService.ts | 5 ++++- src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 748d58f..3cabe2d 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -311,6 +311,9 @@ module.exports = { postEpilogue: async (userId, data) => { try { + console.log('id : '+userId) + const test = await User.findById(userId) + console.log('test!!! : '+test) const user = await User.findById(userId).populate({ path: "book", populate: ({ @@ -320,6 +323,7 @@ module.exports = { }) }) }) + console.log('user : '+user) const tableContents = user.book.tableContents //1부 목차 마지막에 에필로그 diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index 7e2ada6..f9c5bac 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -63,7 +63,10 @@ module.exports = { if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } - const petId = user.pets[0]._id + let petId = null + if(user.pets[0] != undefined){ + petId = user.pets[0]._id + } return { userId : user._id, petId : petId} } catch (err) { throw err diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 7898164..02ad50e 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -35,6 +35,8 @@ export class MemoriesResDto{ constructor(petDiaries : IPetDiary[], petId : IPet){ const diaryIndex = this.getRandomMemoryIndex(petDiaries.length) const randomDiary = petDiaries[diaryIndex] + console.log('aaaa :'+petDiaries) + console.log('bbbb :'+diaryIndex) console.log("랜덤된 petEmotion "+randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]) From 1c14482ab03a81c441a39534a96efa7c022b2a93 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 16:32:59 +0900 Subject: [PATCH 097/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=ED=99=88?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/userController.js.map | 2 +- dist/api/service/chapterService.js | 30 ++++++++++++++++--- dist/api/service/chapterService.js.map | 2 +- dist/api/service/firstPartService.js | 12 +++++--- dist/api/service/firstPartService.js.map | 2 +- dist/api/service/rainbowService.js | 4 +++ dist/api/service/rainbowService.js.map | 2 +- dist/api/service/secondPartService.js | 6 ++++ dist/api/service/secondPartService.js.map | 2 +- dist/api/service/userService.js | 7 +++-- dist/api/service/userService.js.map | 2 +- .../mainPageDto/FirstPartMainPageResDto.js | 29 +++++++++--------- .../FirstPartMainPageResDto.js.map | 2 +- dist/dto/petChapter/ChapterList.js | 2 ++ dist/dto/petChapter/ChapterList.js.map | 2 +- .../mainPageDto/RainbowMainPageResDto.js | 2 ++ .../mainPageDto/RainbowMainPageResDto.js.map | 2 +- src/api/service/secondPartService.ts | 7 +++++ 18 files changed, 84 insertions(+), 33 deletions(-) diff --git a/dist/api/controller/userController.js.map b/dist/api/controller/userController.js.map index 46fb2de..8328090 100644 --- a/dist/api/controller/userController.js.map +++ b/dist/api/controller/userController.js.map @@ -1 +1 @@ -{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACpC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAC,MAAM,CAAC,CAAC,CAAA;SAEtG;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACtC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAC,MAAM,CAAC,CAAC,CAAA;SAEtG;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/service/chapterService.js b/dist/api/service/chapterService.js index 67c896e..448962e 100644 --- a/dist/api/service/chapterService.js +++ b/dist/api/service/chapterService.js @@ -35,7 +35,7 @@ module.exports = { //.populate({path:"petDiary",populate:({path:"petEmotions"})}) let newChapterDiary = new PetChapterDiary_1.PetChapterDiaryResDto(findFirstTableContents); //월별로 자르기 - for (let m = 1; m <= 12; m++) { + for (let m = 12; m >= 1; m--) { let cnt = 0; //1화부터 let monthly = new PetChapterDiary_1.MonthlyDiaryResDto(); @@ -47,6 +47,8 @@ module.exports = { //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } } + if (cnt == 0) + continue; monthly.setMonthCount(cnt); monthly.setMonth(m); newChapterDiary.setMonthly(monthly); @@ -88,7 +90,13 @@ module.exports = { let newTableContents = new TableContents_1.default(findUserChapter.book.tableContents); yield newTableContents.save(); console.log(newTableContents); - return responseMessage.SUCCESS_POST_CHAPTERLIST; + let chapterList = new ChapterList_1.ChapterListResDto(); + for (let i = 0; i < findUserChapter.book.tableContents.firstPartTableContents.length; i++) { + let newChapter = new ChapterList_1.ChapterResDto(new FirstPartTableContents_1.default(findUserChapter.book.tableContents.firstPartTableContents[i])); + chapterList.setChapterList(newChapter); + } + console.log(chapterList); + return chapterList; } catch (err) { console.log(err); @@ -102,7 +110,14 @@ module.exports = { const editFirstPartTableContents = new FirstPartTableContents_1.default(findChapter); yield editFirstPartTableContents.save(); console.log(editFirstPartTableContents); - return responseMessage.SUCCESS_PUT_CHAPTERLIST; + let chapterList = new ChapterList_1.ChapterListResDto(); + let tableContents = yield TableContents_1.default.find({}).populate('firstPartTableContents'); + for (let i = 0; i < tableContents[0].firstPartTableContents.length; i++) { + let newChapter = new ChapterList_1.ChapterResDto(new FirstPartTableContents_1.default(tableContents[0].firstPartTableContents[i])); + chapterList.setChapterList(newChapter); + } + // console.log(chapterList) + return chapterList; } catch (err) { console.log(err); @@ -134,7 +149,14 @@ module.exports = { } } yield tableContents.save(); - return responseMessage.SUCCESS_DELETE_CHAPTERLIST; + let chapterList = new ChapterList_1.ChapterListResDto(); + let allTableContents = yield TableContents_1.default.find({}).populate('firstPartTableContents'); + for (let i = 0; i < allTableContents[0].firstPartTableContents.length; i++) { + let newChapter = new ChapterList_1.ChapterResDto(new FirstPartTableContents_1.default(allTableContents[0].firstPartTableContents[i])); + chapterList.setChapterList(newChapter); + } + console.log(chapterList); + return chapterList; } catch (err) { console.log(err); diff --git a/dist/api/service/chapterService.js.map b/dist/api/service/chapterService.js.map index 50fba57..e4bad19 100644 --- a/dist/api/service/chapterService.js.map +++ b/dist/api/service/chapterService.js.map @@ -1 +1 @@ -{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/firstPartService.js b/dist/api/service/firstPartService.js index 0c4d29f..14fdeca 100644 --- a/dist/api/service/firstPartService.js +++ b/dist/api/service/firstPartService.js @@ -21,6 +21,7 @@ const statusCode = require('../../modules/statusCode'); const Book_1 = __importDefault(require("../../models/book/Book")); const TableContents_1 = __importDefault(require("../../models/tableContents/TableContents")); const FirstPartTableContents_1 = __importDefault(require("../../models/tableContents/FirstPartTableContents")); +const PetDiary_1 = __importDefault(require("../../models/diary/PetDiary")); require("../../models/user/User"); require("../../models/pet/Pet"); require("../../models/book/Book"); @@ -50,6 +51,7 @@ module.exports = { }) }) }); + console.log("user", findUser); let newBook = new Book_1.default(); let newTableContents = new TableContents_1.default(); let newFirstPartTableContents = new FirstPartTableContents_1.default(); @@ -65,11 +67,13 @@ module.exports = { findUser.book.tableContents.firstPartTableContents.push(new FirstPartTableContents_1.default()); } const firstPartMainPageResDto = new FirstPartMainPageResDto_1.FirstPartMainPageResDto(findUser.book); - let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length - 1; - console.log('11111 : ' + lastTableNumber); - //console.log("#:",lastTableNumber) - const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(findUser.book.tableContents.firstPartTableContents[lastTableNumber]); + let allPetDiaries = yield PetDiary_1.default.find({}).populate('tableContents'); + let petDiaryNumber = (yield allPetDiaries).length; + //가장 마지막 일기 + const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(allPetDiaries[petDiaryNumber - 1]); //tableContents + let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length; + console.log("lastTable", TableContents_1.default); for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new FirstPartMainPageResDto_1.TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]); firstPartMainPageResDto.setTableContents(tableContentsResDto); diff --git a/dist/api/service/firstPartService.js.map b/dist/api/service/firstPartService.js.map index 26aa021..46aab20 100644 --- a/dist/api/service/firstPartService.js.map +++ b/dist/api/service/firstPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAAyC;AAEzC,qGAAmI;AACnI,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,kEAAyC;AACzC,6FAAoE;AACpE,+GAAsF;AACtF,2EAAkD;AAClD,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,OAAO,CAAC,8BAA8B,CAAC,CAAA;AAEvC,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,MAAM,EAAE,EAAE;QAC1B,IAAI;YACA,eAAe;YACf,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAClD,IAAI,EAAE,MAAM;aACf,CAAC,CAAC,QAAQ,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,CAAC;wBACP,IAAI,EAAE,wBAAwB;wBAC9B,QAAQ,EAAE,CAAC;4BACP,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACN,IAAI,EAAE,aAAa;6BACtB;yBACJ,CAAC;qBACL,CAAC;iBACL,CAAC;aACL,CAAC,CAAA;YACF,OAAO,CAAC,GAAG,CAAC,MAAM,EAAC,QAAQ,CAAC,CAAA;YAC5B,IAAI,OAAO,GAAC,IAAI,cAAI,EAAE,CAAA;YACtB,IAAI,gBAAgB,GAAC,IAAI,uBAAa,EAAE,CAAA;YACxC,IAAI,yBAAyB,GAAC,IAAI,gCAAsB,EAAE,CAAA;YAC1D,gBAAgB,CAAC,yBAAyB,CAAC,yBAAyB,CAAC,CAAA;YACrE,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;YAE1C,IAAG,QAAQ,CAAC,IAAI,IAAE,IAAI,EAAC;gBACnB,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;aAC5B;YACD,IAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,IAAE,IAAI,EAAC;gBACjC,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAE,IAAI,uBAAa,EAAE,CAAA;aACnD;YACD,IAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,IAAE,IAAI,EAAC;gBACxD,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,gCAAsB,EAAE,CAAC,CAAA;aACxF;YAED,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC1E,IAAI,aAAa,GAAG,MAAM,kBAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;YACrE,IAAI,cAAc,GAAC,CAAC,MAAM,aAAa,CAAC,CAAC,MAAM,CAAA;YAC/C,WAAW;YACX,MAAM,SAAS,GAAG,IAAI,qCAAW,CAAC,aAAa,CAAC,cAAc,GAAC,CAAC,CAAC,CAAC,CAAA;YAElE,eAAe;YACf,IAAI,eAAe,GAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,MAAM,CAAA;YAC7E,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,uBAAa,CAAC,CAAA;YACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,EAAE,EAAE;gBACtC,IAAI,mBAAmB,GAAG,IAAI,6CAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAA;gBACxG,uBAAuB,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAA;aAChE;YACD,uBAAuB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;YAE3C,IAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAC;gBAC9D,uBAAuB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;aACtD;YACD,OAAO,uBAAuB,CAAA;SAEjC;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,OAAO,EAAE,CAAA;SACzF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 411878d..1d1155e 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -301,6 +301,9 @@ module.exports = { }), postEpilogue: (userId, data) => __awaiter(void 0, void 0, void 0, function* () { try { + console.log('id : ' + userId); + const test = yield User_1.default.findById(userId); + console.log('test!!! : ' + test); const user = yield User_1.default.findById(userId).populate({ path: "book", populate: ({ @@ -310,6 +313,7 @@ module.exports = { }) }) }); + console.log('user : ' + user); const tableContents = user.book.tableContents; //1부 목차 마지막에 에필로그 const firstPartEpilogue = new FirstPartTableContents_1.default({ diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 5360bda..fb7f0da 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,+FAAuH;AACvH,iEAAwC;AACxC,gFAA2E;AAC3E,+DAAsC;AAEtC,4FAAwF;AACxF,uIAAmJ;AACnJ,+GAAsF;AACtF,+GAAsF;AAEtF,iFAAwD;AACxD,gGAA6J;AAC7J,0EAAsE;AAEtE,yEAAgD;AAChD,sGAAkG;AAClG,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,8BAA8B,CAAC,CAAA;AACvC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAChC,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAEpC,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAClD,IAAI,EAAE,MAAM;aACf,CAAC,CAAC,QAAQ,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE;wBACN,IAAI,EAAE,wBAAwB;wBAC9B,QAAQ,EAAE;4BACN,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACN,IAAI,EAAE,aAAa;6BACtB;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnD,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC5D,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAA;YACxG,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAA;YAEjF,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAChE,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CACnD,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CACrC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;YACL,4CAA4C;YAE5C,IAAI,cAAc,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAEjC,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3B,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC/D,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;iBAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,IAAI,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBACzE,IAAI,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBAE1E,IAAI,uBAAuB,IAAI,wBAAwB,EAAE;oBACrD,OAAO,uBAAuB,IAAI,wBAAwB,EAAE;wBACxD,IAAI,wBAAwB,IAAI,uBAAuB,EAAE;4BACrD,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;yBACzE;6BAAM;4BACH,MAAM;yBACT;qBACJ;iBACJ;gBACD,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAA;gBACrF,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC,CAAA;aACzF;iBAAM,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAClC,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;YACD,qBAAqB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;YAEjD,YAAY;YACZ,MAAM,KAAK,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,kCAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YAE1D,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAEzC,OAAO,qBAAqB,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,KAAK,CAAA;SACd;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,SAAS,SAAS,CAAC,IAAY;YAC3B,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;oBACtB,OAAO,GAAG,IAAI,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;QACD,SAAS,YAAY,CAAC,IAAY;YAC9B,IAAI,KAAK,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE;oBACvB,KAAK,GAAG,KAAK,CAAA;iBAChB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC,CAAA;IAED,SAAS,EAAE,GAAS,EAAE;QAClB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC;gBACxC,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA,EAAE,CAAA,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAC1E,IAAI,kCAAe,CAAC,GAAG,CAAC,CAAC,CAAA;YAE7B,OAAO,gBAAgB,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,oBAAoB,EAAE,CAAO,KAAK,EAAE,EAAE;QAClC,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;YACtB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,QAAQ;YAER,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,OAAO,IAAI,2CAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;SACvB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,yBAAyB,EAAE,CAAO,KAAK,EAAE,EAAE;QACvC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC3C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YACrB,MAAM,QAAQ,GAAG,IAAI,iDAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAC/B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE7D,OAAO,IAAI,mEAAgC,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;SACjF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACtC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,MAAM,oBAAoB,GAAG,IAAI,iDAA2B,CAAC,GAAG,CAAC,CAAA;YAEjE,MAAM,eAAe,GAAG,EAAE,CAAA;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,CAAC,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC7L,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC7B;qBAAM;oBACH,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAChC;aACJ;YAED,MAAM,oBAAoB,GAAG,IAAI,0CAAoB,EAAE,CAAA;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAI,YAAY;gBACxC,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAG,cAAc,EAAG,CAAC,EAAC,CAAC,CAAA;gBACpF,MAAM,IAAI,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,CAAA;gBAClC,IAAI,aAAa,GAAG,IAAI,CAAA;gBACxB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACP,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAClG;qBAAM;oBACH,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBACnG;gBACD,oBAAoB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBACpD,oBAAoB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;aACrE;YAED,OAAO,oBAAoB,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;QAED,6BAA6B;QAC7B,SAAS,qBAAqB,CAAC,OAAoB;YAC/C,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,qBAAqB;oBACzD,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,oCAAoC;oBAC5E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,0BAA0B;gBAC1B,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,aAAa;QACb,SAAS,sBAAsB,CAAC,OAAoB;YAChD,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBAClC,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBACtC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC,CAAA;IAED,iBAAiB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC/B,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,6BAAa,CAAC,GAAG,CAAC,CAAA;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,YAAY,EAAE,CAAO,MAAM,EAAE,IAAI,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,CAAC;wBACP,IAAI,EAAE,gDAAgD;qBACzD,CAAC;iBACL,CAAC;aACL,CAAC,CAAA;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAA;YAE7C,iBAAiB;YACjB,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,MAAM,gCAAgC,GAAG,MAAM,gCAAsB,CAAC,IAAI,EAAE,CAAA,CAAA,8BAA8B;YAE1G,gBAAgB;YAChB,MAAM,kBAAkB,GAAG,IAAI,gCAAsB,CAAC;gBAClD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,qBAAqB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC7D,MAAM,aAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;YAE1E,IAAI,gCAAgC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,IAAI,OAAO,GAAG,CAAC,CAAA;oBACf,MAAM,4BAA4B,GAAG,IAAI,gCAAsB,CAAC;wBAC5D,OAAO;wBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;qBAC7C,CAAC,CAAA;oBACF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC,IAAI,EAAE,CAAA;oBACvE,MAAM,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;oBACvE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;iBACxB;aACJ;YACD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,mBAAmB,EAAC,CAAO,KAAK,EAAC,aAAa,EAAE,EAAE;QAC9C,IAAG;YACC,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,+CAAsB,CAAC,GAAG,EAAC,aAAa,CAAC,CAAA;SACvD;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index e9cb9c0..dadeba0 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -213,6 +213,12 @@ module.exports = { } } yield UserDiary_1.default.deleteOne({ _id: findDiary }); + for (let j = 0; j < findDiary.tableContents.userDiary.length; j++) { + if (findDiary.tableContents.userDiary[j]._id == diaryId) { + findDiary.tableContents.userDiary.splice(j, 1); + } + } + yield findDiary.tableContents; } catch (err) { throw err; diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index 7696d9d..72fb795 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/userService.js b/dist/api/service/userService.js index ba5bb23..e2689f5 100644 --- a/dist/api/service/userService.js +++ b/dist/api/service/userService.js @@ -47,7 +47,7 @@ module.exports = { //Encrpyt password const salt = yield bcryptjs_1.default.genSalt(10); user.password = yield bcryptjs_1.default.hash(password, salt); - user.save(); + yield user.save(); }), login: (email, password) => __awaiter(void 0, void 0, void 0, function* () { try { @@ -67,7 +67,10 @@ module.exports = { if (!test) { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.SIGN_IN_FAIL }; } - const petId = user.pets[0]._id; + let petId = null; + if (user.pets[0] != undefined) { + petId = user.pets[0]._id; + } return { userId: user._id, petId: petId }; } catch (err) { diff --git a/dist/api/service/userService.js.map b/dist/api/service/userService.js.map index 452760b..5f5de32 100644 --- a/dist/api/service/userService.js.map +++ b/dist/api/service/userService.js.map @@ -1 +1 @@ -{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js index da90467..afceedc 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -37,21 +37,22 @@ class FirstPartMainPageResDto { exports.FirstPartMainPageResDto = FirstPartMainPageResDto; class DiaryResDto { //가장 마지막 화 들어감 - constructor(firstPartTableContents) { - console.log('bbbbbb : ' + firstPartTableContents); - this.init(firstPartTableContents); + constructor(petDiary) { + this.init(petDiary); } - init(firstPartTableContents) { + init(petDiary) { return __awaiter(this, void 0, void 0, function* () { - console.log('!!!!!!!!!!!!!!! : ' + firstPartTableContents); + const firstPartTableContents = petDiary.tableContents; this.chapter = firstPartTableContents.chapter; this.episode = firstPartTableContents.petDiary.length; - console.log('@@@@@@@ : ' + this.episode); - console.log('######## : ' + firstPartTableContents.petDiary[this.episode - 1]); - this._id = firstPartTableContents.petDiary[this.episode - 1]._id; - this.title = firstPartTableContents.petDiary[this.episode - 1].title; - this.contents = firstPartTableContents.petDiary[this.episode - 1].contents; - this.date = yield dateMethod.toStringByFormatting(firstPartTableContents.petDiary[this.episode - 1].date); + //if(this.chapter==0){ + // this._id="60ed3acde5003a744892ce27" + //}else{ + this._id = petDiary._id; + //} + this.title = petDiary.title; + this.contents = petDiary.contents; + this.date = yield dateMethod.toStringByFormatting(petDiary.date); }); } } @@ -59,9 +60,9 @@ exports.DiaryResDto = DiaryResDto; class TableContentsResDto { constructor(firstPartTableContents) { this.chapterId = firstPartTableContents._id; //목차 Id - this.chapter = firstPartTableContents.chapter; - this.chapterName = firstPartTableContents.title; - this.episodePerchapterCount = firstPartTableContents.petDiary.length < 1 ? 0 : firstPartTableContents.petDiary.length; + this.chapterTitle = firstPartTableContents.chapter; + this.chapter = firstPartTableContents.title; + this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } exports.TableContentsResDto = TableContentsResDto; diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map index b20c20f..7ca758a 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,uBAAuB;IAShC,YAAY,IAAW;QARhB,sBAAiB,GAAG;YACvB,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE,IAAI;SACvB,CAAA;QAGG,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC9C,CAAC;IAED,kBAAkB;IAClB,QAAQ,CAAC,KAAkB;QACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAA;IACxC,CAAC;IACD,gBAAgB,CAAC,aAAkC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC5D,CAAC;IACD,iBAAiB,CAAC,IAAW;QACzB,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1E,CAAC;CACJ;AAxBD,0DAwBC;AAED,MAAa,WAAW;IAQpB,cAAc;IACd,YAAY,QAAmB;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IAEK,IAAI,CAAC,QAAmB;;YAC1B,MAAM,sBAAsB,GAAG,QAAQ,CAAC,aAAa,CAAA;YACrD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAA;YAC7C,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,sBAAsB;YACtB,yCAAyC;YACzC,QAAQ;YACJ,IAAI,CAAC,GAAG,GAAC,QAAQ,CAAC,GAAG,CAAA;YACzB,GAAG;YACH,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAClC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;KAAA;CACJ;AA1BD,kCA0BC;AAED,MAAa,mBAAmB;IAM5B,YAAY,sBAA+C;QACvD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,GAAG,CAAA,CAAC,OAAO;QACnD,IAAI,CAAC,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC;QAC5C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;IACzE,CAAC;CACJ;AAZD,kDAYC;AAED,MAAa,oBAAoB;IAM7B,YAAY,IAAW;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAEK,IAAI,CAAC,IAAW;;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAA;YACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAC9B,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrE,CAAC;KAAA;CACJ;AAhBD,oDAgBC"} \ No newline at end of file diff --git a/dist/dto/petChapter/ChapterList.js b/dist/dto/petChapter/ChapterList.js index 709055e..2623664 100644 --- a/dist/dto/petChapter/ChapterList.js +++ b/dist/dto/petChapter/ChapterList.js @@ -21,9 +21,11 @@ class ChapterResDto { this.chapterId = null; this.chapter = null; this.chapterTitle = null; + this.episodePerchapterCount = null; this.chapterId = firstPartTableContents._id; this.chapter = firstPartTableContents.chapter; this.chapterTitle = firstPartTableContents.title; + this.episodePerchapterCount; } } exports.ChapterResDto = ChapterResDto; diff --git a/dist/dto/petChapter/ChapterList.js.map b/dist/dto/petChapter/ChapterList.js.map index 1cff0cc..1d79b9f 100644 --- a/dist/dto/petChapter/ChapterList.js.map +++ b/dist/dto/petChapter/ChapterList.js.map @@ -1 +1 @@ -{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAKtB,YAAY,sBAA8C;QAJ/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QAGxB,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;IAClD,CAAC;CACJ;AAVD,sCAUC"} \ No newline at end of file +{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAOtB,YAAY,sBAA8C;QAN/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QACjB,2BAAsB,GAAC,IAAI,CAAA;QAIlC,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;QAC9C,IAAI,CAAC,sBAAsB,CAAA;IAC/B,CAAC;CACJ;AAbD,sCAaC"} \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js index bb8496b..08a8f23 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js @@ -26,6 +26,8 @@ class MemoriesResDto { constructor(petDiaries, petId) { const diaryIndex = this.getRandomMemoryIndex(petDiaries.length); const randomDiary = petDiaries[diaryIndex]; + console.log('aaaa :' + petDiaries); + console.log('bbbb :' + diaryIndex); console.log("랜덤된 petEmotion " + randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]); this.title = randomDiary.title; this.contents = randomDiary.contents; diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map index 1402479..9c3e7e2 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAMvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AAxBD,wCAwBC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file +{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAMvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AA1BD,wCA0BC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index b717067..513015e 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -228,6 +228,13 @@ module.exports = { } } await UserDiary.deleteOne({ _id: findDiary }) + + for(let j = 0 ;j Date: Wed, 14 Jul 2021 17:42:37 +0900 Subject: [PATCH 098/168] =?UTF-8?q?1=EB=B6=80=20=ED=99=88=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20api=20=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 48509bf..ed681ab 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -69,8 +69,8 @@ export class TableContentsResDto { constructor(firstPartTableContents: IFirstPartTableContents) { this.chapterId = firstPartTableContents._id //목차 Id - this.chapterTitle = firstPartTableContents.chapter; - this.chapter = firstPartTableContents.title; + this.chapterTitle = firstPartTableContents.title; + this.chapter = firstPartTableContents.chapter; this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } From 3c751fd61ef8c457e95eaedac159d462c011ce9b Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 21:20:04 +0900 Subject: [PATCH 099/168] =?UTF-8?q?refactor=20:=20deleteSecondPartDiary=20?= =?UTF-8?q?=EB=AA=A9=EC=B0=A8=EC=97=90=20=EC=82=AD=EC=A0=9C=20=EC=95=88?= =?UTF-8?q?=EB=90=A8=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 20 ++++++++++++++++---- src/api/router/pet/index.ts | 3 ++- src/api/service/petService.ts | 26 ++++++++++++++++++++------ src/api/service/secondPartService.ts | 2 +- src/modules/responseMessage.ts | 1 + 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index bcd2004..dfb1b85 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -6,11 +6,10 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { - let reqData=req.body; - const images = req.files.map(img => img.location) + let reqData=req.body try { - await petService.registerPet(reqData,images); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, "")) + const result = await petService.registerPet(reqData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)) } catch (err) { if (err.statusCode == null) { err.statusCode = statusCode.INTERNAL_SERVER_ERROR; @@ -20,4 +19,17 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, + + registerPetImg:async(req,res)=>{ + const image = req.files.map(file=>file.location) + const petImageInfo = req.body + console.log('petImageInfo : '+petImageInfo) + try{ + await petService.registerPetImg(image,petImageInfo) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) + }catch(err){ + console.error(err) + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } + } } \ No newline at end of file diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index e973dbd..b4ffc89 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -3,6 +3,7 @@ var router = express.Router() var petController = require('../../controller/petController') var upload = require('../../../modules/multer') -router.post('/register',upload.array('images',4),petController.registerPet) //register pet +router.post('/register',petController.registerPet) //register pet +router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index e16ca2e..c78fc63 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -10,9 +10,11 @@ var mongoose = require('mongoose') require("../../models/user/User") require("../../models/pet/Pet") module.exports = { - registerPet: async (reqData, images) => { + registerPet: async (reqData) => { try{ //error handling + const findUser = await User.findById(reqData.userId) + let pets=[]; const startDate= new Date(reqData.pets[0].startDate) startDate.setDate(startDate.getDate() + 1); @@ -21,8 +23,7 @@ module.exports = { name: reqData.pets[i].name, kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, - imgs: images[i], - user: mongoose.Types.ObjectId(reqData._id), + user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) @@ -30,16 +31,29 @@ module.exports = { //book://나중에 책을 등록할때, pet에 book을 등록. 연관관계 확인. 안들어가있는게 있으면 나중에 같이 넣어야됨. //SETTER사용. pet 찾아서 setter로 넣기. }); + await pet.save() + findUser.pets.push(pet) pets[i]=pet; } + await findUser.save() console.log(reqData); //db save - for (let i = 0; i < pets.length; i++) { - await pets[i].save(); - } + const saveInfo = pets.map(pet=>pet._id) + return saveInfo }catch(err){ console.log(err) throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; } + }, + + registerPetImg:async(image,petImageInfo)=>{ + try{ + for(let i=0;i Date: Wed, 14 Jul 2021 21:24:21 +0900 Subject: [PATCH 100/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=82=AC=EC=A7=84&?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=95=A9=EC=B9=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/petService.ts | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index c78fc63..76f182d 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -10,7 +10,7 @@ var mongoose = require('mongoose') require("../../models/user/User") require("../../models/pet/Pet") module.exports = { - registerPet: async (reqData) => { + registerPet: async (reqData, images) => { try{ //error handling const findUser = await User.findById(reqData.userId) @@ -23,6 +23,7 @@ module.exports = { name: reqData.pets[i].name, kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, + imgs : images[i], user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) @@ -46,14 +47,14 @@ module.exports = { } }, - registerPetImg:async(image,petImageInfo)=>{ - try{ - for(let i=0;i{ + // try{ + // for(let i=0;i Date: Wed, 14 Jul 2021 21:25:26 +0900 Subject: [PATCH 101/168] refactor : dist update --- dist/api/controller/petController.js | 18 ++++++++++++++--- dist/api/controller/petController.js.map | 2 +- dist/api/router/pet/index.js | 3 ++- dist/api/router/pet/index.js.map | 2 +- dist/api/service/petService.js | 24 ++++++++++++++++++----- dist/api/service/petService.js.map | 2 +- dist/api/service/secondPartService.js | 2 +- dist/api/service/secondPartService.js.map | 2 +- dist/modules/responseMessage.js | 1 + dist/modules/responseMessage.js.map | 2 +- 10 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index f8d0107..ee3cd92 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -14,10 +14,9 @@ const petService = require('../service/petService'); module.exports = { registerPet: (req, res) => __awaiter(this, void 0, void 0, function* () { let reqData = req.body; - const images = req.files.map(img => img.location); try { - yield petService.registerPet(reqData, images); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, "")); + const result = yield petService.registerPet(reqData); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)); } catch (err) { if (err.statusCode == null) { @@ -28,5 +27,18 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); } }), + registerPetImg: (req, res) => __awaiter(this, void 0, void 0, function* () { + const image = req.files.map(file => file.location); + const petImageInfo = req.body; + console.log('petImageInfo : ' + petImageInfo); + try { + yield petService.registerPetImg(image, petImageInfo); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)); + } + catch (err) { + console.error(err); + res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } + }) }; //# sourceMappingURL=petController.js.map \ No newline at end of file diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index a04343d..276b488 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAC;QACrB,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACjD,IAAI;YACA,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAC,MAAM,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAA;SACxG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,cAAc,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAA;QAC7B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,YAAY,CAAC,CAAA;QAC3C,IAAG;YACC,MAAM,UAAU,CAAC,cAAc,CAAC,KAAK,EAAC,YAAY,CAAC,CAAA;YACnD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAA;SACxG;QAAA,OAAM,GAAG,EAAC;YACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js index 3269b31..28f40d2 100644 --- a/dist/api/router/pet/index.js +++ b/dist/api/router/pet/index.js @@ -2,6 +2,7 @@ var express = require('express'); var router = express.Router(); var petController = require('../../controller/petController'); var upload = require('../../../modules/multer'); -router.post('/register', upload.array('images', 4), petController.registerPet); //register pet +router.post('/register', petController.registerPet); //register pet +router.post('/register/images', upload.array('images', 4), petController.registerPetImg); module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index 74a5590..35682d0 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAE1F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AACjE,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,cAAc,CAAC,CAAA;AAErF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index b892d14..3e277d5 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); +const User_1 = __importDefault(require("../../models/user/User")); const Pet_1 = __importDefault(require("../../models/pet/Pet")); const responseMessage = require('../../modules/responseMessage'); const statusCode = require('../../modules/statusCode'); @@ -24,6 +25,7 @@ module.exports = { registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { try { //error handling + const findUser = yield User_1.default.findById(reqData.userId); let pets = []; const startDate = new Date(reqData.pets[0].startDate); startDate.setDate(startDate.getDate() + 1); @@ -33,25 +35,37 @@ module.exports = { kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, imgs: images[i], - user: mongoose.Types.ObjectId(reqData._id), + user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) // findUser, UserId만 해서 되면 가능 //book://나중에 책을 등록할때, pet에 book을 등록. 연관관계 확인. 안들어가있는게 있으면 나중에 같이 넣어야됨. //SETTER사용. pet 찾아서 setter로 넣기. }); + yield pet.save(); + findUser.pets.push(pet); pets[i] = pet; } + yield findUser.save(); console.log(reqData); //db save - for (let i = 0; i < pets.length; i++) { - yield pets[i].save(); - } + const saveInfo = pets.map(pet => pet._id); + return saveInfo; } catch (err) { console.log(err); throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; } - }) + }), + // registerPetImg:async(image,petImageInfo)=>{ + // try{ + // for(let i=0;i Date: Wed, 14 Jul 2021 22:06:49 +0900 Subject: [PATCH 102/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=ED=94=84?= =?UTF-8?q?=EB=A1=A4=EB=A1=9C=EA=B7=B8=20=EC=B1=85=EB=B7=B0=20=EC=9D=B4?= =?UTF-8?q?=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 27 ++++---- src/api/router/pet/index.ts | 2 +- src/api/service/diaryService.ts | 95 +++++++++++++++++------------ 3 files changed, 71 insertions(+), 53 deletions(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index dfb1b85..bc01749 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -7,8 +7,9 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { let reqData=req.body + let images = req.files.map(file=>file.location) try { - const result = await petService.registerPet(reqData); + const result = await petService.registerPet(reqData, images); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)) } catch (err) { if (err.statusCode == null) { @@ -20,16 +21,16 @@ module.exports = { } }, - registerPetImg:async(req,res)=>{ - const image = req.files.map(file=>file.location) - const petImageInfo = req.body - console.log('petImageInfo : '+petImageInfo) - try{ - await petService.registerPetImg(image,petImageInfo) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) - }catch(err){ - console.error(err) - res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) - } - } + // registerPetImg:async(req,res)=>{ + // const image = req.files.map(file=>file.location) + // const petImageInfo = req.body + // console.log('petImageInfo : '+petImageInfo) + // try{ + // await petService.registerPetImg(image,petImageInfo) + // res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) + // }catch(err){ + // console.error(err) + // res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + // } + // } } \ No newline at end of file diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index b4ffc89..1080d10 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -4,6 +4,6 @@ var petController = require('../../controller/petController') var upload = require('../../../modules/multer') router.post('/register',petController.registerPet) //register pet -router.post('/register/images',upload.array('images',4),petController.registerPetImg) +//router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index f4f559b..667a1fc 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -24,51 +24,68 @@ module.exports = { console.log(userId) //Create user object const user = await User.findById(userId).populate('book') - console.log('user : '+user) - // await Book.update( - // {_id: user.book._id }, - // {$set: {title: bookData.title, imgs: bookData.image,author: bookData.userName}} - // ) + console.log('user : ' + user) const setBook = user.book setBook.title = bookData.title, - setBook.imgs = bookData.imgs, - setBook.author = bookData.userName - - //Create tableContents object - const tableContents = new TableContents() - setBook.tableContents = tableContents - await tableContents.save() - await user.save() - await setBook.save() - //Create firstPartTableContents object - const firstPartPrologue = new FirstPartTableContents({ - chapter: 0, - title: bookData.title, - contents: bookData.contents - }) - await firstPartPrologue.save() - console.log(tableContents) - await tableContents.firstPartTableContents.push(firstPartPrologue) + setBook.imgs = bookData.imgs, + setBook.author = bookData.userName + + //Create tableContents object + const tableContents = new TableContents() + setBook.tableContents = tableContents + await tableContents.save() + await user.save() + await setBook.save() + //Create firstPartTableContents object + const firstPartPrologue = new FirstPartTableContents({ + chapter: 0, + title: bookData.title, + contents: bookData.contents + }) + await firstPartPrologue.save() + console.log(tableContents) + await tableContents.firstPartTableContents.push(firstPartPrologue) - const season = ["봄", "여름", "가을", "겨울"] - for (let i = 0; i < 4; i++) { let chapter = 1 - const dummyFirstPartTableContents = new FirstPartTableContents({ - chapter, - title: `${user.book.author}의 ${season[i]}` + const season = ["봄", "여름", "가을", "겨울"] + for (let i = 0; i < 4; i++) { + const dummyFirstPartTableContents = new FirstPartTableContents({ + chapter, + title: `${user.book.author}의 ${season[i]}` + }) + await dummyFirstPartTableContents.save() + tableContents.firstPartTableContents.push(dummyFirstPartTableContents) + chapter = chapter + 1 + } + + //add dummy Diary + let newPetDiary = new PetDiary({ + tableContents: tableContents.firstPartTableContents[1], + episode: tableContents.firstPartTableContents[1].petDiary.length, + //date: Date(), + //imgs: diaryImages, + title: "행복한 나날들", + contents: "반려동물과의 일상을 생생하게 기록해보세요" }) - dummyFirstPartTableContents.save() - await tableContents.firstPartTableContents.push(dummyFirstPartTableContents) - chapter = chapter + 1 - } - await tableContents.save() + newPetDiary.setPet(user.pets[0]) + const petEmotion = new PetEmotions({ + pet: user.pets[0]._id, + feeling: 3 + }) + newPetDiary.setPetEmotions(petEmotion) - return user.book._id - //error handling - } catch(err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } - } + tableContents.firstPartTableContents[1].petDiary.push(newPetDiary) + await petEmotion.save() + await newPetDiary.save() + await tableContents.firstPartTableContents[1].save() + await tableContents.save() + + return user.book._id + //error handling + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } + } }, postPetDiary: async (diaryData,diaryImages) => { const writeDate = await new Date(diaryData.date) From 5bab2ca997ba72477ec13f4bf6c873c9bdce072a Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Wed, 14 Jul 2021 22:41:47 +0900 Subject: [PATCH 103/168] refactor dist update --- dist/api/controller/diaryController.js | 2 +- dist/api/controller/diaryController.js.map | 2 +- dist/api/controller/petController.js | 28 ++--- dist/api/controller/petController.js.map | 2 +- dist/api/controller/secondPartController.js | 12 +- .../controller/secondPartController.js.map | 2 +- dist/api/controller/userController.js | 4 +- dist/api/controller/userController.js.map | 2 +- dist/api/router/pet/index.js | 2 +- dist/api/router/pet/index.js.map | 2 +- dist/api/service/diaryService.js | 29 +++-- dist/api/service/diaryService.js.map | 2 +- dist/api/service/secondPartService.js | 8 +- dist/api/service/secondPartService.js.map | 2 +- dist/api/service/userService.js | 2 +- dist/api/service/userService.js.map | 2 +- .../mainPageDto/FirstPartMainPageResDto.js | 4 +- .../FirstPartMainPageResDto.js.map | 2 +- src/api/controller/diaryController.ts | 42 +++---- src/api/controller/userController.ts | 4 +- src/api/service/diaryService.ts | 112 +++++++++--------- src/api/service/userService.ts | 2 +- 22 files changed, 145 insertions(+), 124 deletions(-) diff --git a/dist/api/controller/diaryController.js b/dist/api/controller/diaryController.js index c0ad9a0..136eb09 100644 --- a/dist/api/controller/diaryController.js +++ b/dist/api/controller/diaryController.js @@ -16,7 +16,7 @@ module.exports = { postPrologue: (req, res) => __awaiter(this, void 0, void 0, function* () { const { userId } = req.params; const bookData = req.body; - const bookImage = req.file.location; + //const bookImage = req.file.location try { yield diaryService.postPrologue(userId, bookData); //const result=await firstPartService.getMainPage(userId) diff --git a/dist/api/controller/diaryController.js.map b/dist/api/controller/diaryController.js.map index 52a95f5..b277890 100644 --- a/dist/api/controller/diaryController.js.map +++ b/dist/api/controller/diaryController.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index ee3cd92..161bdb0 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -14,8 +14,9 @@ const petService = require('../service/petService'); module.exports = { registerPet: (req, res) => __awaiter(this, void 0, void 0, function* () { let reqData = req.body; + let images = req.files.map(file => file.location); try { - const result = yield petService.registerPet(reqData); + const result = yield petService.registerPet(reqData, images); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)); } catch (err) { @@ -27,18 +28,17 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); } }), - registerPetImg: (req, res) => __awaiter(this, void 0, void 0, function* () { - const image = req.files.map(file => file.location); - const petImageInfo = req.body; - console.log('petImageInfo : ' + petImageInfo); - try { - yield petService.registerPetImg(image, petImageInfo); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)); - } - catch (err) { - console.error(err); - res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); - } - }) + // registerPetImg:async(req,res)=>{ + // const image = req.files.map(file=>file.location) + // const petImageInfo = req.body + // console.log('petImageInfo : '+petImageInfo) + // try{ + // await petService.registerPetImg(image,petImageInfo) + // res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) + // }catch(err){ + // console.error(err) + // res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + // } + // } }; //# sourceMappingURL=petController.js.map \ No newline at end of file diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 276b488..a160a64 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,cAAc,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAChD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAA;QAC7B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,YAAY,CAAC,CAAA;QAC3C,IAAG;YACC,MAAM,UAAU,CAAC,cAAc,CAAC,KAAK,EAAC,YAAY,CAAC,CAAA;YACnD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAA;SACxG;QAAA,OAAM,GAAG,EAAC;YACP,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/secondPartController.js b/dist/api/controller/secondPartController.js index 6eea63c..7bbc6e5 100644 --- a/dist/api/controller/secondPartController.js +++ b/dist/api/controller/secondPartController.js @@ -49,8 +49,8 @@ module.exports = { addSecondPartChapter: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const chapterData = req.body; try { - yield secondPartService.addSecondPartChapter(chapterData); - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER)); + const result = yield secondPartService.addSecondPartChapter(chapterData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_SECOND_PART_ADD_CHAPTER, result)); } catch (err) { console.error(err); @@ -61,8 +61,8 @@ module.exports = { const { chapterId } = req.params; const modifyChapterData = req.body; try { - yield secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData); - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER)); + const result = yield secondPartService.modifySecondPartChapterInfo(chapterId, modifyChapterData); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_SECOND_PART_MODIFY_CHAPTER, result)); } catch (err) { console.error(err); @@ -72,8 +72,8 @@ module.exports = { deleteSecondPartChapter: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { chapterId } = req.params; try { - yield secondPartService.deleteSecondPartChapter(chapterId); - return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER)); + const result = yield secondPartService.deleteSecondPartChapter(chapterId); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_SECOND_PART_DELETE_CHAPTER, result)); } catch (err) { console.error(err); diff --git a/dist/api/controller/secondPartController.js.map b/dist/api/controller/secondPartController.js.map index 5cdc7ee..29c440c 100644 --- a/dist/api/controller/secondPartController.js.map +++ b/dist/api/controller/secondPartController.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartController.js","sourceRoot":"","sources":["../../../src/api/controller/secondPartController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartController.js","sourceRoot":"","sources":["../../../src/api/controller/secondPartController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/userController.js b/dist/api/controller/userController.js index 4272776..8c4c843 100644 --- a/dist/api/controller/userController.js +++ b/dist/api/controller/userController.js @@ -18,8 +18,8 @@ module.exports = { register: (req, res) => __awaiter(void 0, void 0, void 0, function* () { const { email, password } = req.body; try { - const result = yield userService.register(email, password); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS, result)); + yield userService.register(email, password); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS)); } catch (err) { if (err.statusCode == null) { diff --git a/dist/api/controller/userController.js.map b/dist/api/controller/userController.js.map index 8328090..a2d2de1 100644 --- a/dist/api/controller/userController.js.map +++ b/dist/api/controller/userController.js.map @@ -1 +1 @@ -{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC3D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAA;SACvG;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACtC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAC,MAAM,CAAC,CAAC,CAAA;SAEtG;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"userController.js","sourceRoot":"","sources":["../../../src/api/controller/userController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAA;AAIrD,MAAM,CAAC,OAAO,GAAG;IACb,eAAe;IACf,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC5C,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC,CAAA;SAC/F;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,KAAK,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;YACtC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,eAAe,EAAC,MAAM,CAAC,CAAC,CAAA;SAEtG;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAA;YACxC,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,CAAA;YAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js index 28f40d2..7888a1b 100644 --- a/dist/api/router/pet/index.js +++ b/dist/api/router/pet/index.js @@ -3,6 +3,6 @@ var router = express.Router(); var petController = require('../../controller/petController'); var upload = require('../../../modules/multer'); router.post('/register', petController.registerPet); //register pet -router.post('/register/images', upload.array('images', 4), petController.registerPetImg); +//router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index 35682d0..9535180 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AACjE,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,cAAc,CAAC,CAAA;AAErF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AACjE,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index f8a6843..e29dd8a 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -36,10 +36,6 @@ module.exports = { //Create user object const user = yield User_1.default.findById(userId).populate('book'); console.log('user : ' + user); - // await Book.update( - // {_id: user.book._id }, - // {$set: {title: bookData.title, imgs: bookData.image,author: bookData.userName}} - // ) const setBook = user.book; setBook.title = bookData.title, setBook.imgs = bookData.imgs, @@ -59,17 +55,36 @@ module.exports = { yield firstPartPrologue.save(); console.log(tableContents); yield tableContents.firstPartTableContents.push(firstPartPrologue); + let chapter = 1; const season = ["봄", "여름", "가을", "겨울"]; for (let i = 0; i < 4; i++) { - let chapter = 1; const dummyFirstPartTableContents = new FirstPartTableContents_1.default({ chapter, title: `${user.book.author}의 ${season[i]}` }); - dummyFirstPartTableContents.save(); - yield tableContents.firstPartTableContents.push(dummyFirstPartTableContents); + yield dummyFirstPartTableContents.save(); + tableContents.firstPartTableContents.push(dummyFirstPartTableContents); chapter = chapter + 1; } + //add dummy Diary + let newPetDiary = new PetDiary_1.default({ + tableContents: tableContents.firstPartTableContents[1], + episode: tableContents.firstPartTableContents[1].petDiary.length, + //date: Date(), + //imgs: diaryImages, + title: "행복한 나날들", + contents: "반려동물과의 일상을 생생하게 기록해보세요" + }); + newPetDiary.setPet(user.pets[0]); + const petEmotion = new PetEmotions_1.default({ + pet: user.pets[0]._id, + feeling: 3 + }); + newPetDiary.setPetEmotions(petEmotion); + tableContents.firstPartTableContents[1].petDiary.push(newPetDiary); + yield petEmotion.save(); + yield newPetDiary.save(); + yield tableContents.firstPartTableContents[1].save(); yield tableContents.save(); return user.book._id; //error handling diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index db4b98d..85bdedc 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kEAAyC;AAEzC,6FAAoE;AACpE,+GAAsF;AACtF,+DAAsC;AACtC,2EAAkD;AAClD,iFAAwD;AACxD,8EAA0F;AAC1F,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAM,CAAC,OAAO,GAAG;IACb,YAAY,EAAE,CAAO,MAAM,EAAE,QAAQ,EAAE,EAAE;QACrC,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnB,oBAAoB;YACpB,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACzB,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK;gBAC9B,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI;gBAC5B,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAElC,6BAA6B;YAC7B,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAA;YACzC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAA;YACrC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAC1B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,sCAAsC;YACtC,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,2BAA2B,GAAG,IAAI,gCAAsB,CAAC;oBAC3D,OAAO;oBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;iBAC7C,CAAC,CAAA;gBACF,MAAM,2BAA2B,CAAC,IAAI,EAAE,CAAA;gBACxC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACtE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;aACxB;YAED,iBAAiB;YACjB,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;gBAC3B,aAAa,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACtD,OAAO,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM;gBAChE,eAAe;gBACf,oBAAoB;gBACpB,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,wBAAwB;aACrC,CAAC,CAAA;YACF,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;gBAC/B,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;gBACrB,OAAO,EAAE,CAAC;aACb,CAAC,CAAA;YACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;YAEtC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAClE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YACvB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YACxB,MAAM,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACpD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;YACpB,gBAAgB;SACnB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,OAAO,EAAE,CAAA;SACzF;IACL,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,SAAS,EAAE,WAAW,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAChD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,8DAA8D;QAC9D,MAAM,IAAI,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtF,iCAAiC;QACjC,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;YAC3B,aAAa,EAAE,SAAS,CAAC,GAAG;YAC5B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC7B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAE/B,CAAC,CAAA;QAEF,IAAI;YACA,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC3B,eAAe;gBACf,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;oBAC/B,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;oBAC/B,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC1C,CAAC,CAAA;gBACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBACtC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;aAC1B;YAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACxB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YAExB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA,CAAC,iCAAiC;YACrE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC5H,IAAI,kBAAkB,GAAG,MAAM,IAAI,uCAAkB,CAAC,YAAY,CAAC,CAAA,CAAC,KAAK;YACzE,0FAA0F;YAE1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtD,IAAI,WAAW,GAAG,IAAI,mCAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1D,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;gBACnD,kBAAkB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;aACjD;YACD,OAAO,kBAAkB,CAAA;SAE5B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,SAAS,EAAE,EAAE;QACzC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACvD,YAAY,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAA;YACvD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAA;YAC3C,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;YACrC,YAAY,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAA;YACzC,YAAY,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YACpC,YAAY,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;YAC1C,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC5B,eAAe;gBACf,IAAI,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAA;gBAC/B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;gBACxC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;gBAChD,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;aACvB;YACD,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;YACzB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,cAAc,EAAE,CAAO,UAAU,EAAE,EAAE;QACjC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACzG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,CAAA;YACtC,aAAa;YACb,6CAA6C;YAC7C,qEAAqE;YACrE,IAAI,uBAAuB,GAAG,YAAY,CAAC,aAAa,CAAA;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9D,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,EAAE;oBACvD,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;iBAChD;aACJ;YACD,IAAI,UAAU,GAAG,CAAC,MAAM,gCAAsB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;YAE1H,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACxC,IAAI,IAAI,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;gBACjD,IAAI,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;oBACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBACvC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;iBACpB;aACJ;YAED,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAM,UAAU,EAAC,EAAE;gBAChD,MAAM,qBAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAA;YACxD,CAAC,CAAA,CAAC,CAAA;YAEF,MAAM,kBAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/C,MAAM,uBAAuB,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACzB,OAAO,eAAe,CAAC,uBAAuB,CAAC;SAClD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index 25272db..eadae72 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -106,6 +106,8 @@ module.exports = { const tableContents = (yield TableContents_1.default.find())[0]; yield tableContents.setSecondPartTableContents(newChapter); yield tableContents.save(); + const chapterList = yield SecondPartTableContent_1.default.find(); + return new SecondPartChapterListResDto_1.SecondPartChapterListResDto(chapterList); } catch (err) { throw err; @@ -120,7 +122,9 @@ module.exports = { }), modifySecondPartChapterInfo: (chapterId, modifyChapterData) => __awaiter(void 0, void 0, void 0, function* () { try { - yield SecondPartTableContent_1.default.update({ _id: chapterId }, { $set: { title: modifyChapterData.chapterTitle } }); + yield SecondPartTableContent_1.default.updateOne({ _id: chapterId }, { $set: { title: modifyChapterData.chapterTitle } }); + const chapterList = yield SecondPartTableContent_1.default.find(); + return new SecondPartChapterListResDto_1.SecondPartChapterListResDto(chapterList); } catch (err) { throw err; @@ -155,6 +159,8 @@ module.exports = { const idx = tableContents.secondPartTableContents.findIndex(secondPartTable => secondPartTable._id == chapterId); tableContents.secondPartTableContents.splice(idx, 1); yield tableContents.save(); + const chapterList = yield SecondPartTableContent_1.default.find(); + return new SecondPartChapterListResDto_1.SecondPartChapterListResDto(chapterList); } catch (err) { throw err; diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index 5c80b58..e353bd7 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/userService.js b/dist/api/service/userService.js index e2689f5..d340eab 100644 --- a/dist/api/service/userService.js +++ b/dist/api/service/userService.js @@ -60,7 +60,7 @@ module.exports = { }); if (!user) { //등록되지 않은 email - throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; } const test = yield bcryptjs_1.default.compare(password, user.password); console.log('asdada' + test); diff --git a/dist/api/service/userService.js.map b/dist/api/service/userService.js.map index 5f5de32..d0ee1ea 100644 --- a/dist/api/service/userService.js.map +++ b/dist/api/service/userService.js.map @@ -1 +1 @@ -{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"userService.js","sourceRoot":"","sources":["../../../src/api/service/userService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js index afceedc..d21945b 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -60,8 +60,8 @@ exports.DiaryResDto = DiaryResDto; class TableContentsResDto { constructor(firstPartTableContents) { this.chapterId = firstPartTableContents._id; //목차 Id - this.chapterTitle = firstPartTableContents.chapter; - this.chapter = firstPartTableContents.title; + this.chapterTitle = firstPartTableContents.title; + this.chapter = firstPartTableContents.chapter; this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map index 7ca758a..c6d69bd 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,uBAAuB;IAShC,YAAY,IAAW;QARhB,sBAAiB,GAAG;YACvB,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE,IAAI;SACvB,CAAA;QAGG,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC9C,CAAC;IAED,kBAAkB;IAClB,QAAQ,CAAC,KAAkB;QACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAA;IACxC,CAAC;IACD,gBAAgB,CAAC,aAAkC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC5D,CAAC;IACD,iBAAiB,CAAC,IAAW;QACzB,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1E,CAAC;CACJ;AAxBD,0DAwBC;AAED,MAAa,WAAW;IAQpB,cAAc;IACd,YAAY,QAAmB;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IAEK,IAAI,CAAC,QAAmB;;YAC1B,MAAM,sBAAsB,GAAG,QAAQ,CAAC,aAAa,CAAA;YACrD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAA;YAC7C,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,sBAAsB;YACtB,yCAAyC;YACzC,QAAQ;YACJ,IAAI,CAAC,GAAG,GAAC,QAAQ,CAAC,GAAG,CAAA;YACzB,GAAG;YACH,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAClC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;KAAA;CACJ;AA1BD,kCA0BC;AAED,MAAa,mBAAmB;IAM5B,YAAY,sBAA+C;QACvD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,GAAG,CAAA,CAAC,OAAO;QACnD,IAAI,CAAC,YAAY,GAAG,sBAAsB,CAAC,OAAO,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,KAAK,CAAC;QAC5C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;IACzE,CAAC;CACJ;AAZD,kDAYC;AAED,MAAa,oBAAoB;IAM7B,YAAY,IAAW;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAEK,IAAI,CAAC,IAAW;;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAA;YACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAC9B,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrE,CAAC;KAAA;CACJ;AAhBD,oDAgBC"} \ No newline at end of file +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,uBAAuB;IAShC,YAAY,IAAW;QARhB,sBAAiB,GAAG;YACvB,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE,IAAI;SACvB,CAAA;QAGG,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC9C,CAAC;IAED,kBAAkB;IAClB,QAAQ,CAAC,KAAkB;QACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAA;IACxC,CAAC;IACD,gBAAgB,CAAC,aAAkC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC5D,CAAC;IACD,iBAAiB,CAAC,IAAW;QACzB,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1E,CAAC;CACJ;AAxBD,0DAwBC;AAED,MAAa,WAAW;IAQpB,cAAc;IACd,YAAY,QAAmB;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IAEK,IAAI,CAAC,QAAmB;;YAC1B,MAAM,sBAAsB,GAAG,QAAQ,CAAC,aAAa,CAAA;YACrD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAA;YAC7C,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,sBAAsB;YACtB,yCAAyC;YACzC,QAAQ;YACJ,IAAI,CAAC,GAAG,GAAC,QAAQ,CAAC,GAAG,CAAA;YACzB,GAAG;YACH,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAClC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;KAAA;CACJ;AA1BD,kCA0BC;AAED,MAAa,mBAAmB;IAM5B,YAAY,sBAA+C;QACvD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,GAAG,CAAA,CAAC,OAAO;QACnD,IAAI,CAAC,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;IACzE,CAAC;CACJ;AAZD,kDAYC;AAED,MAAa,oBAAoB;IAM7B,YAAY,IAAW;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAEK,IAAI,CAAC,IAAW;;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAA;YACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAC9B,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrE,CAAC;KAAA;CACJ;AAhBD,oDAgBC"} \ No newline at end of file diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index 06ee5cc..df98d84 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -2,17 +2,17 @@ var util = require('../../modules/util') var responseMessage = require('../../modules/responseMessage') var statusCode = require('../../modules/statusCode') var diaryService = require('../service/diaryService') -var firstPartService=require('../service/firstPartService') +var firstPartService = require('../service/firstPartService') module.exports = { postPrologue: async (req, res) => { - const {userId}=req.params + const { userId } = req.params const bookData = req.body; - const bookImage = req.file.location + //const bookImage = req.file.location try { - await diaryService.postPrologue(userId,bookData) + await diaryService.postPrologue(userId, bookData) //const result=await firstPartService.getMainPage(userId) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PROLOGUE)) - } catch (err) { + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PROLOGUE)) + } catch (err) { console.error(err) if (err.statusCode == null) { err.statusCode = statusCode.INTERNAL_SERVER_ERROR; @@ -23,10 +23,10 @@ module.exports = { }, postPetDiary: async (req, res) => { const diaryData = req.body; - const diaryImages = req.files.map(file=>file.location) + const diaryImages = req.files.map(file => file.location) try { - const result = await diaryService.postPetDiary(diaryData,diaryImages) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_POST_PETDIARY, "")) + const result = await diaryService.postPetDiary(diaryData, diaryImages) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PETDIARY, "")) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -36,11 +36,11 @@ module.exports = { return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, - getPetDiary: async(req,res)=>{ - const petDiaryId=req.params.id;//id를 뺴면 객체를 보내줌 + getPetDiary: async (req, res) => { + const petDiaryId = req.params.id;//id를 뺴면 객체를 보내줌 try { const result = await diaryService.getPetDiary(petDiaryId) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_PETDIARY,result)) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PETDIARY, result)) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -50,12 +50,12 @@ module.exports = { return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, - putPetDiary: async(req,res)=>{ - const petDiaryId=req.params.id; - const diaryData=req.body; + putPetDiary: async (req, res) => { + const petDiaryId = req.params.id; + const diaryData = req.body; try { - const result = await diaryService.putPetDiary(petDiaryId,diaryData) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_PUT_PETDIARY,"")) + const result = await diaryService.putPetDiary(petDiaryId, diaryData) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_PUT_PETDIARY, "")) } catch (err) { console.error(err) if (err.statusCode == null) { @@ -65,11 +65,11 @@ module.exports = { return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, - deletePetDiary:async(req,res)=>{ - const petDiaryId=req.params.id; - try{ + deletePetDiary: async (req, res) => { + const petDiaryId = req.params.id; + try { const result = await diaryService.deletePetDiary(petDiaryId,) - res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_DELETE_PETDIARY, result)) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_DELETE_PETDIARY, result)) } catch (err) { console.error(err) if (err.statusCode == null) { diff --git a/src/api/controller/userController.ts b/src/api/controller/userController.ts index 3274931..f6f6fd3 100644 --- a/src/api/controller/userController.ts +++ b/src/api/controller/userController.ts @@ -10,8 +10,8 @@ module.exports = { register: async (req, res) => { const { email, password } = req.body; try { - const result = await userService.register(email, password); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS, result)) + await userService.register(email, password); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SIGH_UP_SUCCESS)) } catch (err) { if (err.statusCode == null) { err.statusCode = statusCode.INTERNAL_SERVER_ERROR; diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 667a1fc..b850cc7 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -27,8 +27,8 @@ module.exports = { console.log('user : ' + user) const setBook = user.book setBook.title = bookData.title, - setBook.imgs = bookData.imgs, - setBook.author = bookData.userName + setBook.imgs = bookData.imgs, + setBook.author = bookData.userName //Create tableContents object const tableContents = new TableContents() @@ -87,7 +87,7 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } } }, - postPetDiary: async (diaryData,diaryImages) => { + postPetDiary: async (diaryData, diaryImages) => { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) @@ -131,64 +131,64 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } }, - getPetDiary: async (petDiaryId) => { - try { - const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); - let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 - // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) - - for (let i = 0; i < findPetDiary.petEmotions.length; i++) { - let feelingList = new FeelingListDto(findPetDiary.pets[i]) - feelingList.setFeeling(findPetDiary.petEmotions[i]) - petDiaryPageResDto.setFeelingList(feelingList) - } - return petDiaryPageResDto - - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } - } - }, - putPetDiary: async (petDiaryId, diaryData) => { - try { - let findPetDiary = await PetDiary.findById(petDiaryId); - findPetDiary.tableContents = findPetDiary.tableContents - findPetDiary.episode = findPetDiary.episode - findPetDiary.date = findPetDiary.date - findPetDiary.imgs = diaryData.diaryImages - findPetDiary.title = diaryData.title - findPetDiary.contents = diaryData.contents - //save petinfo - let petN = diaryData.character.length - for (let i = 0; i < petN; i++) { - const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') - findPetDiary.setPet(petData) - //save emotions - let emotion = new PetEmotions() - emotion.pet = diaryData.character[i]._id - emotion.feeling = diaryData.character[i].feeling - emotion.setPetDiary(findPetDiary) - await emotion.save() - } - await findPetDiary.save() - return responseMessage.SUCCESS_EDIT_PETDIARY; - - } catch (err) { - console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } - } - }, + getPetDiary: async (petDiaryId) => { + try { + const findPetDiary = await PetDiary.findById(petDiaryId).populate('pets').populate('tableContents').populate('petEmotions'); + let petDiaryPageResDto = await new PetDiaryPageResDto(findPetDiary) //이부분 + // console.log("feelingList",findPetDiary.pets[0],";",findPetDiary.petEmotions[0].feeling) + + for (let i = 0; i < findPetDiary.petEmotions.length; i++) { + let feelingList = new FeelingListDto(findPetDiary.pets[i]) + feelingList.setFeeling(findPetDiary.petEmotions[i]) + petDiaryPageResDto.setFeelingList(feelingList) + } + return petDiaryPageResDto + + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } + }, + putPetDiary: async (petDiaryId, diaryData) => { + try { + let findPetDiary = await PetDiary.findById(petDiaryId); + findPetDiary.tableContents = findPetDiary.tableContents + findPetDiary.episode = findPetDiary.episode + findPetDiary.date = findPetDiary.date + findPetDiary.imgs = diaryData.diaryImages + findPetDiary.title = diaryData.title + findPetDiary.contents = diaryData.contents + //save petinfo + let petN = diaryData.character.length + for (let i = 0; i < petN; i++) { + const petData = await Pet.findById(diaryData.character[i]._id).populate('_id') + findPetDiary.setPet(petData) + //save emotions + let emotion = new PetEmotions() + emotion.pet = diaryData.character[i]._id + emotion.feeling = diaryData.character[i].feeling + emotion.setPetDiary(findPetDiary) + await emotion.save() + } + await findPetDiary.save() + return responseMessage.SUCCESS_EDIT_PETDIARY; + + } catch (err) { + console.log(err) + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } + } + }, deletePetDiary: async (petDiaryId) => { try { let findPetDiary = await PetDiary.findById(petDiaryId).populate('tableContents').populate('petEmotions'); - console.log('!!!!! : '+findPetDiary) + console.log('!!!!! : ' + findPetDiary) //화 정렬 순서 맞추기 //해당 목차인것들 모두 가져오기. findPetDiary의 idx 뒤로 다 -1 // let allDiaries=await (PetDiary.find({}).populate('tableContents')) let thisDiariesTableContent = findPetDiary.tableContents - for(let j = 0;j{ - await PetEmotions.deleteOne({_id:petEmotion._id}) + findPetDiary.petEmotions.forEach(async petEmotion => { + await PetEmotions.deleteOne({ _id: petEmotion._id }) }) await PetDiary.deleteOne({ _id: findPetDiary }) diff --git a/src/api/service/userService.ts b/src/api/service/userService.ts index 404ee18..14c31ba 100644 --- a/src/api/service/userService.ts +++ b/src/api/service/userService.ts @@ -56,7 +56,7 @@ module.exports = { }); if (!user) { //등록되지 않은 email - throw { statusCode: statusCode.NO_CONTENT, responseMessage: responseMessage.NO_USER }; + throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; } const test = await bcrypt.compare(password, user.password) From 21bb62891872b7655e9873e430deb4202a7d593f Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 01:39:02 +0900 Subject: [PATCH 104/168] =?UTF-8?q?refactor=20:=201.5=EB=B6=80=20memories?= =?UTF-8?q?=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 3cabe2d..4a41ceb 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -49,7 +49,6 @@ module.exports = { } } }) - const isRainbowPet = await isRainbow(findUser.pets) const rainbowButtonCheck = await rainbowCheck(findUser.pets) const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck) @@ -60,10 +59,11 @@ module.exports = { tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId)) ) + console.log('validMemories : '+ validMemories) //validMemories : [tableContetns [petDiary]] let memoriesResDto = [null, null] - + console.log('validMemoriesLength : '+validMemories.length) if (validMemories.length == 2) { memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) memoriesResDto[1] = new MemoriesResDto(validMemories[1], petId) From 96d49c06f6a16ed2e0cfaa1face061c6a763b3c1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 01:48:19 +0900 Subject: [PATCH 105/168] refactor : add memorise diaryId field --- src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 02ad50e..d42f52f 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -27,6 +27,7 @@ export class RainbowMainPageResDto{ } export class MemoriesResDto{ + private diaryId; private title; private contents; private date; @@ -35,11 +36,12 @@ export class MemoriesResDto{ constructor(petDiaries : IPetDiary[], petId : IPet){ const diaryIndex = this.getRandomMemoryIndex(petDiaries.length) const randomDiary = petDiaries[diaryIndex] - console.log('aaaa :'+petDiaries) + console.log('aaaa :'+randomDiary) console.log('bbbb :'+diaryIndex) console.log("랜덤된 petEmotion "+randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]) + this.diaryId = randomDiary._id this.title = randomDiary.title this.contents = randomDiary.contents this.date = randomDiary.date From da792a7a0d489e3088fb8f98497f2a1572c1bac7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 01:49:20 +0900 Subject: [PATCH 106/168] refactor : dist update --- dist/api/service/rainbowService.js | 2 ++ dist/api/service/rainbowService.js.map | 2 +- dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js | 3 ++- dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 1d1155e..e1b8b02 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -63,8 +63,10 @@ module.exports = { const rainbowMainPageResDto = new RainbowMainPageResDto_1.RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck); const firstPartTableContents = findUser.book.tableContents.firstPartTableContents; const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId))); + console.log('validMemories : ' + validMemories); //validMemories : [tableContetns [petDiary]] let memoriesResDto = [null, null]; + console.log('validMemoriesLength : ' + validMemories.length); if (validMemories.length == 2) { memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0], petId); memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[1], petId); diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index fb7f0da..0713df2 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js index 08a8f23..04db3a3 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js @@ -26,9 +26,10 @@ class MemoriesResDto { constructor(petDiaries, petId) { const diaryIndex = this.getRandomMemoryIndex(petDiaries.length); const randomDiary = petDiaries[diaryIndex]; - console.log('aaaa :' + petDiaries); + console.log('aaaa :' + randomDiary); console.log('bbbb :' + diaryIndex); console.log("랜덤된 petEmotion " + randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]); + this.diaryId = randomDiary._id; this.title = randomDiary.title; this.contents = randomDiary.contents; this.date = randomDiary.date; diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map index 9c3e7e2..7120c3a 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAMvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AA1BD,wCA0BC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file +{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAOvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,WAAW,CAAC,CAAA;QACjC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAA;QAC9B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AA5BD,wCA4BC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file From 88cf3f6f412b78e69f59004dabc90f47a347b7d9 Mon Sep 17 00:00:00 2001 From: sol Date: Thu, 15 Jul 2021 04:33:23 +0900 Subject: [PATCH 107/168] =?UTF-8?q?refactor=20:=201=EB=B6=80,2=EB=B6=80=20?= =?UTF-8?q?=ED=99=88=ED=99=94=EB=A9=B4=20=ED=98=95=EC=8B=9D=20=EB=8F=99?= =?UTF-8?q?=EC=9D=BC=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/firstPartController.ts | 2 +- src/api/service/firstPartService.ts | 1 + src/api/service/secondPartService.ts | 11 ++- .../mainPageDto/FirstPartMainPageResDto.ts | 21 +++--- .../secondPart/SecondPartMainPageResDto.ts | 74 +++++++++++-------- 5 files changed, 64 insertions(+), 45 deletions(-) diff --git a/src/api/controller/firstPartController.ts b/src/api/controller/firstPartController.ts index 7708717..435ab38 100644 --- a/src/api/controller/firstPartController.ts +++ b/src/api/controller/firstPartController.ts @@ -9,7 +9,7 @@ module.exports = { const { userId } = req.params; try { const result = await firstPartService.getMainPage(userId) - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)) + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_FIRSTPART_MAINPAGE, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index 23af184..ca30d23 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -61,6 +61,7 @@ module.exports = { let petDiaryNumber=(await allPetDiaries).length //가장 마지막 일기 const lastDiary = new DiaryResDto(allPetDiaries[petDiaryNumber-1]) + firstPartMainPageResDto.setNextEpisode(lastDiary) //tableContents let lastTableNumber=findUser.book.tableContents.firstPartTableContents.length diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 122d4a1..e110e5b 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -3,7 +3,7 @@ import PetDiary from "../../models/diary/PetDiary" import UserDiary from "../../models/diary/UserDiary" import User from "../../models/user/User" import Book from "../../models/book/Book" -import { SecondPartMainPageResDto, SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" +import { SecondPartMainPageResDto,SecondPartMainPageDiary ,SecondPartMainPageTableContents } from "../../dto/secondPart/SecondPartMainPageResDto" import { SecondPartDiariesOfMonth, SecondPartDiariesOfMonthResDto } from "../../dto/secondPart/SecondPartDiariesOfMonthResDto" import { SecondPartChapterListResDto } from "../../dto/secondPart/SecondPartChapterListResDto" import { SecondPartDiaryResDto } from "../../dto/secondPart/SecondPartDiaryResDto" @@ -32,6 +32,7 @@ module.exports = { }) }) }) + //console.log('mmmm : ',user) const epilogue = user.book.tableContents.secondPartTableContents[0] const checkFirst = user.book.tableContents.secondPartTableContents.map(tableContents => tableContents.userDiary) @@ -57,8 +58,12 @@ module.exports = { date: user.book.tableContents.secondPartStartDate }) } - - return new SecondPartMainPageResDto(user, sortSecondPartTableContents[0]) + //console.log("sort",sortSecondPartTableContents) + const curSecondPartTableContents=await SecondPartTableContent.findById(sortSecondPartTableContents[0].tableContents) + let mainPageDto=new SecondPartMainPageResDto(user, sortSecondPartTableContents[0]) + console.log("말도안돼...",curSecondPartTableContents) + mainPageDto.setDiary(await new SecondPartMainPageDiary(curSecondPartTableContents.chapter,sortSecondPartTableContents[0])) + return mainPageDto } catch (err) { throw err } diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index ed681ab..6604e5a 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -11,16 +11,19 @@ export class FirstPartMainPageResDto { public firstPartMainPage = { title: null, bookImg: null, - diary: {}, + diary: null, tableContents: [], - secondPartBook: null + secondPartBook: null, + nextEpisode:null } constructor(book: IBook) { this.firstPartMainPage.title = book.title this.firstPartMainPage.bookImg = book.imgs } - + setNextEpisode(diaryResDto:DiaryResDto){ + this.firstPartMainPage.nextEpisode=diaryResDto.episode+1 + } //가장 최근 일기 작성(기분X) setDiary(diary: DiaryResDto) { this.firstPartMainPage.diary = diary @@ -36,7 +39,7 @@ export class FirstPartMainPageResDto { export class DiaryResDto { private _id; private chapter; - private episode; + public episode; private title; private contents; private date; @@ -76,10 +79,10 @@ export class TableContentsResDto { } export class SecondPartBookResDto { - private userId - private imgs - private author - private date + private userId=null + private bookImg=null + private author=null + private date=null constructor(user: IUser) { this.init(user) @@ -87,7 +90,7 @@ export class SecondPartBookResDto { async init(user: IUser) { this.userId = user._id - this.imgs = user.book.imgs + this.bookImg = user.book.imgs this.author = user.book.author this.date = await dateMethod.toStringByFormatting(user.book.date) } diff --git a/src/dto/secondPart/SecondPartMainPageResDto.ts b/src/dto/secondPart/SecondPartMainPageResDto.ts index cda4e18..51ab956 100644 --- a/src/dto/secondPart/SecondPartMainPageResDto.ts +++ b/src/dto/secondPart/SecondPartMainPageResDto.ts @@ -3,34 +3,35 @@ import { IUserDiary } from "../../interfaces/diary/IUserDiary" import { IPet } from "../../interfaces/pet/IPet" import { ISecondPartTableContents } from "../../interfaces/tableContents/ISecondPartTableContents" import { IUser } from "../../interfaces/user/IUser" +import SecondPartTableContent from "../../models/tableContents/SecondPartTableContent" +require('../../models/tableContents/SecondPartTableContent') const dateMethod = require('../../modules/dateMethod') export class SecondPartMainPageResDto{ - private part = null - private author = null - private bookImg = null - private memory : SecondPartMainPageMemory = null - private tableContents : SecondPartMainPageTableContents[] = null - private firstPartBook : SecondPartMainPageFirstPartBook = null - + public secondPartMainPage={ + //private author = null, + title:null, + bookImg : null, + diary : null, + tableContents: [], + firstPartBook : null, + nextEpisode : null +} constructor(user : IUser, sortUserDiary : IUserDiary){ - this.part = 2 - this.author = user.book.author - this.bookImg = user.book.imgs - this.memory = new SecondPartMainPageMemory(sortUserDiary) - this.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents=> + //this.author = user.book.author + this.secondPartMainPage.bookImg = user.book.imgs + this.secondPartMainPage.title=user.book.title + this.secondPartMainPage.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents=> new SecondPartMainPageTableContents(secondPartTableContents)) - this.firstPartBook = new SecondPartMainPageFirstPartBook(user.book) + this.secondPartMainPage.firstPartBook = new SecondPartMainPageFirstPartBook(user.book) + this.setNextEpisode(sortUserDiary) } -} - -export class SecondPartMainPageMemory{ - private diary : SecondPartMainPageDiary= null - private nextEpisode = null - - constructor(sortUserDiary : IUserDiary){ - this.diary = new SecondPartMainPageDiary(sortUserDiary) - this.nextEpisode = sortUserDiary.episode+1 + setDiary(diary: SecondPartMainPageDiary){ + console.log('2222222 :',diary) + this.secondPartMainPage.diary=diary + } + setNextEpisode(sortUserDiary:IUserDiary){ + this.secondPartMainPage.nextEpisode = sortUserDiary.episode+1 } } @@ -39,43 +40,52 @@ export class SecondPartMainPageDiary{ private title = null private contents = null private date = null + private _id=null + private chapter=null - constructor(sortUserDiary : IUserDiary){ - this.init(sortUserDiary) + constructor(chapter:Number,sortUserDiary : IUserDiary){ + //console.log("!!!!!",sortUserDiary) + this.init(chapter,sortUserDiary) } - async init(sortUserDiary){ + async init(chapter:Number,sortUserDiary){ + this._id=sortUserDiary._id this.episode = sortUserDiary.episode this.title = sortUserDiary.title this.contents = sortUserDiary.contents + this.chapter=chapter this.date = await dateMethod.toStringByFormatting(sortUserDiary.date) } } export class SecondPartMainPageTableContents{ private chapter = null - private title = null + private chapterTitle = null private episodePerChapterCount = null - private _id = null + private chapterId = null constructor(secondPartTableContents : ISecondPartTableContents){ this.chapter = secondPartTableContents.chapter - this.title = secondPartTableContents.title - this._id = secondPartTableContents._id + this.chapterTitle = secondPartTableContents.title + this.chapterId = secondPartTableContents._id this.episodePerChapterCount = secondPartTableContents.userDiary.length } } export class SecondPartMainPageFirstPartBook{ - private _id = null + private userId = null private bookImg = null private author = null private date = null constructor(book : IBook){ - this._id = book._id + this.init(book) + } + + async init(book:IBook){ + this.userId = book._id this.bookImg = book.imgs this.author = book.author - this.date = book.date + this.date = await dateMethod.toStringByFormatting(book.date) } } \ No newline at end of file From 8372c4863394e5ad897b0d7a04281b4e1ca38649 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 04:53:22 +0900 Subject: [PATCH 108/168] refactor : theBestMoment update --- src/api/service/rainbowService.ts | 28 +++++++++++++++++-- .../theBestMomentDto/TheBestMomentResDto.ts | 2 +- src/modules/comment.ts | 21 ++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 src/modules/comment.ts diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 4a41ceb..e74c7ed 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -15,7 +15,8 @@ import { PetNameResDto } from "../../dto/rainbow/petDto/PetNameResDto" import { IPetDiary } from "../../interfaces/diary/IPetDiary" import Comments from "../../models/etc/Comments" import { TheBestMomentSubResDto } from "../../dto/rainbow/theBestMomentDto/TheBestMomentSubResDto" -const dateMethod = require("../../modules/dateMethod") +var dateMethod = require("../../modules/dateMethod") +var theBestMomentComments = require("../../modules/comment") require("../../models/user/User") require("../../models/pet/Pet") @@ -222,12 +223,31 @@ module.exports = { const theBestMomentsResDto = new TheBestMomentsResDto() for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) - const test = await Comments.find() + //const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) + let commentPerFeeling = { + comments : "", + feeling : null, + tableContents : null + } + if(j==0){ + commentPerFeeling.comments = await theBestMomentComments.loveFeeling(pet.name) + }else if(j==1){ + commentPerFeeling.comments = await theBestMomentComments.happyFeeling(pet.name) + }else if(j==2){ + commentPerFeeling.comments = await theBestMomentComments.normalFeeling() + }else if(j==3){ + commentPerFeeling.comments = await theBestMomentComments.angryFeeling(pet.name) + }else if(j==4){ + commentPerFeeling.comments = await theBestMomentComments.gloomyFeeling() + }else if(j==5){ + commentPerFeeling.comments = await theBestMomentComments.boringFeeling() + } let theBestMoment = null if (j < 3) { + console.log('positive') theBestMoment = new TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])) } else { + console.log('negative') theBestMoment = new TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])) } theBestMomentsResDto.setTheBestMoment(theBestMoment) @@ -243,6 +263,7 @@ module.exports = { function getPositiveRadomDiary(diaries: IPetDiary[]) { if (diaries === null) return null const diaryLength = diaries.length + console.log('diaryLength : '+diaryLength) const theBestMomentDiaries = [] if (diaryLength < 8) { for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 @@ -271,6 +292,7 @@ module.exports = { function getNegativeRandomDiary(diaries: IPetDiary[]) { if (diaries === null) return null const diaryLength = diaries.length + console.log('diaryLength : '+diaryLength) const theBestMomentDiaries = [] if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index c36b147..c2d750b 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -33,7 +33,7 @@ export class TheBestMoment{ //[사랑],[기쁨],[보통] private feeling = null private diaries = [] - constructor(commentPerFeeling : IComments, theBestMomentDiary : TheBestMomentDiary[]){ + constructor(commentPerFeeling , theBestMomentDiary : TheBestMomentDiary[]){ this.comment = commentPerFeeling.comments this.feeling = commentPerFeeling.feeling this.diaries = theBestMomentDiary diff --git a/src/modules/comment.ts b/src/modules/comment.ts new file mode 100644 index 0000000..584b4b8 --- /dev/null +++ b/src/modules/comment.ts @@ -0,0 +1,21 @@ +module.exports = { + loveFeeling: async (name: string) => { + const comment = `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. + ${name}(이)가 사랑을 느꼈던 순간들이예요. ${name}(이)에게 사랑을 알려주셔서 감사합니다.` + }, + happyFeeling: async (name: string) => { + const comment = `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. ` + }, + normalFeeling: async () => { + const comment = `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.` + }, + angryFeeling: async (name: string) => { + const comment = `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.` + }, + gloomyFeeling: async () => { + const comment = `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.` + }, + boringFeeling: async () => { + const comment = `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.` + } +} \ No newline at end of file From 5eae151e794ce7b1364a5db6b33829e81ef06590 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 12:30:06 +0900 Subject: [PATCH 109/168] refactor : add s3 in registerPet --- src/api/controller/petController.ts | 2 ++ src/api/router/pet/index.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index bc01749..e1ccc40 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -8,6 +8,8 @@ module.exports = { registerPet: async (req, res) => { let reqData=req.body let images = req.files.map(file=>file.location) + console.log('reqData : '+ reqData) + console.log('images : '+images) try { const result = await petService.registerPet(reqData, images); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)) diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index 1080d10..db46e82 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -3,7 +3,7 @@ var router = express.Router() var petController = require('../../controller/petController') var upload = require('../../../modules/multer') -router.post('/register',petController.registerPet) //register pet +router.post('/register',upload.array('images',5),petController.registerPet) //register pet //router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; \ No newline at end of file From fb86a1cd2dde988493badb7ed92798bbcde4e652 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 12:31:06 +0900 Subject: [PATCH 110/168] =?UTF-8?q?refactor=20:=20=ED=8E=AB=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=ED=95=98=EA=B8=B0=20s3=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 2 ++ dist/api/controller/petController.js.map | 2 +- dist/api/router/pet/index.js | 2 +- dist/api/router/pet/index.js.map | 2 +- dist/api/service/rainbowService.js | 34 ++++++++++++++++--- dist/api/service/rainbowService.js.map | 2 +- .../TheBestMomentResDto.js.map | 2 +- dist/modules/comment.js | 31 +++++++++++++++++ dist/modules/comment.js.map | 1 + 9 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 dist/modules/comment.js create mode 100644 dist/modules/comment.js.map diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 161bdb0..363e080 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -15,6 +15,8 @@ module.exports = { registerPet: (req, res) => __awaiter(this, void 0, void 0, function* () { let reqData = req.body; let images = req.files.map(file => file.location); + console.log('reqData : ' + reqData); + console.log('images : ' + images); try { const result = yield petService.registerPet(reqData, images); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)); diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index a160a64..de97ee6 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,YAAY,GAAE,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js index 7888a1b..1197f80 100644 --- a/dist/api/router/pet/index.js +++ b/dist/api/router/pet/index.js @@ -2,7 +2,7 @@ var express = require('express'); var router = express.Router(); var petController = require('../../controller/petController'); var upload = require('../../../modules/multer'); -router.post('/register', petController.registerPet); //register pet +router.post('/register', upload.array('images', 5), petController.registerPet); //register pet //router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index 9535180..09478a4 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AACjE,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAC1F,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index e1b8b02..5217df0 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -24,9 +24,9 @@ const SecondPartTableContent_1 = __importDefault(require("../../models/tableCont const PetEmotions_1 = __importDefault(require("../../models/diary/PetEmotions")); const TheBestMomentResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentResDto"); const PetNameResDto_1 = require("../../dto/rainbow/petDto/PetNameResDto"); -const Comments_1 = __importDefault(require("../../models/etc/Comments")); const TheBestMomentSubResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentSubResDto"); -const dateMethod = require("../../modules/dateMethod"); +var dateMethod = require("../../modules/dateMethod"); +var theBestMomentComments = require("../../modules/comment"); require("../../models/user/User"); require("../../models/pet/Pet"); require("../../models/book/Book"); @@ -213,13 +213,37 @@ module.exports = { } const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(); for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); - const test = yield Comments_1.default.find(); + //const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) + let commentPerFeeling = { + comments: "", + feeling: null, + tableContents: null + }; + if (j == 0) { + commentPerFeeling.comments = yield theBestMomentComments.loveFeeling(pet.name); + } + else if (j == 1) { + commentPerFeeling.comments = yield theBestMomentComments.happyFeeling(pet.name); + } + else if (j == 2) { + commentPerFeeling.comments = yield theBestMomentComments.normalFeeling(); + } + else if (j == 3) { + commentPerFeeling.comments = yield theBestMomentComments.angryFeeling(pet.name); + } + else if (j == 4) { + commentPerFeeling.comments = yield theBestMomentComments.gloomyFeeling(); + } + else if (j == 5) { + commentPerFeeling.comments = yield theBestMomentComments.boringFeeling(); + } let theBestMoment = null; if (j < 3) { + console.log('positive'); theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])); } else { + console.log('negative'); theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])); } theBestMomentsResDto.setTheBestMoment(theBestMoment); @@ -235,6 +259,7 @@ module.exports = { if (diaries === null) return null; const diaryLength = diaries.length; + console.log('diaryLength : ' + diaryLength); const theBestMomentDiaries = []; if (diaryLength < 8) { for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 @@ -264,6 +289,7 @@ module.exports = { if (diaries === null) return null; const diaryLength = diaries.length; + console.log('diaryLength : ' + diaryLength); const theBestMomentDiaries = []; if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 0713df2..dbd6c3d 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 9743235..80d1b6d 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAA6B,EAAE,kBAAyC;QAJ5E,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAC,eAAe,CAAC,CAAA;YAC3D,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAnBD,gDAmBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAG,kBAAyC;QAJjE,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAC,eAAe,CAAC,CAAA;YAC3D,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAnBD,gDAmBC"} \ No newline at end of file diff --git a/dist/modules/comment.js b/dist/modules/comment.js new file mode 100644 index 0000000..a353d2d --- /dev/null +++ b/dist/modules/comment.js @@ -0,0 +1,31 @@ +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +module.exports = { + loveFeeling: (name) => __awaiter(this, void 0, void 0, function* () { + const comment = `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. + ${name}(이)가 사랑을 느꼈던 순간들이예요. ${name}(이)에게 사랑을 알려주셔서 감사합니다.`; + }), + happyFeeling: (name) => __awaiter(this, void 0, void 0, function* () { + const comment = `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. `; + }), + normalFeeling: () => __awaiter(this, void 0, void 0, function* () { + const comment = `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.`; + }), + angryFeeling: (name) => __awaiter(this, void 0, void 0, function* () { + const comment = `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.`; + }), + gloomyFeeling: () => __awaiter(this, void 0, void 0, function* () { + const comment = `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.`; + }), + boringFeeling: () => __awaiter(this, void 0, void 0, function* () { + const comment = `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.`; + }) +}; +//# sourceMappingURL=comment.js.map \ No newline at end of file diff --git a/dist/modules/comment.js.map b/dist/modules/comment.js.map new file mode 100644 index 0000000..89378c3 --- /dev/null +++ b/dist/modules/comment.js.map @@ -0,0 +1 @@ +{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../src/modules/comment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,IAAY,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,cAAc,IAAI;UAChC,IAAI,wBAAwB,IAAI,wBAAwB,CAAA;IAC9D,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,kCAAkC,IAAI,+CAA+C,IAAI,oBAAoB,CAAA;IACjI,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,2DAA2D,CAAA;IAC/E,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,0DAA0D,IAAI,uCAAuC,CAAA;IACzH,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,4DAA4D,CAAA;IAChF,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,yEAAyE,CAAA;IAC7F,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file From e28ed8ca899c200b76045fcc9990bc2aa5da6bc9 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 14:11:21 +0900 Subject: [PATCH 111/168] =?UTF-8?q?refactor=20:=20=ED=8E=AB=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 12 +++++++++--- src/api/service/petService.ts | 2 +- src/api/service/rainbowService.ts | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index e1ccc40..ef49e3f 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -1,3 +1,5 @@ +import { json } from "body-parser" + var util = require('../../modules/util') var responseMessage = require('../../modules/responseMessage') var statusCode = require('../../modules/statusCode') @@ -6,9 +8,14 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { - let reqData=req.body + let reqData=JSON.parse(JSON.stringify(req.body)) + console.log('type : '+typeof(reqData)) + console.log('toObject : '+reqData) let images = req.files.map(file=>file.location) - console.log('reqData : '+ reqData) + //console.log('reqData : '+ reqData.pets[0]) + const test = JSON.parse(reqData.pets) + console.log('reqData : '+test[0]) + console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { const result = await petService.registerPet(reqData, images); @@ -22,7 +29,6 @@ module.exports = { res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } }, - // registerPetImg:async(req,res)=>{ // const image = req.files.map(file=>file.location) // const petImageInfo = req.body diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 76f182d..09d5f70 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -14,7 +14,7 @@ module.exports = { try{ //error handling const findUser = await User.findById(reqData.userId) - + console.log('findUser : '+findUser) let pets=[]; const startDate= new Date(reqData.pets[0].startDate) startDate.setDate(startDate.getDate() + 1); diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index e74c7ed..838b161 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,7 +1,7 @@ import User from "../../models/user/User" import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" -import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" +import { MyPetInfoResDto, RainbowPetResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" import { IPet } from "../../interfaces/pet/IPet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" @@ -128,8 +128,8 @@ module.exports = { const findUser = await User.find().populate({ path: "pets" }) - const rainbowPetResDto = findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => - new MyPetInfoResDto(pet)) + const rainbowPetResDto = new RainbowPetResDto(findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => + new MyPetInfoResDto(pet))) return rainbowPetResDto } catch (err) { From 602f80b510c79afc6af6597ac0c068ea0ca4bfa3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 15:03:39 +0900 Subject: [PATCH 112/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 2 +- src/api/service/petService.ts | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index ef49e3f..a55daa7 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -14,7 +14,7 @@ module.exports = { let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) const test = JSON.parse(reqData.pets) - console.log('reqData : '+test[0]) + console.log('reqData : '+reqData.userId) console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 09d5f70..3f03b56 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -11,20 +11,27 @@ require("../../models/user/User") require("../../models/pet/Pet") module.exports = { registerPet: async (reqData, images) => { + const userId = JSON.parse(reqData.userId) + const reqPets = JSON.parse(reqData.pets) + console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) + console.log('@@@@@@@@@@@@ : '+reqPets[0].name) + console.log('############# : '+reqPets[1].name) + console.log('$$$$$$$$$$$$ : '+reqData.pets.length) try{ //error handling - const findUser = await User.findById(reqData.userId) + const findUser = await User.findById(userId) console.log('findUser : '+findUser) + console.log('image : '+images[0]) let pets=[]; - const startDate= new Date(reqData.pets[0].startDate) + const startDate= new Date(reqPets[0].startDate) startDate.setDate(startDate.getDate() + 1); - for (let i = 0; i < reqData.pets.length; i++) { + for (let i = 0; i < reqPets.length; i++) { let pet = new Pet({ - name: reqData.pets[i].name, - kind: reqData.pets[i].kind, - gender: reqData.pets[i].gender, + name: reqPets[i].name, + kind: reqPets[i].kind, + gender: reqPets[i].gender, imgs : images[i], - user: mongoose.Types.ObjectId(reqData.userId), + user: mongoose.Types.ObjectId(userId), rainbow: false, startDate: new Date(startDate) From 498c4af97680b8deef8e6883d00ef56d955bfab1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 15:21:51 +0900 Subject: [PATCH 113/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/firstPartController.js | 2 +- .../api/controller/firstPartController.js.map | 2 +- dist/api/controller/petController.js | 15 +++- dist/api/controller/petController.js.map | 2 +- dist/api/service/firstPartService.js | 1 + dist/api/service/firstPartService.js.map | 2 +- dist/api/service/petService.js | 10 ++- dist/api/service/petService.js.map | 2 +- dist/api/service/rainbowService.js | 2 +- dist/api/service/rainbowService.js.map | 2 +- dist/api/service/secondPartService.js | 8 +- dist/api/service/secondPartService.js.map | 2 +- .../mainPageDto/FirstPartMainPageResDto.js | 14 +++- .../FirstPartMainPageResDto.js.map | 2 +- .../secondPart/SecondPartMainPageResDto.js | 80 +++++++++++-------- .../SecondPartMainPageResDto.js.map | 2 +- src/api/controller/petController.ts | 14 ++-- src/api/service/petService.ts | 24 +++--- 18 files changed, 116 insertions(+), 70 deletions(-) diff --git a/dist/api/controller/firstPartController.js b/dist/api/controller/firstPartController.js index f905fd5..b4a9071 100644 --- a/dist/api/controller/firstPartController.js +++ b/dist/api/controller/firstPartController.js @@ -18,7 +18,7 @@ module.exports = { const { userId } = req.params; try { const result = yield firstPartService.getMainPage(userId); - res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_RAINBOW_MAIN_PAGE, result)); + res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_FIRSTPART_MAINPAGE, result)); } catch (err) { console.error(err); diff --git a/dist/api/controller/firstPartController.js.map b/dist/api/controller/firstPartController.js.map index 0087540..c252caa 100644 --- a/dist/api/controller/firstPartController.js.map +++ b/dist/api/controller/firstPartController.js.map @@ -1 +1 @@ -{"version":3,"file":"firstPartController.js","sourceRoot":"","sources":["../../../src/api/controller/firstPartController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,gBAAgB,GAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAG7D,MAAM,CAAC,OAAO,GAAG;IACb,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC9B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC,CAAA;SACrH;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC/I;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"firstPartController.js","sourceRoot":"","sources":["../../../src/api/controller/firstPartController.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,gBAAgB,GAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAG7D,MAAM,CAAC,OAAO,GAAG;IACb,QAAQ,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC9B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;YACzD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC,CAAA;SACtH;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC/I;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 363e080..fc8b086 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -1,3 +1,4 @@ +"use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -7,15 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +Object.defineProperty(exports, "__esModule", { value: true }); var util = require('../../modules/util'); var responseMessage = require('../../modules/responseMessage'); var statusCode = require('../../modules/statusCode'); const petService = require('../service/petService'); module.exports = { - registerPet: (req, res) => __awaiter(this, void 0, void 0, function* () { - let reqData = req.body; + registerPet: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + // let reqData=JSON.parse(JSON.stringify(req.body)) + // console.log('type : '+typeof(reqData)) + // console.log('toObject : '+reqData) + const reqData = req.body; let images = req.files.map(file => file.location); - console.log('reqData : ' + reqData); + //console.log('reqData : '+ reqData.pets[0]) + //const test = JSON.parse(reqData.pets) + console.log('reqData : ' + reqData.pets); + console.log('userId : ' + reqData.userId); + //console.log('reqData2 : '+typeof(test)) console.log('images : ' + images); try { const result = yield petService.registerPet(reqData, images); diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index de97ee6..592f224 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;AAAA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,YAAY,GAAE,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IAED,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,mDAAmD;QACnD,yCAAyC;QACzC,qCAAqC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/service/firstPartService.js b/dist/api/service/firstPartService.js index 14fdeca..66907b9 100644 --- a/dist/api/service/firstPartService.js +++ b/dist/api/service/firstPartService.js @@ -71,6 +71,7 @@ module.exports = { let petDiaryNumber = (yield allPetDiaries).length; //가장 마지막 일기 const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(allPetDiaries[petDiaryNumber - 1]); + firstPartMainPageResDto.setNextEpisode(lastDiary); //tableContents let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length; console.log("lastTable", TableContents_1.default); diff --git a/dist/api/service/firstPartService.js.map b/dist/api/service/firstPartService.js.map index 46aab20..f4c1c65 100644 --- a/dist/api/service/firstPartService.js.map +++ b/dist/api/service/firstPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 3e277d5..0b9eb16 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -23,11 +23,19 @@ require("../../models/user/User"); require("../../models/pet/Pet"); module.exports = { registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { + // const userId = JSON.parse(reqData.userId) + // const reqPets = JSON.parse(reqData.pets) + //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) + console.log('@@@@@@@@@@@@ : ' + reqData[0].name); + //console.log('############# : '+reqData[1].name) + console.log('$$$$$$$$$$$$ : ' + reqData.pets.length); try { //error handling const findUser = yield User_1.default.findById(reqData.userId); + console.log('findUser : ' + findUser); + console.log('image : ' + images[0]); let pets = []; - const startDate = new Date(reqData.pets[0].startDate); + const startDate = new Date(reqData[0].startDate); startDate.setDate(startDate.getDate() + 1); for (let i = 0; i < reqData.pets.length; i++) { let pet = new Pet_1.default({ diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 6ad4bd5..2800c1a 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kEAAyC;AACzC,+DAAsC;AACtC,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACtD,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AACnD,IAAI,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;AAElC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAG;YACH,gBAAgB;YACZ,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAEpD,IAAI,IAAI,GAAC,EAAE,CAAC;YACZ,MAAM,SAAS,GAAE,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YACpD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAI,GAAG,GAAG,IAAI,aAAG,CAAC;oBACd,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1B,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1B,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;oBAC9B,IAAI,EAAG,MAAM,CAAC,CAAC,CAAC;oBAChB,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;oBAC7C,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC;oBAE/B,6BAA6B;oBAC5B,sEAAsE;oBACtE,+BAA+B;iBAClC,CAAC,CAAC;gBACH,MAAM,GAAG,CAAC,IAAI,EAAE,CAAA;gBAChB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACvB,IAAI,CAAC,CAAC,CAAC,GAAC,GAAG,CAAC;aACf;YACD,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YACrB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrB,SAAS;YACT,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA,EAAE,CAAA,GAAG,CAAC,GAAG,CAAC,CAAA;YACvC,OAAO,QAAQ,CAAA;SAClB;QAAA,OAAM,GAAG,EAAC;YACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,qBAAqB,EAAE,eAAe,EAAE,eAAe,CAAC,qBAAqB,EAAE,CAAC;SAClH;IACL,CAAC,CAAA;IAED,8CAA8C;IAC9C,WAAW;IACX,kDAAkD;IAClD,+EAA+E;IAC/E,YAAY;IACZ,uCAAuC;IACvC,mBAAmB;IACnB,oBAAoB;IACpB,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 5217df0..48b44d2 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -128,7 +128,7 @@ module.exports = { const findUser = yield User_1.default.find().populate({ path: "pets" }); - const rainbowPetResDto = findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); + const rainbowPetResDto = new RainbowPetResDto_1.RainbowPetResDto(findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet))); return rainbowPetResDto; } catch (err) { diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index dbd6c3d..ca84ee2 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index eadae72..726aa0a 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -42,6 +42,7 @@ module.exports = { }) }) }); + //console.log('mmmm : ',user) const epilogue = user.book.tableContents.secondPartTableContents[0]; const checkFirst = user.book.tableContents.secondPartTableContents.map(tableContents => tableContents.userDiary); let check = false; @@ -62,7 +63,12 @@ module.exports = { date: user.book.tableContents.secondPartStartDate }); } - return new SecondPartMainPageResDto_1.SecondPartMainPageResDto(user, sortSecondPartTableContents[0]); + //console.log("sort",sortSecondPartTableContents) + const curSecondPartTableContents = yield SecondPartTableContent_1.default.findById(sortSecondPartTableContents[0].tableContents); + let mainPageDto = new SecondPartMainPageResDto_1.SecondPartMainPageResDto(user, sortSecondPartTableContents[0]); + console.log("말도안돼...", curSecondPartTableContents); + mainPageDto.setDiary(yield new SecondPartMainPageResDto_1.SecondPartMainPageDiary(curSecondPartTableContents.chapter, sortSecondPartTableContents[0])); + return mainPageDto; } catch (err) { throw err; diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index e353bd7..5d05aae 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js index d21945b..ceb181d 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -16,13 +16,17 @@ class FirstPartMainPageResDto { this.firstPartMainPage = { title: null, bookImg: null, - diary: {}, + diary: null, tableContents: [], - secondPartBook: null + secondPartBook: null, + nextEpisode: null }; this.firstPartMainPage.title = book.title; this.firstPartMainPage.bookImg = book.imgs; } + setNextEpisode(diaryResDto) { + this.firstPartMainPage.nextEpisode = diaryResDto.episode + 1; + } //가장 최근 일기 작성(기분X) setDiary(diary) { this.firstPartMainPage.diary = diary; @@ -68,12 +72,16 @@ class TableContentsResDto { exports.TableContentsResDto = TableContentsResDto; class SecondPartBookResDto { constructor(user) { + this.userId = null; + this.bookImg = null; + this.author = null; + this.date = null; this.init(user); } init(user) { return __awaiter(this, void 0, void 0, function* () { this.userId = user._id; - this.imgs = user.book.imgs; + this.bookImg = user.book.imgs; this.author = user.book.author; this.date = yield dateMethod.toStringByFormatting(user.book.date); }); diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map index c6d69bd..bc356e2 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,uBAAuB;IAShC,YAAY,IAAW;QARhB,sBAAiB,GAAG;YACvB,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;YACjB,cAAc,EAAE,IAAI;SACvB,CAAA;QAGG,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACzC,IAAI,CAAC,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;IAC9C,CAAC;IAED,kBAAkB;IAClB,QAAQ,CAAC,KAAkB;QACvB,IAAI,CAAC,iBAAiB,CAAC,KAAK,GAAG,KAAK,CAAA;IACxC,CAAC;IACD,gBAAgB,CAAC,aAAkC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC5D,CAAC;IACD,iBAAiB,CAAC,IAAW;QACzB,IAAI,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAA;IAC1E,CAAC;CACJ;AAxBD,0DAwBC;AAED,MAAa,WAAW;IAQpB,cAAc;IACd,YAAY,QAAmB;QAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IAEK,IAAI,CAAC,QAAmB;;YAC1B,MAAM,sBAAsB,GAAG,QAAQ,CAAC,aAAa,CAAA;YACrD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAA;YAC7C,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtD,sBAAsB;YACtB,yCAAyC;YACzC,QAAQ;YACJ,IAAI,CAAC,GAAG,GAAC,QAAQ,CAAC,GAAG,CAAA;YACzB,GAAG;YACH,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAClC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrE,CAAC;KAAA;CACJ;AA1BD,kCA0BC;AAED,MAAa,mBAAmB;IAM5B,YAAY,sBAA+C;QACvD,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC,GAAG,CAAA,CAAC,OAAO;QACnD,IAAI,CAAC,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,OAAO,CAAC;QAC9C,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC;IACzE,CAAC;CACJ;AAZD,kDAYC;AAED,MAAa,oBAAoB;IAM7B,YAAY,IAAW;QACnB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAEK,IAAI,CAAC,IAAW;;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAA;YACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAC9B,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACrE,CAAC;KAAA;CACJ;AAhBD,oDAgBC"} \ No newline at end of file +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartMainPageResDto.js b/dist/dto/secondPart/SecondPartMainPageResDto.js index 1ffab98..b931f0b 100644 --- a/dist/dto/secondPart/SecondPartMainPageResDto.js +++ b/dist/dto/secondPart/SecondPartMainPageResDto.js @@ -9,47 +9,54 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.SecondPartMainPageFirstPartBook = exports.SecondPartMainPageTableContents = exports.SecondPartMainPageDiary = exports.SecondPartMainPageMemory = exports.SecondPartMainPageResDto = void 0; +exports.SecondPartMainPageFirstPartBook = exports.SecondPartMainPageTableContents = exports.SecondPartMainPageDiary = exports.SecondPartMainPageResDto = void 0; +require('../../models/tableContents/SecondPartTableContent'); const dateMethod = require('../../modules/dateMethod'); class SecondPartMainPageResDto { constructor(user, sortUserDiary) { - this.part = null; - this.author = null; - this.bookImg = null; - this.memory = null; - this.tableContents = null; - this.firstPartBook = null; - this.part = 2; - this.author = user.book.author; - this.bookImg = user.book.imgs; - this.memory = new SecondPartMainPageMemory(sortUserDiary); - this.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents => new SecondPartMainPageTableContents(secondPartTableContents)); - this.firstPartBook = new SecondPartMainPageFirstPartBook(user.book); + this.secondPartMainPage = { + //private author = null, + title: null, + bookImg: null, + diary: null, + tableContents: [], + firstPartBook: null, + nextEpisode: null + }; + //this.author = user.book.author + this.secondPartMainPage.bookImg = user.book.imgs; + this.secondPartMainPage.title = user.book.title; + this.secondPartMainPage.tableContents = user.book.tableContents.secondPartTableContents.map(secondPartTableContents => new SecondPartMainPageTableContents(secondPartTableContents)); + this.secondPartMainPage.firstPartBook = new SecondPartMainPageFirstPartBook(user.book); + this.setNextEpisode(sortUserDiary); } -} -exports.SecondPartMainPageResDto = SecondPartMainPageResDto; -class SecondPartMainPageMemory { - constructor(sortUserDiary) { - this.diary = null; - this.nextEpisode = null; - this.diary = new SecondPartMainPageDiary(sortUserDiary); - this.nextEpisode = sortUserDiary.episode + 1; + setDiary(diary) { + console.log('2222222 :', diary); + this.secondPartMainPage.diary = diary; + } + setNextEpisode(sortUserDiary) { + this.secondPartMainPage.nextEpisode = sortUserDiary.episode + 1; } } -exports.SecondPartMainPageMemory = SecondPartMainPageMemory; +exports.SecondPartMainPageResDto = SecondPartMainPageResDto; class SecondPartMainPageDiary { - constructor(sortUserDiary) { + constructor(chapter, sortUserDiary) { this.episode = null; this.title = null; this.contents = null; this.date = null; - this.init(sortUserDiary); + this._id = null; + this.chapter = null; + //console.log("!!!!!",sortUserDiary) + this.init(chapter, sortUserDiary); } - init(sortUserDiary) { + init(chapter, sortUserDiary) { return __awaiter(this, void 0, void 0, function* () { + this._id = sortUserDiary._id; this.episode = sortUserDiary.episode; this.title = sortUserDiary.title; this.contents = sortUserDiary.contents; + this.chapter = chapter; this.date = yield dateMethod.toStringByFormatting(sortUserDiary.date); }); } @@ -58,26 +65,31 @@ exports.SecondPartMainPageDiary = SecondPartMainPageDiary; class SecondPartMainPageTableContents { constructor(secondPartTableContents) { this.chapter = null; - this.title = null; + this.chapterTitle = null; this.episodePerChapterCount = null; - this._id = null; + this.chapterId = null; this.chapter = secondPartTableContents.chapter; - this.title = secondPartTableContents.title; - this._id = secondPartTableContents._id; + this.chapterTitle = secondPartTableContents.title; + this.chapterId = secondPartTableContents._id; this.episodePerChapterCount = secondPartTableContents.userDiary.length; } } exports.SecondPartMainPageTableContents = SecondPartMainPageTableContents; class SecondPartMainPageFirstPartBook { constructor(book) { - this._id = null; + this.userId = null; this.bookImg = null; this.author = null; this.date = null; - this._id = book._id; - this.bookImg = book.imgs; - this.author = book.author; - this.date = book.date; + this.init(book); + } + init(book) { + return __awaiter(this, void 0, void 0, function* () { + this.userId = book._id; + this.bookImg = book.imgs; + this.author = book.author; + this.date = yield dateMethod.toStringByFormatting(book.date); + }); } } exports.SecondPartMainPageFirstPartBook = SecondPartMainPageFirstPartBook; diff --git a/dist/dto/secondPart/SecondPartMainPageResDto.js.map b/dist/dto/secondPart/SecondPartMainPageResDto.js.map index f918933..895f049 100644 --- a/dist/dto/secondPart/SecondPartMainPageResDto.js.map +++ b/dist/dto/secondPart/SecondPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"SecondPartMainPageResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"SecondPartMainPageResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index a55daa7..74ce366 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -8,14 +8,16 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { - let reqData=JSON.parse(JSON.stringify(req.body)) - console.log('type : '+typeof(reqData)) - console.log('toObject : '+reqData) + // let reqData=JSON.parse(JSON.stringify(req.body)) + // console.log('type : '+typeof(reqData)) + // console.log('toObject : '+reqData) + const reqData = req.body let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) - const test = JSON.parse(reqData.pets) - console.log('reqData : '+reqData.userId) - console.log('reqData2 : '+typeof(test)) + //const test = JSON.parse(reqData.pets) + console.log('reqData : '+reqData.pets) + console.log('userId : '+reqData.userId) + //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { const result = await petService.registerPet(reqData, images); diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 3f03b56..3532846 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -11,27 +11,27 @@ require("../../models/user/User") require("../../models/pet/Pet") module.exports = { registerPet: async (reqData, images) => { - const userId = JSON.parse(reqData.userId) - const reqPets = JSON.parse(reqData.pets) - console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) - console.log('@@@@@@@@@@@@ : '+reqPets[0].name) - console.log('############# : '+reqPets[1].name) + // const userId = JSON.parse(reqData.userId) + // const reqPets = JSON.parse(reqData.pets) + //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) + console.log('@@@@@@@@@@@@ : '+reqData[0].name) + //console.log('############# : '+reqData[1].name) console.log('$$$$$$$$$$$$ : '+reqData.pets.length) try{ //error handling - const findUser = await User.findById(userId) + const findUser = await User.findById(reqData.userId) console.log('findUser : '+findUser) console.log('image : '+images[0]) let pets=[]; - const startDate= new Date(reqPets[0].startDate) + const startDate= new Date(reqData[0].startDate) startDate.setDate(startDate.getDate() + 1); - for (let i = 0; i < reqPets.length; i++) { + for (let i = 0; i < reqData.pets.length; i++) { let pet = new Pet({ - name: reqPets[i].name, - kind: reqPets[i].kind, - gender: reqPets[i].gender, + name: reqData.pets[i].name, + kind: reqData.pets[i].kind, + gender: reqData.pets[i].gender, imgs : images[i], - user: mongoose.Types.ObjectId(userId), + user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) From 8211b0315134abb0c18684bcbd045ea6af6100bf Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 16:58:48 +0900 Subject: [PATCH 114/168] =?UTF-8?q?refactor=20:=20statusCode=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 1 + src/api/controller/rainbowController.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 74ce366..55f1b3a 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -17,6 +17,7 @@ module.exports = { //const test = JSON.parse(reqData.pets) console.log('reqData : '+reqData.pets) console.log('userId : '+reqData.userId) + console.log('reqData solve:'+JSON.stringify(reqData.pets)) //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { diff --git a/src/api/controller/rainbowController.ts b/src/api/controller/rainbowController.ts index d52b60e..b141eb6 100644 --- a/src/api/controller/rainbowController.ts +++ b/src/api/controller/rainbowController.ts @@ -51,7 +51,7 @@ module.exports = { const petId = req.params.petId try { const result = await rainbowService.getReadyPartingPetComment(petId) - return res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)) } catch (err) { console.error(err) return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)) From f5c6b13e94c4ee0d8de39c8e2115d9a95e014fd9 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 17:20:55 +0900 Subject: [PATCH 115/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=AC=B4=EC=A7=80=EA=B0=9C=20=EB=8B=A4?= =?UTF-8?q?=EB=A6=AC=20=EB=A9=98=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 2 +- src/dto/rainbow/partingDto/PartingRainbowResDto.ts | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 838b161..40fd392 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -160,7 +160,7 @@ module.exports = { user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length) - return new PartingRainbowResDto(diaryCount, findPet.name) + return new PartingRainbowResDto(diaryCount, findPet) } catch (err) { throw err } diff --git a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts index 056ae47..ca520c9 100644 --- a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts +++ b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts @@ -1,9 +1,14 @@ +import { IPet } from "../../../interfaces/pet/IPet" + export class PartingRainbowResDto{ public partingRainbowBridge = { - contents : "" + contents : "", + diaryCount : 0, } - constructor(diaryCount : Number, petName : String){ - this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.` + constructor(diaryCount : number, pet : IPet){ + let petName = pet.kind == 1 ? "고양이" : "강아지" + this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.diaryCount = diaryCount } } \ No newline at end of file From 4f8e88891c39214d9ffec49bca4e9e3d3c0be158 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 17:43:36 +0900 Subject: [PATCH 116/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 2 ++ dist/api/controller/petController.js.map | 2 +- dist/api/controller/rainbowController.js | 2 +- dist/api/controller/rainbowController.js.map | 2 +- dist/api/service/petService.js | 2 +- dist/api/service/petService.js.map | 2 +- dist/api/service/rainbowService.js | 2 +- dist/api/service/rainbowService.js.map | 2 +- dist/dto/rainbow/partingDto/PartingRainbowResDto.js | 9 ++++++--- dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map | 2 +- src/api/controller/petController.ts | 3 ++- src/api/service/petService.ts | 2 +- 12 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index fc8b086..ab71268 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -24,6 +24,8 @@ module.exports = { //const test = JSON.parse(reqData.pets) console.log('reqData : ' + reqData.pets); console.log('userId : ' + reqData.userId); + console.log('pets : ' + reqData.pets[0]); + console.log('reqData index : ' + reqData.pets[0].name); //console.log('reqData2 : '+typeof(test)) console.log('images : ' + images); try { diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 592f224..84b0ce3 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,mDAAmD;QACnD,yCAAyC;QACzC,qCAAqC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,mDAAmD;QACnD,yCAAyC;QACzC,qCAAqC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACpD,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/controller/rainbowController.js b/dist/api/controller/rainbowController.js index 3b03054..2951a35 100644 --- a/dist/api/controller/rainbowController.js +++ b/dist/api/controller/rainbowController.js @@ -59,7 +59,7 @@ module.exports = { const petId = req.params.petId; try { const result = yield rainbowService.getReadyPartingPetComment(petId); - return res.status(statusCode.OK).send(util.success(statusCode.INTERNAL_SERVER_ERROR, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_READY_PARTING_PET_COMMENT, result)); } catch (err) { console.error(err); diff --git a/dist/api/controller/rainbowController.js.map b/dist/api/controller/rainbowController.js.map index e9ccae1..452df0d 100644 --- a/dist/api/controller/rainbowController.js.map +++ b/dist/api/controller/rainbowController.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowController.js","sourceRoot":"","sources":["../../../src/api/controller/rainbowController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowController.js","sourceRoot":"","sources":["../../../src/api/controller/rainbowController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 0b9eb16..90c536d 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -26,7 +26,7 @@ module.exports = { // const userId = JSON.parse(reqData.userId) // const reqPets = JSON.parse(reqData.pets) //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) - console.log('@@@@@@@@@@@@ : ' + reqData[0].name); + console.log('@@@@@@@@@@@@ : ' + reqData.pets[0].name); //console.log('############# : '+reqData[1].name) console.log('$$$$$$$$$$$$ : ' + reqData.pets.length); try { diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 2800c1a..26e54bd 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 48b44d2..e9890ec 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -155,7 +155,7 @@ module.exports = { // for() let diaryCount = 0; user.book.tableContents.firstPartTableContents.forEach(tableContent => diaryCount += tableContent.petDiary.length); - return new PartingRainbowResDto_1.PartingRainbowResDto(diaryCount, findPet.name); + return new PartingRainbowResDto_1.PartingRainbowResDto(diaryCount, findPet); } catch (err) { throw err; diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index ca84ee2..e5b6f3b 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,+FAAuH;AACvH,iEAAwC;AACxC,gFAA6F;AAC7F,+DAAsC;AAEtC,4FAAwF;AACxF,uIAAmJ;AACnJ,+GAAsF;AACtF,+GAAsF;AAEtF,iFAAwD;AACxD,gGAA6J;AAC7J,0EAAsE;AAGtE,sGAAkG;AAClG,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,IAAI,qBAAqB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAE5D,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,8BAA8B,CAAC,CAAA;AACvC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAChC,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAEpC,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAClD,IAAI,EAAE,MAAM;aACf,CAAC,CAAC,QAAQ,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE;wBACN,IAAI,EAAE,wBAAwB;wBAC9B,QAAQ,EAAE;4BACN,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACN,IAAI,EAAE,aAAa;6BACtB;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnD,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC5D,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAA;YACxG,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAA;YAEjF,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAChE,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CACnD,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CACrC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAE,aAAa,CAAC,CAAA;YAClD,4CAA4C;YAE5C,IAAI,cAAc,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrB,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YACtE,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3B,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC/D,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;iBAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,IAAI,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBACzE,IAAI,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBAE1E,IAAI,uBAAuB,IAAI,wBAAwB,EAAE;oBACrD,OAAO,uBAAuB,IAAI,wBAAwB,EAAE;wBACxD,IAAI,wBAAwB,IAAI,uBAAuB,EAAE;4BACrD,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;yBACzE;6BAAM;4BACH,MAAM;yBACT;qBACJ;iBACJ;gBACD,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAA;gBACrF,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC,CAAA;aACzF;iBAAM,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAClC,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;YACD,qBAAqB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;YAEjD,YAAY;YACZ,MAAM,KAAK,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,kCAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YAE1D,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAEzC,OAAO,qBAAqB,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,KAAK,CAAA;SACd;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,SAAS,SAAS,CAAC,IAAY;YAC3B,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;oBACtB,OAAO,GAAG,IAAI,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;QACD,SAAS,YAAY,CAAC,IAAY;YAC9B,IAAI,KAAK,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE;oBACvB,KAAK,GAAG,KAAK,CAAA;iBAChB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC,CAAA;IAED,SAAS,EAAE,GAAS,EAAE;QAClB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC;gBACxC,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA,EAAE,CAAA,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAC/F,IAAI,kCAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;YAE9B,OAAO,gBAAgB,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,oBAAoB,EAAE,CAAO,KAAK,EAAE,EAAE;QAClC,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;YACtB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,QAAQ;YAER,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,OAAO,IAAI,2CAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;SACvB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,yBAAyB,EAAE,CAAO,KAAK,EAAE,EAAE;QACvC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC3C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YACrB,MAAM,QAAQ,GAAG,IAAI,iDAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAC/B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE7D,OAAO,IAAI,mEAAgC,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;SACjF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACtC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,MAAM,oBAAoB,GAAG,IAAI,iDAA2B,CAAC,GAAG,CAAC,CAAA;YAEjE,MAAM,eAAe,GAAG,EAAE,CAAA;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,CAAC,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC7L,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC7B;qBAAM;oBACH,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAChC;aACJ;YAED,MAAM,oBAAoB,GAAG,IAAI,0CAAoB,EAAE,CAAA;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAI,YAAY;gBACxC,sFAAsF;gBACtF,IAAK,iBAAiB,GAAG;oBACrB,QAAQ,EAAG,EAAE;oBACb,OAAO,EAAG,IAAI;oBACd,aAAa,EAAG,IAAI;iBACvB,CAAA;gBACD,IAAG,CAAC,IAAE,CAAC,EAAC;oBACJ,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBACjF;qBAAK,IAAG,CAAC,IAAE,CAAC,EAAC;oBACV,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBAClF;qBAAK,IAAG,CAAC,IAAE,CAAC,EAAC;oBACV,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,aAAa,EAAE,CAAA;iBAC3E;qBAAK,IAAG,CAAC,IAAE,CAAC,EAAC;oBACV,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;iBAClF;qBAAK,IAAG,CAAC,IAAE,CAAC,EAAC;oBACV,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,aAAa,EAAE,CAAA;iBAC3E;qBAAK,IAAG,CAAC,IAAE,CAAC,EAAC;oBACV,iBAAiB,CAAC,QAAQ,GAAG,MAAM,qBAAqB,CAAC,aAAa,EAAE,CAAA;iBAC3E;gBACD,IAAI,aAAa,GAAG,IAAI,CAAA;gBACxB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACP,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;oBACvB,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAClG;qBAAM;oBACH,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;oBACvB,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBACnG;gBACD,oBAAoB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBACpD,oBAAoB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;aACrE;YAED,OAAO,oBAAoB,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;QAED,6BAA6B;QAC7B,SAAS,qBAAqB,CAAC,OAAoB;YAC/C,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAC,WAAW,CAAC,CAAA;YACzC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,qBAAqB;oBACzD,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,oCAAoC;oBAC5E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,0BAA0B;gBAC1B,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,aAAa;QACb,SAAS,sBAAsB,CAAC,OAAoB;YAChD,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAC,WAAW,CAAC,CAAA;YACzC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBAClC,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBACtC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC,CAAA;IAED,iBAAiB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC/B,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,6BAAa,CAAC,GAAG,CAAC,CAAA;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,YAAY,EAAE,CAAO,MAAM,EAAE,IAAI,EAAE,EAAE;QACjC,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,OAAO,GAAC,MAAM,CAAC,CAAA;YAC3B,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACxC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,IAAI,CAAC,CAAA;YAC9B,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,CAAC;wBACP,IAAI,EAAE,gDAAgD;qBACzD,CAAC;iBACL,CAAC;aACL,CAAC,CAAA;YACF,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAA;YAE7C,iBAAiB;YACjB,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,MAAM,gCAAgC,GAAG,MAAM,gCAAsB,CAAC,IAAI,EAAE,CAAA,CAAA,8BAA8B;YAE1G,gBAAgB;YAChB,MAAM,kBAAkB,GAAG,IAAI,gCAAsB,CAAC;gBAClD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,qBAAqB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC7D,MAAM,aAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;YAE1E,IAAI,gCAAgC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,IAAI,OAAO,GAAG,CAAC,CAAA;oBACf,MAAM,4BAA4B,GAAG,IAAI,gCAAsB,CAAC;wBAC5D,OAAO;wBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;qBAC7C,CAAC,CAAA;oBACF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC,IAAI,EAAE,CAAA;oBACvE,MAAM,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;oBACvE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;iBACxB;aACJ;YACD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,mBAAmB,EAAC,CAAO,KAAK,EAAC,aAAa,EAAE,EAAE;QAC9C,IAAG;YACC,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,+CAAsB,CAAC,GAAG,EAAC,aAAa,CAAC,CAAA;SACvD;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js index 04fd394..9eb9a59 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js @@ -2,11 +2,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.PartingRainbowResDto = void 0; class PartingRainbowResDto { - constructor(diaryCount, petName) { + constructor(diaryCount, pet) { this.partingRainbowBridge = { - contents: "" + contents: "", + diaryCount: 0, }; - this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${petName}이는(은) 의젓하고 당당한 고양이로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n코봉이가 느꼈던 최고의 순간들을 모아봤어요.`; + let petName = pet.kind == 1 ? "고양이" : "강아지"; + this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.diaryCount = diaryCount; } } exports.PartingRainbowResDto = PartingRainbowResDto; diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map index 69c711b..9820f3b 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;IAK7B,YAAY,UAAmB,EAAE,OAAgB;QAJ1C,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;SAChB,CAAA;QAGG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,OAAO,oKAAoK,CAAA;IAC1P,CAAC;CACJ;AARD,oDAQC"} \ No newline at end of file +{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,UAAmB,EAAE,GAAU;QALpC,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;YACb,UAAU,EAAG,CAAC;SACjB,CAAA;QAGG,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,OAAO,2HAA2H,GAAG,CAAC,IAAI,wBAAwB;YACvQ,IAAI,CAAC,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAA;IACrD,CAAC;CACJ;AAXD,oDAWC"} \ No newline at end of file diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 55f1b3a..ad2a43e 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -17,7 +17,8 @@ module.exports = { //const test = JSON.parse(reqData.pets) console.log('reqData : '+reqData.pets) console.log('userId : '+reqData.userId) - console.log('reqData solve:'+JSON.stringify(reqData.pets)) + console.log('pets : '+reqData.pets[0]) + console.log('reqData index : '+reqData.pets[0].name) //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 3532846..26e5392 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -14,7 +14,7 @@ module.exports = { // const userId = JSON.parse(reqData.userId) // const reqPets = JSON.parse(reqData.pets) //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) - console.log('@@@@@@@@@@@@ : '+reqData[0].name) + console.log('@@@@@@@@@@@@ : '+reqData.pets[0].name) //console.log('############# : '+reqData[1].name) console.log('$$$$$$$$$$$$ : '+reqData.pets.length) try{ From 9e3d946758a64b177fbe913b1cc815a2783a52f7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 19:02:52 +0900 Subject: [PATCH 117/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 11 ++-- dist/api/controller/petController.js.map | 2 +- dist/api/service/rainbowService.js | 49 ++++++++---------- dist/api/service/rainbowService.js.map | 2 +- .../theBestMomentDto/TheBestMomentResDto.js | 12 +++-- .../TheBestMomentResDto.js.map | 2 +- dist/modules/comment.js | 12 ++--- dist/modules/comment.js.map | 2 +- src/api/controller/petController.ts | 11 ++-- src/api/service/rainbowService.ts | 50 +++++++++---------- .../theBestMomentDto/TheBestMomentResDto.ts | 38 +++++++------- src/modules/comment.ts | 12 ++--- 12 files changed, 102 insertions(+), 101 deletions(-) diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index ab71268..697ee33 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -15,17 +15,22 @@ var statusCode = require('../../modules/statusCode'); const petService = require('../service/petService'); module.exports = { registerPet: (req, res) => __awaiter(void 0, void 0, void 0, function* () { - // let reqData=JSON.parse(JSON.stringify(req.body)) + let reqData = JSON.parse(JSON.stringify(req.body)); // console.log('type : '+typeof(reqData)) // console.log('toObject : '+reqData) - const reqData = req.body; + //const reqData = req.body let images = req.files.map(file => file.location); //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) console.log('reqData : ' + reqData.pets); console.log('userId : ' + reqData.userId); console.log('pets : ' + reqData.pets[0]); - console.log('reqData index : ' + reqData.pets[0].name); + console.log('gender : ' + reqData.pets[0].gender); + console.log('kind : ' + reqData.pets[0].kind); + console.log('title : ' + reqData.pets[0].title); + console.log('startDate : ' + reqData.pets[0].startDate); + console.log('11111111111111 : ' + typeof (req.Data.pets[0])); + //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : ' + images); try { diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 84b0ce3..83a9875 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,mDAAmD;QACnD,yCAAyC;QACzC,qCAAqC;QACrC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACxB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACpD,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index e9890ec..02e0ae0 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -24,6 +24,7 @@ const SecondPartTableContent_1 = __importDefault(require("../../models/tableCont const PetEmotions_1 = __importDefault(require("../../models/diary/PetEmotions")); const TheBestMomentResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentResDto"); const PetNameResDto_1 = require("../../dto/rainbow/petDto/PetNameResDto"); +const Comments_1 = __importDefault(require("../../models/etc/Comments")); const TheBestMomentSubResDto_1 = require("../../dto/rainbow/theBestMomentDto/TheBestMomentSubResDto"); var dateMethod = require("../../modules/dateMethod"); var theBestMomentComments = require("../../modules/comment"); @@ -128,7 +129,7 @@ module.exports = { const findUser = yield User_1.default.find().populate({ path: "pets" }); - const rainbowPetResDto = new RainbowPetResDto_1.RainbowPetResDto(findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet))); + const rainbowPetResDto = findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); return rainbowPetResDto; } catch (err) { @@ -213,37 +214,29 @@ module.exports = { } const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(); for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - //const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) - let commentPerFeeling = { - comments: "", - feeling: null, - tableContents: null - }; - if (j == 0) { - commentPerFeeling.comments = yield theBestMomentComments.loveFeeling(pet.name); - } - else if (j == 1) { - commentPerFeeling.comments = yield theBestMomentComments.happyFeeling(pet.name); - } - else if (j == 2) { - commentPerFeeling.comments = yield theBestMomentComments.normalFeeling(); - } - else if (j == 3) { - commentPerFeeling.comments = yield theBestMomentComments.angryFeeling(pet.name); - } - else if (j == 4) { - commentPerFeeling.comments = yield theBestMomentComments.gloomyFeeling(); - } - else if (j == 5) { - commentPerFeeling.comments = yield theBestMomentComments.boringFeeling(); - } + const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); + // let commentPerFeeling ={ + // comments : "", + // feeling : j + // } + // if(j==0){ + // commentPerFeeling.comments = await theBestMomentComments.loveFeeling(pet.name) + // }else if(j==1){ + // commentPerFeeling = await theBestMomentComments.happyFeeling(pet.name) + // }else if(j==2){ + // commentPerFeeling = await theBestMomentComments.normalFeeling() + // }else if(j==3){ + // commentPerFeeling = await theBestMomentComments.angryFeeling(pet.name) + // }else if(j==4){ + // commentPerFeeling = await theBestMomentComments.gloomyFeeling() + // }else if(j==5){ + // commentPerFeeling = await theBestMomentComments.boringFeeling() + // } let theBestMoment = null; if (j < 3) { - console.log('positive'); theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])); } else { - console.log('negative'); theBestMoment = new TheBestMomentResDto_1.TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])); } theBestMomentsResDto.setTheBestMoment(theBestMoment); @@ -259,7 +252,6 @@ module.exports = { if (diaries === null) return null; const diaryLength = diaries.length; - console.log('diaryLength : ' + diaryLength); const theBestMomentDiaries = []; if (diaryLength < 8) { for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 @@ -289,7 +281,6 @@ module.exports = { if (diaries === null) return null; const diaryLength = diaries.length; - console.log('diaryLength : ' + diaryLength); const theBestMomentDiaries = []; if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index e5b6f3b..96574fd 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kEAAyC;AACzC,+FAAuH;AACvH,iEAAwC;AACxC,gFAA2E;AAC3E,+DAAsC;AAEtC,4FAAwF;AACxF,uIAAmJ;AACnJ,+GAAsF;AACtF,+GAAsF;AAEtF,iFAAwD;AACxD,gGAA6J;AAC7J,0EAAsE;AAEtE,yEAAgD;AAChD,sGAAkG;AAClG,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,IAAI,qBAAqB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAE5D,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,8BAA8B,CAAC,CAAA;AACvC,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAChC,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAEpC,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAClD,IAAI,EAAE,MAAM;aACf,CAAC,CAAC,QAAQ,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE;wBACN,IAAI,EAAE,wBAAwB;wBAC9B,QAAQ,EAAE;4BACN,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACN,IAAI,EAAE,aAAa;6BACtB;yBACJ;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YACnD,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC5D,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAA;YACxG,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAA;YAEjF,MAAM,aAAa,GAAG,sBAAsB,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAChE,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CACnD,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CACrC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACrC,CAAA;YACD,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAE,aAAa,CAAC,CAAA;YAClD,4CAA4C;YAE5C,IAAI,cAAc,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrB,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YACtE,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC3B,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;gBAC/D,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;iBAAM,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,IAAI,uBAAuB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBACzE,IAAI,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;gBAE1E,IAAI,uBAAuB,IAAI,wBAAwB,EAAE;oBACrD,OAAO,uBAAuB,IAAI,wBAAwB,EAAE;wBACxD,IAAI,wBAAwB,IAAI,uBAAuB,EAAE;4BACrD,wBAAwB,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;yBACzE;6BAAM;4BACH,MAAM;yBACT;qBACJ;iBACJ;gBACD,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,uBAAuB,CAAC,EAAE,KAAK,CAAC,CAAA;gBACrF,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,wBAAwB,CAAC,EAAE,KAAK,CAAC,CAAA;aACzF;iBAAM,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;gBAClC,cAAc,CAAC,CAAC,CAAC,GAAG,IAAI,sCAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;aAClE;YACD,qBAAqB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;YAEjD,YAAY;YACZ,MAAM,KAAK,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,kCAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YAE1D,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;YAEzC,OAAO,qBAAqB,CAAA;SAC/B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,KAAK,CAAA;SACd;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,SAAS,SAAS,CAAC,IAAY;YAC3B,IAAI,OAAO,GAAG,KAAK,CAAA;YACnB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE;oBACtB,OAAO,GAAG,IAAI,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;QACD,SAAS,YAAY,CAAC,IAAY;YAC9B,IAAI,KAAK,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE;oBACvB,KAAK,GAAG,KAAK,CAAA;iBAChB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QAChB,CAAC;IACL,CAAC,CAAA;IAED,SAAS,EAAE,GAAS,EAAE;QAClB,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,cAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC;gBACxC,IAAI,EAAE,MAAM;aACf,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA,EAAE,CAAA,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAC1E,IAAI,kCAAe,CAAC,GAAG,CAAC,CAAC,CAAA;YAE7B,OAAO,gBAAgB,CAAA;SAC1B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,oBAAoB,EAAE,CAAO,KAAK,EAAE,EAAE;QAClC,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC/C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,GAAG,IAAI,CAAA;YACtB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,QAAQ;YAER,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,OAAO,IAAI,2CAAoB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;SACvD;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACzC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAA;YACvB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;SACvB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,yBAAyB,EAAE,CAAO,KAAK,EAAE,EAAE;QACvC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;gBAC3C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE;oBACN,IAAI,EAAE,MAAM;oBACZ,QAAQ,EAAE;wBACN,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE;4BACN,IAAI,EAAE,wBAAwB;yBACjC;qBACJ;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;YACrB,MAAM,QAAQ,GAAG,IAAI,iDAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAClE,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE/C,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAA;YAC/B,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;YAE7D,OAAO,IAAI,mEAAgC,CAAC,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;SACjF;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,gBAAgB,EAAE,CAAO,MAAM,EAAE,KAAK,EAAE,EAAE;QACtC,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,MAAM,oBAAoB,GAAG,IAAI,iDAA2B,CAAC,GAAG,CAAC,CAAA;YACjE,MAAM,eAAe,GAAG,EAAE,CAAA;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,CAAC,MAAM,qBAAW,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;gBAC7L,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC7B;qBAAM;oBACH,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAChC;aACJ;YAED,MAAM,oBAAoB,GAAG,IAAI,0CAAoB,EAAE,CAAA;YACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,EAAI,YAAY;gBACxC,MAAM,iBAAiB,GAAG,MAAM,kBAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAG,cAAc,EAAG,CAAC,EAAC,CAAC,CAAA;gBAEpF,2BAA2B;gBAC3B,qBAAqB;gBACrB,kBAAkB;gBAClB,IAAI;gBACJ,YAAY;gBACZ,qFAAqF;gBACrF,kBAAkB;gBAClB,6EAA6E;gBAC7E,kBAAkB;gBAClB,sEAAsE;gBACtE,kBAAkB;gBAClB,6EAA6E;gBAC7E,kBAAkB;gBAClB,sEAAsE;gBACtE,kBAAkB;gBAClB,sEAAsE;gBACtE,IAAI;gBAEJ,IAAI,aAAa,GAAG,IAAI,CAAA;gBACxB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACP,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAClG;qBAAM;oBACH,aAAa,GAAG,IAAI,mCAAa,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBACnG;gBACD,oBAAoB,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;gBACpD,oBAAoB,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;aACrE;YAED,OAAO,oBAAoB,CAAA;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;QAED,6BAA6B;QAC7B,SAAS,qBAAqB,CAAC,OAAoB;YAC/C,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,qBAAqB;oBACzD,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,oCAAoC;oBAC5E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,0BAA0B;gBAC1B,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,aAAa;QACb,SAAS,sBAAsB,CAAC,OAAoB;YAChD,IAAI,OAAO,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAA;YAClC,MAAM,oBAAoB,GAAG,EAAE,CAAA;YAC/B,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBAClC,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAChE;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE;oBACtC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAClC;aACJ;iBAAM;gBACH,MAAM,UAAU,GAAG,EAAE,CAAA;gBACrB,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,IAAI,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;oBACxC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;qBACzB;iBACJ;gBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,oBAAoB,CAAC,IAAI,CAAC,IAAI,wCAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;iBAC5E;aACJ;YACD,OAAO,oBAAoB,CAAA;QAC/B,CAAC;QAED,SAAS,eAAe,CAAC,GAAW;YAChC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC,CAAA;IAED,iBAAiB,EAAE,CAAO,KAAK,EAAE,EAAE;QAC/B,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,6BAAa,CAAC,GAAG,CAAC,CAAA;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,YAAY,EAAE,CAAO,MAAM,EAAE,IAAI,EAAE,EAAE;QACjC,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,OAAO,GAAC,MAAM,CAAC,CAAA;YAC3B,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACxC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,IAAI,CAAC,CAAA;YAC9B,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,QAAQ,EAAE,CAAC;wBACP,IAAI,EAAE,gDAAgD;qBACzD,CAAC;iBACL,CAAC;aACL,CAAC,CAAA;YACF,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,IAAI,CAAC,CAAA;YAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAA;YAE7C,iBAAiB;YACjB,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,MAAM,gCAAgC,GAAG,MAAM,gCAAsB,CAAC,IAAI,EAAE,CAAA,CAAA,8BAA8B;YAE1G,gBAAgB;YAChB,MAAM,kBAAkB,GAAG,IAAI,gCAAsB,CAAC;gBAClD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;aAC1B,CAAC,CAAA;YACF,MAAM,qBAAqB,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC7D,MAAM,aAAa,CAAC,uBAAuB,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;YAE1E,IAAI,gCAAgC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBACxB,IAAI,OAAO,GAAG,CAAC,CAAA;oBACf,MAAM,4BAA4B,GAAG,IAAI,gCAAsB,CAAC;wBAC5D,OAAO;wBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;qBAC7C,CAAC,CAAA;oBACF,MAAM,qBAAqB,GAAG,MAAM,4BAA4B,CAAC,IAAI,EAAE,CAAA;oBACvE,MAAM,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;oBACvE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;iBACxB;aACJ;YACD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAA;SACd;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IAED,mBAAmB,EAAC,CAAO,KAAK,EAAC,aAAa,EAAE,EAAE;QAC9C,IAAG;YACC,MAAM,GAAG,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,+CAAsB,CAAC,GAAG,EAAC,aAAa,CAAC,CAAA;SACvD;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js index 34d9312..29f2e40 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -56,11 +56,13 @@ class TheBestMomentDiary { init(diaryPerFeeling) { return __awaiter(this, void 0, void 0, function* () { console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling); - this.chapter = diaryPerFeeling.tableContents.chapter; - this.episode = diaryPerFeeling.episode; - this.title = diaryPerFeeling.title; - this.contents = diaryPerFeeling.contents; - this.date = yield dateMethod.toStringByFormatting(diaryPerFeeling.date); + if (diaryPerFeeling != undefined) { + this.chapter = diaryPerFeeling.tableContents.chapter; + this.episode = diaryPerFeeling.episode; + this.title = diaryPerFeeling.title; + this.contents = diaryPerFeeling.contents; + this.date = yield dateMethod.toStringByFormatting(diaryPerFeeling.date); + } }); } } diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 80d1b6d..7a5877d 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEb,CAAC;IAEf,gBAAgB,CAAC,aAA6B;QAC1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAqC;QACzD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAU;QAHd,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAG,kBAAyC;QAJjE,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA2B;QAN/B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA2B;;YAClC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAC,eAAe,CAAC,CAAA;YAC3D,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;YACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;YACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;YACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAC3E,CAAC;KAAA;CACJ;AAnBD,gDAmBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA0B;QAN9B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,eAAe,CAAC,CAAA;YAC7D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AArBD,gDAqBC"} \ No newline at end of file diff --git a/dist/modules/comment.js b/dist/modules/comment.js index a353d2d..f63ace4 100644 --- a/dist/modules/comment.js +++ b/dist/modules/comment.js @@ -9,23 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; module.exports = { loveFeeling: (name) => __awaiter(this, void 0, void 0, function* () { - const comment = `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. + return `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. ${name}(이)가 사랑을 느꼈던 순간들이예요. ${name}(이)에게 사랑을 알려주셔서 감사합니다.`; }), happyFeeling: (name) => __awaiter(this, void 0, void 0, function* () { - const comment = `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. `; + return `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. `; }), normalFeeling: () => __awaiter(this, void 0, void 0, function* () { - const comment = `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.`; + return `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.`; }), angryFeeling: (name) => __awaiter(this, void 0, void 0, function* () { - const comment = `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.`; + return `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.`; }), gloomyFeeling: () => __awaiter(this, void 0, void 0, function* () { - const comment = `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.`; + return `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.`; }), boringFeeling: () => __awaiter(this, void 0, void 0, function* () { - const comment = `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.`; + return `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.`; }) }; //# sourceMappingURL=comment.js.map \ No newline at end of file diff --git a/dist/modules/comment.js.map b/dist/modules/comment.js.map index 89378c3..2d2ca60 100644 --- a/dist/modules/comment.js.map +++ b/dist/modules/comment.js.map @@ -1 +1 @@ -{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../src/modules/comment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,IAAY,EAAE,EAAE;QAChC,MAAM,OAAO,GAAG,cAAc,IAAI;UAChC,IAAI,wBAAwB,IAAI,wBAAwB,CAAA;IAC9D,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,kCAAkC,IAAI,+CAA+C,IAAI,oBAAoB,CAAA;IACjI,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,2DAA2D,CAAA;IAC/E,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,0DAA0D,IAAI,uCAAuC,CAAA;IACzH,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,4DAA4D,CAAA;IAChF,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,MAAM,OAAO,GAAG,yEAAyE,CAAA;IAC7F,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"comment.js","sourceRoot":"","sources":["../../src/modules/comment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,IAAY,EAAE,EAAE;QAChC,OAAO,cAAc,IAAI;UACvB,IAAI,wBAAwB,IAAI,wBAAwB,CAAA;IAC9D,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,OAAO,kCAAkC,IAAI,+CAA+C,IAAI,oBAAoB,CAAA;IACxH,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,OAAO,2DAA2D,CAAA;IACtE,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,IAAY,EAAE,EAAE;QACjC,OAAO,0DAA0D,IAAI,uCAAuC,CAAA;IAChH,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,OAAO,4DAA4D,CAAA;IACvE,CAAC,CAAA;IACD,aAAa,EAAE,GAAS,EAAE;QACtB,OAAO,yEAAyE,CAAA;IACpF,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index ad2a43e..4f21f66 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -8,17 +8,22 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { - // let reqData=JSON.parse(JSON.stringify(req.body)) + let reqData=JSON.parse(JSON.stringify(req.body)) // console.log('type : '+typeof(reqData)) // console.log('toObject : '+reqData) - const reqData = req.body + //const reqData = req.body let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) console.log('reqData : '+reqData.pets) console.log('userId : '+reqData.userId) console.log('pets : '+reqData.pets[0]) - console.log('reqData index : '+reqData.pets[0].name) + console.log('gender : '+reqData.pets[0].gender) + console.log('kind : '+reqData.pets[0].kind) + console.log('title : '+reqData.pets[0].title) + console.log('startDate : '+reqData.pets[0].startDate) + console.log('11111111111111 : '+typeof(req.Data.pets[0])) + //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) try { diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 40fd392..138c374 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,7 +1,7 @@ import User from "../../models/user/User" import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" -import { MyPetInfoResDto, RainbowPetResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" +import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" import { IPet } from "../../interfaces/pet/IPet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" @@ -128,8 +128,8 @@ module.exports = { const findUser = await User.find().populate({ path: "pets" }) - const rainbowPetResDto = new RainbowPetResDto(findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => - new MyPetInfoResDto(pet))) + const rainbowPetResDto = findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => + new MyPetInfoResDto(pet)) return rainbowPetResDto } catch (err) { @@ -210,7 +210,6 @@ module.exports = { try { const pet = await Pet.findById(petId) const TheBestMomentPetInfo = new TheBestMomentPetInformation(pet) - const diaryPerFeeling = [] for (let i = 0; i < 6; i++) { const diaries = (await PetEmotions.find({ "feeling": { $eq: i } }).select("petDiary").populate({ path: "petDiary", populate: ({ path: "tableContents" }) })).map(emotion => emotion.petDiary) @@ -223,31 +222,30 @@ module.exports = { const theBestMomentsResDto = new TheBestMomentsResDto() for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - //const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) - let commentPerFeeling = { - comments : "", - feeling : null, - tableContents : null - } - if(j==0){ - commentPerFeeling.comments = await theBestMomentComments.loveFeeling(pet.name) - }else if(j==1){ - commentPerFeeling.comments = await theBestMomentComments.happyFeeling(pet.name) - }else if(j==2){ - commentPerFeeling.comments = await theBestMomentComments.normalFeeling() - }else if(j==3){ - commentPerFeeling.comments = await theBestMomentComments.angryFeeling(pet.name) - }else if(j==4){ - commentPerFeeling.comments = await theBestMomentComments.gloomyFeeling() - }else if(j==5){ - commentPerFeeling.comments = await theBestMomentComments.boringFeeling() - } + const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) + + // let commentPerFeeling ={ + // comments : "", + // feeling : j + // } + // if(j==0){ + // commentPerFeeling.comments = await theBestMomentComments.loveFeeling(pet.name) + // }else if(j==1){ + // commentPerFeeling = await theBestMomentComments.happyFeeling(pet.name) + // }else if(j==2){ + // commentPerFeeling = await theBestMomentComments.normalFeeling() + // }else if(j==3){ + // commentPerFeeling = await theBestMomentComments.angryFeeling(pet.name) + // }else if(j==4){ + // commentPerFeeling = await theBestMomentComments.gloomyFeeling() + // }else if(j==5){ + // commentPerFeeling = await theBestMomentComments.boringFeeling() + // } + let theBestMoment = null if (j < 3) { - console.log('positive') theBestMoment = new TheBestMoment(commentPerFeeling, getPositiveRadomDiary(diaryPerFeeling[j])) } else { - console.log('negative') theBestMoment = new TheBestMoment(commentPerFeeling, getNegativeRandomDiary(diaryPerFeeling[j])) } theBestMomentsResDto.setTheBestMoment(theBestMoment) @@ -263,7 +261,6 @@ module.exports = { function getPositiveRadomDiary(diaries: IPetDiary[]) { if (diaries === null) return null const diaryLength = diaries.length - console.log('diaryLength : '+diaryLength) const theBestMomentDiaries = [] if (diaryLength < 8) { for (let i = 0; i < diaryLength; i++) { //가지고 있는 일기 갯수만큼만 넣는다 @@ -292,7 +289,6 @@ module.exports = { function getNegativeRandomDiary(diaries: IPetDiary[]) { if (diaries === null) return null const diaryLength = diaries.length - console.log('diaryLength : '+diaryLength) const theBestMomentDiaries = [] if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index c2d750b..cb84a58 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -3,60 +3,62 @@ import { IComments } from "../../../interfaces/etc/IComments" import { IPet } from "../../../interfaces/pet/IPet" const dateMethod = require("../../../modules/dateMethod") -export class TheBestMomentsResDto{ +export class TheBestMomentsResDto { private pet = {} private theBestMoments = [] - constructor(){} + constructor() { } - setTheBestMoment(theBestMoment : TheBestMoment){ + setTheBestMoment(theBestMoment: TheBestMoment) { this.theBestMoments.push(theBestMoment) } - - setTheBestMomentPetInfo(petInfo : TheBestMomentPetInformation){ + + setTheBestMomentPetInfo(petInfo: TheBestMomentPetInformation) { this.pet = petInfo } } -export class TheBestMomentPetInformation{ +export class TheBestMomentPetInformation { private name = null private kind = null - constructor(pet : IPet){ + constructor(pet: IPet) { this.name = pet.name this.kind = pet.kind } } -export class TheBestMoment{ //[사랑],[기쁨],[보통] +export class TheBestMoment { //[사랑],[기쁨],[보통] private comment = null private feeling = null private diaries = [] - constructor(commentPerFeeling , theBestMomentDiary : TheBestMomentDiary[]){ + constructor(commentPerFeeling, theBestMomentDiary: TheBestMomentDiary[]) { this.comment = commentPerFeeling.comments this.feeling = commentPerFeeling.feeling this.diaries = theBestMomentDiary } } -export class TheBestMomentDiary{ +export class TheBestMomentDiary { private chapter = null private episode = null private title = null private contents = null private date = null - constructor(diaryPerFeeling : IPetDiary){ + constructor(diaryPerFeeling: IPetDiary) { this.init(diaryPerFeeling) } - async init(diaryPerFeeling : IPetDiary){ - console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : '+diaryPerFeeling) - this.chapter = diaryPerFeeling.tableContents.chapter - this.episode = diaryPerFeeling.episode - this.title = diaryPerFeeling.title - this.contents = diaryPerFeeling.contents - this.date = await dateMethod.toStringByFormatting(diaryPerFeeling.date) + async init(diaryPerFeeling: IPetDiary) { + console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) + if (diaryPerFeeling != undefined) { + this.chapter = diaryPerFeeling.tableContents.chapter + this.episode = diaryPerFeeling.episode + this.title = diaryPerFeeling.title + this.contents = diaryPerFeeling.contents + this.date = await dateMethod.toStringByFormatting(diaryPerFeeling.date) + } } } \ No newline at end of file diff --git a/src/modules/comment.ts b/src/modules/comment.ts index 584b4b8..bb3c18e 100644 --- a/src/modules/comment.ts +++ b/src/modules/comment.ts @@ -1,21 +1,21 @@ module.exports = { loveFeeling: async (name: string) => { - const comment = `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. + return `작가님과 함께하면서 ${name}(이)는 많은 사랑을 받았고, 또 주었어요. ${name}(이)가 사랑을 느꼈던 순간들이예요. ${name}(이)에게 사랑을 알려주셔서 감사합니다.` }, happyFeeling: async (name: string) => { - const comment = `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. ` + return `맛있는 간식을 먹거나 재미있는 놀이를 할 때, 작가님은 ${name}(이)를 행복하게 해주려고 매순간 노력했어요. 이런 작가님과 함께한 매일매일이 ${name}(이)에겐 기쁜 순간이었습니다. ` }, normalFeeling: async () => { - const comment = `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.` + return `매일 색다른 모험을 하지 않아도 좋아요. 평화롭던 보통의 날들도 아름다운 추억으로 여기 남아 있습니다.` }, angryFeeling: async (name: string) => { - const comment = `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.` + return `평화롭고 행복한 날들만이 의미있는 것은 아니죠. 때로는 화도 냈고, 투정도 부렸어요. 그 과정에서 ${name}(이)는 다양한 감정을 배우는 어른 고양이로 성장할 수 있었습니다.` }, gloomyFeeling: async () => { - const comment = `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.` + return `때로는 어두운 그늘에 있던 때도 있었지만, 그 덕분에 강한 햇볕을 피해 감정의 휴식을 취할 수 있었어요.` }, boringFeeling: async () => { - const comment = `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.` + return `매일 즐겁지는 않았지만, 그 덕에 고민 걱정 없는 심심한 날들을 보낼 수도 있었어요. 평화로운 나날들을 선물해주셔서 감사합니다.` } } \ No newline at end of file From b6dd5e13f0d7beebd8877b07abb9d12e7d762fb5 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 19:08:43 +0900 Subject: [PATCH 118/168] =?UTF-8?q?refacotr=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 4f21f66..654257e 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -15,6 +15,7 @@ module.exports = { let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) + console.log('11111111111111 : '+typeof(req.Data.pets[0])) console.log('reqData : '+reqData.pets) console.log('userId : '+reqData.userId) console.log('pets : '+reqData.pets[0]) @@ -22,7 +23,6 @@ module.exports = { console.log('kind : '+reqData.pets[0].kind) console.log('title : '+reqData.pets[0].title) console.log('startDate : '+reqData.pets[0].startDate) - console.log('11111111111111 : '+typeof(req.Data.pets[0])) //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) From 5bc2cdb0d4bc194f71ed581bc1d86aef4410cc30 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 19:09:50 +0900 Subject: [PATCH 119/168] =?UTF-8?q?refacotr=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 2 +- dist/api/controller/petController.js.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 697ee33..ea32ac9 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -22,6 +22,7 @@ module.exports = { let images = req.files.map(file => file.location); //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) + console.log('11111111111111 : ' + typeof (req.Data.pets[0])); console.log('reqData : ' + reqData.pets); console.log('userId : ' + reqData.userId); console.log('pets : ' + reqData.pets[0]); @@ -29,7 +30,6 @@ module.exports = { console.log('kind : ' + reqData.pets[0].kind); console.log('title : ' + reqData.pets[0].title); console.log('startDate : ' + reqData.pets[0].startDate); - console.log('11111111111111 : ' + typeof (req.Data.pets[0])); //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : ' + images); diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 83a9875..e4de1bc 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file From 6e59744b5ef22b51948668f236adc34c88f8147e Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 19:25:42 +0900 Subject: [PATCH 120/168] =?UTF-8?q?refactro=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 654257e..a21346f 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -8,10 +8,11 @@ const petService = require('../service/petService') module.exports = { registerPet: async (req, res) => { - let reqData=JSON.parse(JSON.stringify(req.body)) + //let reqData=JSON.parse(JSON.stringify(req.body)) // console.log('type : '+typeof(reqData)) // console.log('toObject : '+reqData) //const reqData = req.body + let reqData = req.body let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) From 757f819dd2320a38b687674f341e6bf80035d5b8 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 19:40:20 +0900 Subject: [PATCH 121/168] refactro : dist update --- src/api/controller/petController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index a21346f..a95203d 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -16,7 +16,7 @@ module.exports = { let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) - console.log('11111111111111 : '+typeof(req.Data.pets[0])) + console.log('11111111111111 : '+typeof(reqData.pets[0])) console.log('reqData : '+reqData.pets) console.log('userId : '+reqData.userId) console.log('pets : '+reqData.pets[0]) From fac6bc267ae6538ec1e9a667c4b3077aa95ea69d Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 20:02:50 +0900 Subject: [PATCH 122/168] =?UTF-8?q?refactor=20:=20=EB=AA=A9=EC=B0=A8?= =?UTF-8?q?=EB=B3=84=20=EC=9D=BC=EA=B8=B0=20=EC=A1=B0=ED=9A=8C=20=EC=9A=94?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 5 +++-- dist/api/controller/petController.js.map | 2 +- dist/dto/petChapter/PetChapterDiary.js | 3 ++- dist/dto/petChapter/PetChapterDiary.js.map | 2 +- src/dto/petChapter/PetChapterDiary.ts | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index ea32ac9..3ff7ce1 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -15,14 +15,15 @@ var statusCode = require('../../modules/statusCode'); const petService = require('../service/petService'); module.exports = { registerPet: (req, res) => __awaiter(void 0, void 0, void 0, function* () { - let reqData = JSON.parse(JSON.stringify(req.body)); + //let reqData=JSON.parse(JSON.stringify(req.body)) // console.log('type : '+typeof(reqData)) // console.log('toObject : '+reqData) //const reqData = req.body + let reqData = req.body; let images = req.files.map(file => file.location); //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) - console.log('11111111111111 : ' + typeof (req.Data.pets[0])); + console.log('11111111111111 : ' + typeof (reqData.pets[0])); console.log('reqData : ' + reqData.pets); console.log('userId : ' + reqData.userId); console.log('pets : ' + reqData.pets[0]); diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index e4de1bc..3938d7e 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,IAAI,OAAO,GAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;QAChD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACxD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/dto/petChapter/PetChapterDiary.js b/dist/dto/petChapter/PetChapterDiary.js index 5cdaa49..89a081d 100644 --- a/dist/dto/petChapter/PetChapterDiary.js +++ b/dist/dto/petChapter/PetChapterDiary.js @@ -58,7 +58,8 @@ class DiariesResDto { this.feelingCount = diary.petEmotions.length; this.feeling = diary.petEmotions[0].feeling; this.date = diary.date.getDate() + "일"; - this.weekday = week[diary.date.getDate()]; + console.log('요일 : ' + diary.date.getDay()); + this.weekday = week[diary.date.getDay()]; this.kind = diary.pets[0].kind; } setFeeling(petEmotion) { diff --git a/dist/dto/petChapter/PetChapterDiary.js.map b/dist/dto/petChapter/PetChapterDiary.js.map index cfc9675..8280eea 100644 --- a/dist/dto/petChapter/PetChapterDiary.js.map +++ b/dist/dto/petChapter/PetChapterDiary.js.map @@ -1 +1 @@ -{"version":3,"file":"PetChapterDiary.js","sourceRoot":"","sources":["../../../src/dto/petChapter/PetChapterDiary.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"PetChapterDiary.js","sourceRoot":"","sources":["../../../src/dto/petChapter/PetChapterDiary.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/dto/petChapter/PetChapterDiary.ts b/src/dto/petChapter/PetChapterDiary.ts index 5857cc2..f93d361 100644 --- a/src/dto/petChapter/PetChapterDiary.ts +++ b/src/dto/petChapter/PetChapterDiary.ts @@ -63,7 +63,8 @@ export class DiariesResDto{ this.feelingCount=diary.petEmotions.length this.feeling=diary.petEmotions[0].feeling this.date=diary.date.getDate()+"일" - this.weekday= week[diary.date.getDate()] + console.log('요일 : '+diary.date.getDay()) + this.weekday= week[diary.date.getDay()] this.kind=diary.pets[0].kind } setFeeling(petEmotion:Number){ From 5084a1e50fa04218ccba366aedb81a3349ef2457 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 21:08:13 +0900 Subject: [PATCH 123/168] =?UTF-8?q?reafactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=EC=9D=B4=EB=B3=84=EB=8F=99=EB=AC=BC=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 138c374..e5cea81 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,7 +1,7 @@ import User from "../../models/user/User" import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" -import { MyPetInfoResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" +import { MyPetInfoResDto, RainbowPetResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" import { IPet } from "../../interfaces/pet/IPet" import { PartingRainbowResDto } from "../../dto/rainbow/partingDto/PartingRainbowResDto" @@ -128,8 +128,8 @@ module.exports = { const findUser = await User.find().populate({ path: "pets" }) - const rainbowPetResDto = findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => - new MyPetInfoResDto(pet)) + const rainbowPetResDto = new RainbowPetResDto(findUser[0].pets.filter(pet=>!pet.rainbow).map(pet => + new MyPetInfoResDto(pet))) return rainbowPetResDto } catch (err) { From 2a94252ef39e3644e7b67b1cf0252ec6e9bf26b1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 21:09:09 +0900 Subject: [PATCH 124/168] refacotr : dist update --- dist/api/service/rainbowService.js | 2 +- dist/api/service/rainbowService.js.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 02e0ae0..a84e4ae 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -129,7 +129,7 @@ module.exports = { const findUser = yield User_1.default.find().populate({ path: "pets" }); - const rainbowPetResDto = findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet)); + const rainbowPetResDto = new RainbowPetResDto_1.RainbowPetResDto(findUser[0].pets.filter(pet => !pet.rainbow).map(pet => new RainbowPetResDto_1.MyPetInfoResDto(pet))); return rainbowPetResDto; } catch (err) { diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 96574fd..778aa07 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 1a3c12c0dc19c285201af379b5537f00ee6d2cf9 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 21:33:40 +0900 Subject: [PATCH 125/168] =?UTF-8?q?refacotr=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/petService.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 26e5392..454dcd1 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -11,12 +11,16 @@ require("../../models/user/User") require("../../models/pet/Pet") module.exports = { registerPet: async (reqData, images) => { - // const userId = JSON.parse(reqData.userId) - // const reqPets = JSON.parse(reqData.pets) - //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) - console.log('@@@@@@@@@@@@ : '+reqData.pets[0].name) + const {pets, userId} = reqData + + console.log('petstype : '+typeof(pets)) + console.log('pets[0]type : '+typeof(pets[0])) + console.log('pets[0] : '+pets[0]) //console.log('############# : '+reqData[1].name) - console.log('$$$$$$$$$$$$ : '+reqData.pets.length) + console.log('petsLength : '+pets.length) + console.log('petsName : '+pets[0].name) + console.log('petsKind : '+pets[0].kind) + console.log() try{ //error handling const findUser = await User.findById(reqData.userId) From 6d327dc0f02cc704d5555a4dbf4d856e3ca00234 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Thu, 15 Jul 2021 21:34:37 +0900 Subject: [PATCH 126/168] =?UTF-8?q?refacotr=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/petService.js | 13 ++++++++----- dist/api/service/petService.js.map | 2 +- src/api/service/petService.ts | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 90c536d..88c2f61 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -23,12 +23,15 @@ require("../../models/user/User"); require("../../models/pet/Pet"); module.exports = { registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { - // const userId = JSON.parse(reqData.userId) - // const reqPets = JSON.parse(reqData.pets) - //console.log('!!!!!!!!!!!!!!! : '+JSON.stringify(reqPets[0])) - console.log('@@@@@@@@@@@@ : ' + reqData.pets[0].name); + const { pets, userId } = reqData; + console.log('petstype : ' + typeof (pets)); + console.log('pets[0]type : ' + typeof (pets[0])); + console.log('pets[0] : ' + pets[0]); //console.log('############# : '+reqData[1].name) - console.log('$$$$$$$$$$$$ : ' + reqData.pets.length); + console.log('petsLength : ' + pets.length); + console.log('petsName : ' + pets[0].name); + console.log('petsKind : ' + pets[0].kind); + console.log('userId : ' + userId); try { //error handling const findUser = yield User_1.default.findById(reqData.userId); diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 26e54bd..617a3c0 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 454dcd1..4586a6c 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -20,7 +20,7 @@ module.exports = { console.log('petsLength : '+pets.length) console.log('petsName : '+pets[0].name) console.log('petsKind : '+pets[0].kind) - console.log() + console.log('userId : '+userId) try{ //error handling const findUser = await User.findById(reqData.userId) From 45c0e189891fe78acb1effed38c1d8d9dc000683 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 00:01:14 +0900 Subject: [PATCH 127/168] =?UTF-8?q?feat=20:=20=EB=B0=98=EB=A0=A4=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EC=A0=95=EB=B3=B4=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/controller/petController.ts | 25 +++++++++++++------ src/api/router/pet/index.ts | 1 + src/api/service/chapterService.ts | 1 + src/api/service/petService.ts | 17 ++++++++++++- src/dto/petChapter/PetChapterDiary.ts | 1 + src/dto/rainbow/petDto/PetInfoDto.ts | 23 +++++++++++++++++ .../theBestMomentDto/TheBestMomentResDto.ts | 2 +- src/modules/responseMessage.ts | 1 + 8 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 src/dto/rainbow/petDto/PetInfoDto.ts diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index a95203d..c7e1b14 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -7,6 +7,15 @@ const petService = require('../service/petService') module.exports = { + getRegisterPetInfo:async(req,res)=>{ + try{ + const result = await petService.getPetInfo() + return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_PET_INFO,result)) + }catch(error){ + console.error(error) + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR,responseMessage.INTERNAL_SERVER_ERROR)) + } + }, registerPet: async (req, res) => { //let reqData=JSON.parse(JSON.stringify(req.body)) // console.log('type : '+typeof(reqData)) @@ -16,14 +25,14 @@ module.exports = { let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) - console.log('11111111111111 : '+typeof(reqData.pets[0])) - console.log('reqData : '+reqData.pets) - console.log('userId : '+reqData.userId) - console.log('pets : '+reqData.pets[0]) - console.log('gender : '+reqData.pets[0].gender) - console.log('kind : '+reqData.pets[0].kind) - console.log('title : '+reqData.pets[0].title) - console.log('startDate : '+reqData.pets[0].startDate) + // console.log('11111111111111 : '+typeof(reqData.pets[0])) + // console.log('reqData : '+reqData.pets) + // console.log('userId : '+reqData.userId) + // console.log('pets : '+reqData.pets[0]) + // console.log('gender : '+reqData.pets[0].gender) + // console.log('kind : '+reqData.pets[0].kind) + // console.log('title : '+reqData.pets[0].title) + // console.log('startDate : '+reqData.pets[0].startDate) //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : '+images) diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index db46e82..1b57e8b 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -3,6 +3,7 @@ var router = express.Router() var petController = require('../../controller/petController') var upload = require('../../../modules/multer') +router.get('/register/petInfo',petController.getRegisterPetInfo) router.post('/register',upload.array('images',5),petController.registerPet) //register pet //router.post('/register/images',upload.array('images',4),petController.registerPetImg) diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 2f758d5..65aa89d 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -26,6 +26,7 @@ module.exports = { const findFirstTableContents = await FirstPartTableContents.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); //.populate({path:"petDiary",populate:({path:"petEmotions"})}) + console.log('!!!! : '+findFirstTableContents) let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) //월별로 자르기 diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 4586a6c..679599e 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -1,6 +1,7 @@ import { Request, Response, NextFunction } from 'express' import User from '../../models/user/User' import Pet from '../../models/pet/Pet' +import { PetInfoDto, PetsInfoDto } from '../../dto/rainbow/petDto/PetInfoDto' const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') const util = require('../../modules/util') @@ -10,9 +11,23 @@ var mongoose = require('mongoose') require("../../models/user/User") require("../../models/pet/Pet") module.exports = { + getPetInfo:async()=>{ + try{ + const findUser = await User.find().populate({ + path : "pets" + }) + + const findPets = findUser[0].pets + + return new PetsInfoDto(findPets.map( pet => new PetInfoDto(pet))) + + }catch(error){ + throw error + } + }, registerPet: async (reqData, images) => { const {pets, userId} = reqData - + console.log('petstype : '+typeof(pets)) console.log('pets[0]type : '+typeof(pets[0])) console.log('pets[0] : '+pets[0]) diff --git a/src/dto/petChapter/PetChapterDiary.ts b/src/dto/petChapter/PetChapterDiary.ts index f93d361..1e169ac 100644 --- a/src/dto/petChapter/PetChapterDiary.ts +++ b/src/dto/petChapter/PetChapterDiary.ts @@ -55,6 +55,7 @@ export class DiariesResDto{ constructor(diary : IPetDiary){ const week=new Array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'); + console.log('test : '+diary._id) this.diaryId=diary._id this.title=diary.title this.contents=diary.contents diff --git a/src/dto/rainbow/petDto/PetInfoDto.ts b/src/dto/rainbow/petDto/PetInfoDto.ts new file mode 100644 index 0000000..2e73df9 --- /dev/null +++ b/src/dto/rainbow/petDto/PetInfoDto.ts @@ -0,0 +1,23 @@ +import { IPet } from "../../../interfaces/pet/IPet" + +export class PetsInfoDto{ + private pets = [] + + constructor(petInfo : PetInfoDto[]){ + this.pets = petInfo + } +} + +export class PetInfoDto{ + private _id = null + private img = "" + private name = "" + private kind = null + + constructor(pet : IPet){ + this._id = pet._id + this.img = pet.imgs as string + this.name = pet.name as string + this.kind = pet.kind + } +} \ No newline at end of file diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index cb84a58..9c44b07 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -52,7 +52,7 @@ export class TheBestMomentDiary { } async init(diaryPerFeeling: IPetDiary) { - console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) + //console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) if (diaryPerFeeling != undefined) { this.chapter = diaryPerFeeling.tableContents.chapter this.episode = diaryPerFeeling.episode diff --git a/src/modules/responseMessage.ts b/src/modules/responseMessage.ts index ec83671..1629ad5 100644 --- a/src/modules/responseMessage.ts +++ b/src/modules/responseMessage.ts @@ -21,6 +21,7 @@ module.exports = { NO_BOOK:"존재하지 않는 책 id입니다.", NO_DIARY:"존재하지 않는 다이어리 id입니다.", NO_CONTENTS:"존재하지 않는 정보입니다.", + SUCCESS_GET_PET_INFO : "반려동물 정보 리스트 불러오기 성공", SUCCESS_POST_PETDIARY:"반려동물 다이어리 작성 성공", SUCCESS_EDIT_PETDIARY:"반려동물 다이어리 수정 성공", SUCCESS_DELETE_PETDIARY:"반려동물 다이어리 삭제 성공", From 285d008ba400c18d0163fa5f3e79d5d2ffd57fd8 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 00:01:40 +0900 Subject: [PATCH 128/168] =?UTF-8?q?feat=20:=20=EB=B0=98=EB=A0=A4=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EC=A0=95=EB=B3=B4=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/petController.js | 26 +++++++++++++------ dist/api/controller/petController.js.map | 2 +- dist/api/router/pet/index.js | 1 + dist/api/router/pet/index.js.map | 2 +- dist/api/service/chapterService.js | 1 + dist/api/service/chapterService.js.map | 2 +- dist/api/service/petService.js | 13 ++++++++++ dist/api/service/petService.js.map | 2 +- dist/dto/petChapter/PetChapterDiary.js | 1 + dist/dto/petChapter/PetChapterDiary.js.map | 2 +- dist/dto/rainbow/petDto/PetInfoDto.js | 24 +++++++++++++++++ dist/dto/rainbow/petDto/PetInfoDto.js.map | 1 + .../theBestMomentDto/TheBestMomentResDto.js | 2 +- .../TheBestMomentResDto.js.map | 2 +- dist/modules/responseMessage.js | 1 + dist/modules/responseMessage.js.map | 2 +- 16 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 dist/dto/rainbow/petDto/PetInfoDto.js create mode 100644 dist/dto/rainbow/petDto/PetInfoDto.js.map diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 3ff7ce1..0dc8c6d 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -14,6 +14,16 @@ var responseMessage = require('../../modules/responseMessage'); var statusCode = require('../../modules/statusCode'); const petService = require('../service/petService'); module.exports = { + getRegisterPetInfo: (req, res) => __awaiter(void 0, void 0, void 0, function* () { + try { + const result = yield petService.getPetInfo(); + return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PET_INFO, result)); + } + catch (error) { + console.error(error); + return res.status(statusCode.INTERNAL_SERVER_ERROR).send(util.fail(statusCode.INTERNAL_SERVER_ERROR, responseMessage.INTERNAL_SERVER_ERROR)); + } + }), registerPet: (req, res) => __awaiter(void 0, void 0, void 0, function* () { //let reqData=JSON.parse(JSON.stringify(req.body)) // console.log('type : '+typeof(reqData)) @@ -23,14 +33,14 @@ module.exports = { let images = req.files.map(file => file.location); //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) - console.log('11111111111111 : ' + typeof (reqData.pets[0])); - console.log('reqData : ' + reqData.pets); - console.log('userId : ' + reqData.userId); - console.log('pets : ' + reqData.pets[0]); - console.log('gender : ' + reqData.pets[0].gender); - console.log('kind : ' + reqData.pets[0].kind); - console.log('title : ' + reqData.pets[0].title); - console.log('startDate : ' + reqData.pets[0].startDate); + // console.log('11111111111111 : '+typeof(reqData.pets[0])) + // console.log('reqData : '+reqData.pets) + // console.log('userId : '+reqData.userId) + // console.log('pets : '+reqData.pets[0]) + // console.log('gender : '+reqData.pets[0].gender) + // console.log('kind : '+reqData.pets[0].kind) + // console.log('title : '+reqData.pets[0].title) + // console.log('startDate : '+reqData.pets[0].startDate) //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) console.log('images : ' + images); diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 3938d7e..6e2a139 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACxD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACvC,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC/C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QACrD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC/B,IAAG;YACC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,oBAAoB,EAAC,MAAM,CAAC,CAAC,CAAA;SACjH;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC9I;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,2DAA2D;QAC3D,yCAAyC;QACzC,0CAA0C;QAC1C,yCAAyC;QACzC,kDAAkD;QAClD,8CAA8C;QAC9C,gDAAgD;QAChD,wDAAwD;QACxD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js index 1197f80..bef64de 100644 --- a/dist/api/router/pet/index.js +++ b/dist/api/router/pet/index.js @@ -2,6 +2,7 @@ var express = require('express'); var router = express.Router(); var petController = require('../../controller/petController'); var upload = require('../../../modules/multer'); +router.get('/register/petInfo', petController.getRegisterPetInfo); router.post('/register', upload.array('images', 5), petController.registerPet); //register pet //router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index 09478a4..32ab98a 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAC1F,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAChE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAC1F,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/chapterService.js b/dist/api/service/chapterService.js index 448962e..9f6419b 100644 --- a/dist/api/service/chapterService.js +++ b/dist/api/service/chapterService.js @@ -33,6 +33,7 @@ module.exports = { //챕터 id로 1부 목차 const findFirstTableContents = yield FirstPartTableContents_1.default.findById(chapterId).populate({ path: "petDiary", populate: ({ path: "petEmotions pets" }) }); //.populate({path:"petDiary",populate:({path:"petEmotions"})}) + console.log('!!!! : ' + findFirstTableContents); let newChapterDiary = new PetChapterDiary_1.PetChapterDiaryResDto(findFirstTableContents); //월별로 자르기 for (let m = 12; m >= 1; m--) { diff --git a/dist/api/service/chapterService.js.map b/dist/api/service/chapterService.js.map index e4bad19..e363b68 100644 --- a/dist/api/service/chapterService.js.map +++ b/dist/api/service/chapterService.js.map @@ -1 +1 @@ -{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 88c2f61..625422a 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); const User_1 = __importDefault(require("../../models/user/User")); const Pet_1 = __importDefault(require("../../models/pet/Pet")); +const PetInfoDto_1 = require("../../dto/rainbow/petDto/PetInfoDto"); const responseMessage = require('../../modules/responseMessage'); const statusCode = require('../../modules/statusCode'); const util = require('../../modules/util'); @@ -22,6 +23,18 @@ var mongoose = require('mongoose'); require("../../models/user/User"); require("../../models/pet/Pet"); module.exports = { + getPetInfo: () => __awaiter(void 0, void 0, void 0, function* () { + try { + const findUser = yield User_1.default.find().populate({ + path: "pets" + }); + const findPets = findUser[0].pets; + return new PetInfoDto_1.PetsInfoDto(findPets.map(pet => new PetInfoDto_1.PetInfoDto(pet))); + } + catch (error) { + throw error; + } + }), registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { const { pets, userId } = reqData; console.log('petstype : ' + typeof (pets)); diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 617a3c0..31f19c1 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petChapter/PetChapterDiary.js b/dist/dto/petChapter/PetChapterDiary.js index 89a081d..4d46a3e 100644 --- a/dist/dto/petChapter/PetChapterDiary.js +++ b/dist/dto/petChapter/PetChapterDiary.js @@ -50,6 +50,7 @@ class DiariesResDto { this.weekday = null; this.kind = null; const week = new Array('일요일', '월요일', '화요일', '수요일', '목요일', '금요일', '토요일'); + console.log('test : ' + diary._id); this.diaryId = diary._id; this.title = diary.title; this.contents = diary.contents; diff --git a/dist/dto/petChapter/PetChapterDiary.js.map b/dist/dto/petChapter/PetChapterDiary.js.map index 8280eea..d6e92e2 100644 --- a/dist/dto/petChapter/PetChapterDiary.js.map +++ b/dist/dto/petChapter/PetChapterDiary.js.map @@ -1 +1 @@ -{"version":3,"file":"PetChapterDiary.js","sourceRoot":"","sources":["../../../src/dto/petChapter/PetChapterDiary.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"PetChapterDiary.js","sourceRoot":"","sources":["../../../src/dto/petChapter/PetChapterDiary.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/PetInfoDto.js b/dist/dto/rainbow/petDto/PetInfoDto.js new file mode 100644 index 0000000..708c1f9 --- /dev/null +++ b/dist/dto/rainbow/petDto/PetInfoDto.js @@ -0,0 +1,24 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.PetInfoDto = exports.PetsInfoDto = void 0; +class PetsInfoDto { + constructor(petInfo) { + this.pets = []; + this.pets = petInfo; + } +} +exports.PetsInfoDto = PetsInfoDto; +class PetInfoDto { + constructor(pet) { + this._id = null; + this.img = ""; + this.name = ""; + this.kind = null; + this._id = pet._id; + this.img = pet.imgs; + this.name = pet.name; + this.kind = pet.kind; + } +} +exports.PetInfoDto = PetInfoDto; +//# sourceMappingURL=PetInfoDto.js.map \ No newline at end of file diff --git a/dist/dto/rainbow/petDto/PetInfoDto.js.map b/dist/dto/rainbow/petDto/PetInfoDto.js.map new file mode 100644 index 0000000..82a783c --- /dev/null +++ b/dist/dto/rainbow/petDto/PetInfoDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"PetInfoDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/petDto/PetInfoDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,WAAW;IAGpB,YAAY,OAAsB;QAF1B,SAAI,GAAG,EAAE,CAAA;QAGb,IAAI,CAAC,IAAI,GAAG,OAAO,CAAA;IACvB,CAAC;CACJ;AAND,kCAMC;AAED,MAAa,UAAU;IAMpB,YAAY,GAAU;QALd,QAAG,GAAG,IAAI,CAAA;QACV,QAAG,GAAG,EAAE,CAAA;QACR,SAAI,GAAG,EAAE,CAAA;QACT,SAAI,GAAI,IAAI,CAAA;QAGhB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAA;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAc,CAAA;QAC7B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAc,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACH;AAZD,gCAYC"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js index 29f2e40..0835bc4 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -55,7 +55,7 @@ class TheBestMomentDiary { } init(diaryPerFeeling) { return __awaiter(this, void 0, void 0, function* () { - console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling); + //console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) if (diaryPerFeeling != undefined) { this.chapter = diaryPerFeeling.tableContents.chapter; this.episode = diaryPerFeeling.episode; diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 7a5877d..5261b65 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA0B;QAN9B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,eAAe,CAAC,CAAA;YAC7D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AArBD,gDAqBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA0B;QAN9B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,+DAA+D;YAC/D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AArBD,gDAqBC"} \ No newline at end of file diff --git a/dist/modules/responseMessage.js b/dist/modules/responseMessage.js index 8dabd8e..a5c2b69 100644 --- a/dist/modules/responseMessage.js +++ b/dist/modules/responseMessage.js @@ -18,6 +18,7 @@ module.exports = { NO_BOOK: "존재하지 않는 책 id입니다.", NO_DIARY: "존재하지 않는 다이어리 id입니다.", NO_CONTENTS: "존재하지 않는 정보입니다.", + SUCCESS_GET_PET_INFO: "반려동물 정보 리스트 불러오기 성공", SUCCESS_POST_PETDIARY: "반려동물 다이어리 작성 성공", SUCCESS_EDIT_PETDIARY: "반려동물 다이어리 수정 성공", SUCCESS_DELETE_PETDIARY: "반려동물 다이어리 삭제 성공", diff --git a/dist/modules/responseMessage.js.map b/dist/modules/responseMessage.js.map index 188b349..f5b619e 100644 --- a/dist/modules/responseMessage.js.map +++ b/dist/modules/responseMessage.js.map @@ -1 +1 @@ -{"version":3,"file":"responseMessage.js","sourceRoot":"","sources":["../../src/modules/responseMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,UAAU,EAAE,cAAc;IAC1B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,MAAM;IAEpB,UAAU;IACV,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAC,gBAAgB;IAE3B,SAAS;IACT,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,mBAAmB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,uBAAuB;IAEnC,eAAe;IACf,OAAO,EAAC,kBAAkB;IAC1B,QAAQ,EAAC,qBAAqB;IAC9B,WAAW,EAAC,gBAAgB;IAC5B,qBAAqB,EAAC,iBAAiB;IACvC,qBAAqB,EAAC,iBAAiB;IACvC,uBAAuB,EAAC,iBAAiB;IACzC,4BAA4B,EAAC,gBAAgB;IAC7C,uBAAuB,EAAE,cAAc;IACvC,wBAAwB,EAAE,cAAc;IACxC,wBAAwB,EAAE,cAAc;IACxC,0BAA0B,EAAE,cAAc;IAC1C,oBAAoB,EAAE,YAAY;IAClC,wBAAwB,EAAC,gBAAgB;IACzC,8BAA8B,EAAC,gBAAgB;IAE/C,yBAAyB;IACzB,6BAA6B,EAAG,iBAAiB;IACjD,uBAAuB,EAAG,mBAAmB;IAC7C,+BAA+B,EAAG,wBAAwB;IAC1D,0BAA0B,EAAG,kBAAkB;IAC/C,qCAAqC,EAAG,+BAA+B;IACvE,uBAAuB,EAAG,gBAAgB;IAC1C,2BAA2B,EAAG,mBAAmB;IACjD,qBAAqB,EAAG,wBAAwB;IAChD,4BAA4B,EAAG,iBAAiB;IAEhD,SAAS;IACT,0BAA0B,EAAG,mBAAmB;IAChD,yBAAyB,EAAG,mBAAmB;IAE/C,QAAQ;IACR,iCAAiC,EAAG,kBAAkB;IACtD,8CAA8C,EAAG,mBAAmB;IACpE,oCAAoC,EAAG,mBAAmB;IAC1D,oCAAoC,EAAG,aAAa;IACpD,sCAAsC,EAAE,aAAa;IACrD,yCAAyC,EAAG,aAAa;IACzD,sCAAsC,EAAG,mBAAmB;IAC5D,6BAA6B,EAAC,eAAe;IAC7C,gCAAgC,EAAC,mBAAmB;IACpD,8BAA8B,EAAC,aAAa;IAC5C,8BAA8B,EAAC,aAAa;IAC5C,6BAA6B,EAAC,aAAa;IAC3C,6BAA6B,EAAC,aAAa;IAC3C,uCAAuC,EAAC,aAAa;IACrD,gCAAgC,EAAC,aAAa;IAG9C,UAAU;IACV,qBAAqB,EAAE,UAAU;CACpC,CAAA"} \ No newline at end of file +{"version":3,"file":"responseMessage.js","sourceRoot":"","sources":["../../src/modules/responseMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,UAAU,EAAE,cAAc;IAC1B,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,MAAM;IAEpB,UAAU;IACV,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,UAAU;IACxB,UAAU,EAAE,cAAc;IAC1B,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAC,gBAAgB;IAE3B,SAAS;IACT,eAAe,EAAE,QAAQ;IACzB,YAAY,EAAE,QAAQ;IACtB,OAAO,EAAE,mBAAmB;IAC5B,aAAa,EAAE,iBAAiB;IAChC,UAAU,EAAE,uBAAuB;IAEnC,eAAe;IACf,OAAO,EAAC,kBAAkB;IAC1B,QAAQ,EAAC,qBAAqB;IAC9B,WAAW,EAAC,gBAAgB;IAC5B,oBAAoB,EAAG,qBAAqB;IAC5C,qBAAqB,EAAC,iBAAiB;IACvC,qBAAqB,EAAC,iBAAiB;IACvC,uBAAuB,EAAC,iBAAiB;IACzC,4BAA4B,EAAC,gBAAgB;IAC7C,uBAAuB,EAAE,cAAc;IACvC,wBAAwB,EAAE,cAAc;IACxC,wBAAwB,EAAE,cAAc;IACxC,0BAA0B,EAAE,cAAc;IAC1C,oBAAoB,EAAE,YAAY;IAClC,wBAAwB,EAAC,gBAAgB;IACzC,8BAA8B,EAAC,gBAAgB;IAE/C,yBAAyB;IACzB,6BAA6B,EAAG,iBAAiB;IACjD,uBAAuB,EAAG,mBAAmB;IAC7C,+BAA+B,EAAG,wBAAwB;IAC1D,0BAA0B,EAAG,kBAAkB;IAC/C,qCAAqC,EAAG,+BAA+B;IACvE,uBAAuB,EAAG,gBAAgB;IAC1C,2BAA2B,EAAG,mBAAmB;IACjD,qBAAqB,EAAG,wBAAwB;IAChD,4BAA4B,EAAG,iBAAiB;IAEhD,SAAS;IACT,0BAA0B,EAAG,mBAAmB;IAChD,yBAAyB,EAAG,mBAAmB;IAE/C,QAAQ;IACR,iCAAiC,EAAG,kBAAkB;IACtD,8CAA8C,EAAG,mBAAmB;IACpE,oCAAoC,EAAG,mBAAmB;IAC1D,oCAAoC,EAAG,aAAa;IACpD,sCAAsC,EAAE,aAAa;IACrD,yCAAyC,EAAG,aAAa;IACzD,sCAAsC,EAAG,mBAAmB;IAC5D,6BAA6B,EAAC,eAAe;IAC7C,gCAAgC,EAAC,mBAAmB;IACpD,8BAA8B,EAAC,aAAa;IAC5C,8BAA8B,EAAC,aAAa;IAC5C,6BAA6B,EAAC,aAAa;IAC3C,6BAA6B,EAAC,aAAa;IAC3C,uCAAuC,EAAC,aAAa;IACrD,gCAAgC,EAAC,aAAa;IAG9C,UAAU;IACV,qBAAqB,EAAE,UAAU;CACpC,CAAA"} \ No newline at end of file From 73d736726f03729cc43c768baa4d23a5284d51fc Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 01:03:35 +0900 Subject: [PATCH 129/168] =?UTF-8?q?refacotr=20:=201.5=EB=B6=80=20=ED=99=88?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 25 +++++++++++-------- .../mainPageDto/RainbowMainPageResDto.ts | 20 ++++++++++++++- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index e5cea81..d816267 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -1,5 +1,5 @@ import User from "../../models/user/User" -import { RainbowMainPageResDto, MemoriesResDto, HelpResDto } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" +import { RainbowMainPageResDto, MemoriesResDto, HelpResDto, MemoriesResDto2 } from "../../dto/rainbow/mainPageDto/RainbowMainPageResDto" import Help from "../../models/etc/Help" import { MyPetInfoResDto, RainbowPetResDto } from "../../dto/rainbow/petDto/RainbowPetResDto" import Pet from "../../models/pet/Pet" @@ -59,19 +59,20 @@ module.exports = { tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId)) - ) - console.log('validMemories : '+ validMemories) + )[0] + console.log('validMemories : '+ validMemories) + console.log('!!!!!!!!!!!!!!!!!!!!! : '+validMemories[0]) + console.log('@@@@@@@@@@@@@@@@@@ : '+validMemories[1]) //validMemories : [tableContetns [petDiary]] let memoriesResDto = [null, null] - console.log('validMemoriesLength : '+validMemories.length) + console.log('validMemoriesLength : '+validMemories.length) if (validMemories.length == 2) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[1], petId) + memoriesResDto[0] = new MemoriesResDto(validMemories, petId) + memoriesResDto[1] = new MemoriesResDto(validMemories, petId) } else if (validMemories.length > 2) { let firstTableContentsIndex = await getRandomNumber(validMemories.length) let secondTableContentsIndex = await getRandomNumber(validMemories.length) - if (firstTableContentsIndex == secondTableContentsIndex) { while (firstTableContentsIndex == secondTableContentsIndex) { if (secondTableContentsIndex == firstTableContentsIndex) { @@ -81,10 +82,14 @@ module.exports = { } } } - memoriesResDto[0] = new MemoriesResDto(validMemories[firstTableContentsIndex], petId) - memoriesResDto[1] = new MemoriesResDto(validMemories[secondTableContentsIndex], petId) + console.log('firstTableContentsIndex : '+firstTableContentsIndex) + console.log('secondTableCOntetnsIndex : '+secondTableContentsIndex) + console.log('fisrt : '+validMemories[firstTableContentsIndex]) + console.log('second : '+validMemories[secondTableContentsIndex]) + memoriesResDto[0] = new MemoriesResDto2(validMemories[firstTableContentsIndex], petId) + memoriesResDto[1] = new MemoriesResDto2(validMemories[secondTableContentsIndex], petId) } else if (validMemories.length == 1) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0], petId) + memoriesResDto[0] = new MemoriesResDto(validMemories[0][0], petId) } rainbowMainPageResDto.setMemories(memoriesResDto) diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index d42f52f..9057693 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -18,7 +18,7 @@ export class RainbowMainPageResDto{ this.rainbowMainPage.rainbowCheck = rainbowButtonCheck } - setMemories(memories : MemoriesResDto[]){ + setMemories(memories : MemoriesResDto[] | MemoriesResDto2[]){ this.rainbowMainPage.memories = memories } setHelp(helps : HelpResDto[]){ @@ -36,6 +36,7 @@ export class MemoriesResDto{ constructor(petDiaries : IPetDiary[], petId : IPet){ const diaryIndex = this.getRandomMemoryIndex(petDiaries.length) const randomDiary = petDiaries[diaryIndex] + console.log('ccc : '+petDiaries) console.log('aaaa :'+randomDiary) console.log('bbbb :'+diaryIndex) console.log("랜덤된 petEmotion "+randomDiary.petEmotions.filter(petEmotion => @@ -56,6 +57,23 @@ export class MemoriesResDto{ } } +export class MemoriesResDto2{ + private diaryId; + private title; + private contents; + private date; + private feeling; + + constructor(petDiary : IPetDiary, petId : IPet){ + this.diaryId = petDiary._id + this.title = petDiary.title + this.contents = petDiary.contents + this.date = petDiary.date + this.feeling = petDiary.petEmotions.filter(petEmotions => + petEmotions.pet == petId)[0].feeling + } +} + export class HelpResDto{ private classification; private title; From cc3282e79219b0f3b797337c0c335907c2fa7785 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 01:04:17 +0900 Subject: [PATCH 130/168] refactor : dist update --- dist/api/service/rainbowService.js | 18 ++++++++++++------ dist/api/service/rainbowService.js.map | 2 +- .../mainPageDto/RainbowMainPageResDto.js | 13 ++++++++++++- .../mainPageDto/RainbowMainPageResDto.js.map | 2 +- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index a84e4ae..8ead77b 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -63,14 +63,16 @@ module.exports = { const rainbowButtonCheck = yield rainbowCheck(findUser.pets); const rainbowMainPageResDto = new RainbowMainPageResDto_1.RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck); const firstPartTableContents = findUser.book.tableContents.firstPartTableContents; - const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId))); + const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId)))[0]; console.log('validMemories : ' + validMemories); + console.log('!!!!!!!!!!!!!!!!!!!!! : ' + validMemories[0]); + console.log('@@@@@@@@@@@@@@@@@@ : ' + validMemories[1]); //validMemories : [tableContetns [petDiary]] let memoriesResDto = [null, null]; console.log('validMemoriesLength : ' + validMemories.length); if (validMemories.length == 2) { - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0], petId); - memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[1], petId); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, petId); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, petId); } else if (validMemories.length > 2) { let firstTableContentsIndex = yield getRandomNumber(validMemories.length); @@ -85,11 +87,15 @@ module.exports = { } } } - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[firstTableContentsIndex], petId); - memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[secondTableContentsIndex], petId); + console.log('firstTableContentsIndex : ' + firstTableContentsIndex); + console.log('secondTableCOntetnsIndex : ' + secondTableContentsIndex); + console.log('fisrt : ' + validMemories[firstTableContentsIndex]); + console.log('second : ' + validMemories[secondTableContentsIndex]); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[firstTableContentsIndex], petId); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[secondTableContentsIndex], petId); } else if (validMemories.length == 1) { - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0], petId); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0][0], petId); } rainbowMainPageResDto.setMemories(memoriesResDto); //helpResDto diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 778aa07..9a64283 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js index 04db3a3..55f027e 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.HelpResDto = exports.MemoriesResDto = exports.RainbowMainPageResDto = void 0; +exports.HelpResDto = exports.MemoriesResDto2 = exports.MemoriesResDto = exports.RainbowMainPageResDto = void 0; class RainbowMainPageResDto { constructor(book, isRainbowPet, rainbowButtonCheck) { this.rainbowMainPage = { @@ -26,6 +26,7 @@ class MemoriesResDto { constructor(petDiaries, petId) { const diaryIndex = this.getRandomMemoryIndex(petDiaries.length); const randomDiary = petDiaries[diaryIndex]; + console.log('ccc : ' + petDiaries); console.log('aaaa :' + randomDiary); console.log('bbbb :' + diaryIndex); console.log("랜덤된 petEmotion " + randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]); @@ -42,6 +43,16 @@ class MemoriesResDto { } } exports.MemoriesResDto = MemoriesResDto; +class MemoriesResDto2 { + constructor(petDiary, petId) { + this.diaryId = petDiary._id; + this.title = petDiary.title; + this.contents = petDiary.contents; + this.date = petDiary.date; + this.feeling = petDiary.petEmotions.filter(petEmotions => petEmotions.pet == petId)[0].feeling; + } +} +exports.MemoriesResDto2 = MemoriesResDto2; class HelpResDto { constructor(help) { this.classification = help.classification; diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map index 7120c3a..2acd1c1 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":";;;AAKA,MAAa,qBAAqB;IAS9B,YAAY,IAAY,EAAC,YAAsB,EAAC,kBAA4B;QARrE,oBAAe,GAAG;YACrB,KAAK,EAAG,IAAI;YACZ,OAAO,EAAG,IAAI;YACd,YAAY,EAAG,KAAK;YACpB,QAAQ,EAAG,EAAE;YACb,IAAI,EAAG,EAAE;SACZ,CAAA;QAGG,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA,CAAA,0BAA0B;QAC7F,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxC,IAAI,CAAC,eAAe,CAAC,YAAY,GAAG,kBAAkB,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,QAA2B;QACnC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5C,CAAC;IACD,OAAO,CAAC,KAAoB;QACxB,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;IACrC,CAAC;CACJ;AArBD,sDAqBC;AAED,MAAa,cAAc;IAOvB,YAAY,UAAwB,EAAE,KAAY;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;QAC/D,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,CAAA;QAC1C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,WAAW,CAAC,CAAA;QACjC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAC,UAAU,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACtE,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAA;QAC9B,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAA;QACpC,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACvD,UAAU,CAAC,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IAC3C,CAAC;IAED,oBAAoB,CAAC,GAAY;QAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAC,CAAC,GAAG,GAAC,GAAG,CAAC,CAAC,GAAC,GAAG,CAAC;IACnD,CAAC;CACJ;AA5BD,wCA4BC;AAED,MAAa,UAAU;IAKnB,YAAY,IAAY;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACxB,CAAC;CACJ;AAVD,gCAUC"} \ No newline at end of file +{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file From c4caf8cb4084ed2a5930eb950502ee232d98bdfc Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 01:46:16 +0900 Subject: [PATCH 131/168] =?UTF-8?q?refacotr=20:=20=EB=8F=99=EB=AC=BC?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/petService.js | 1 + dist/api/service/petService.js.map | 2 +- dist/dto/petChapter/ChapterList.js | 5 +++-- dist/dto/petChapter/ChapterList.js.map | 2 +- src/api/service/petService.ts | 2 +- src/dto/petChapter/ChapterList.ts | 5 +++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 625422a..2872eb4 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -28,6 +28,7 @@ module.exports = { const findUser = yield User_1.default.find().populate({ path: "pets" }); + console.log('getPetInfo List'); const findPets = findUser[0].pets; return new PetInfoDto_1.PetsInfoDto(findPets.map(pet => new PetInfoDto_1.PetInfoDto(pet))); } diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 31f19c1..8b25d22 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petChapter/ChapterList.js b/dist/dto/petChapter/ChapterList.js index 2623664..62901c1 100644 --- a/dist/dto/petChapter/ChapterList.js +++ b/dist/dto/petChapter/ChapterList.js @@ -21,11 +21,12 @@ class ChapterResDto { this.chapterId = null; this.chapter = null; this.chapterTitle = null; - this.episodePerchapterCount = null; + this.episodePerchapterCount = 0; this.chapterId = firstPartTableContents._id; this.chapter = firstPartTableContents.chapter; this.chapterTitle = firstPartTableContents.title; - this.episodePerchapterCount; + console.log('!!!! : ' + firstPartTableContents.petDiary.length); + this.episodePerchapterCount = firstPartTableContents.petDiary.length; } } exports.ChapterResDto = ChapterResDto; diff --git a/dist/dto/petChapter/ChapterList.js.map b/dist/dto/petChapter/ChapterList.js.map index 1d79b9f..8273cc7 100644 --- a/dist/dto/petChapter/ChapterList.js.map +++ b/dist/dto/petChapter/ChapterList.js.map @@ -1 +1 @@ -{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAOtB,YAAY,sBAA8C;QAN/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QACjB,2BAAsB,GAAC,IAAI,CAAA;QAIlC,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;QAC9C,IAAI,CAAC,sBAAsB,CAAA;IAC/B,CAAC;CACJ;AAbD,sCAaC"} \ No newline at end of file +{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAOtB,YAAY,sBAA8C;QAN/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QACjB,2BAAsB,GAAC,CAAC,CAAA;QAI/B,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAA;IACxE,CAAC;CACJ;AAdD,sCAcC"} \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 679599e..d42cc09 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -16,7 +16,7 @@ module.exports = { const findUser = await User.find().populate({ path : "pets" }) - + console.log('getPetInfo List') const findPets = findUser[0].pets return new PetsInfoDto(findPets.map( pet => new PetInfoDto(pet))) diff --git a/src/dto/petChapter/ChapterList.ts b/src/dto/petChapter/ChapterList.ts index e504ebc..3f23f5a 100644 --- a/src/dto/petChapter/ChapterList.ts +++ b/src/dto/petChapter/ChapterList.ts @@ -20,14 +20,15 @@ export class ChapterResDto{ public chapterId=null public chapter=null public chapterTitle=null - public episodePerchapterCount=null + public episodePerchapterCount=0 constructor(firstPartTableContents:IFirstPartTableContents){ this.chapterId=firstPartTableContents._id this.chapter=firstPartTableContents.chapter this.chapterTitle=firstPartTableContents.title - this.episodePerchapterCount + console.log('!!!! : '+firstPartTableContents.petDiary.length) + this.episodePerchapterCount = firstPartTableContents.petDiary.length } } From a0891c288f025ecc1f9a6842e0403a786dc59999 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 01:55:40 +0900 Subject: [PATCH 132/168] =?UTF-8?q?refactor=20:=20=EB=AA=A9=EC=B0=A8?= =?UTF-8?q?=EB=B3=84=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20=5Fid?= =?UTF-8?q?=ED=95=84=EB=93=9C=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/dto/petChapter/ChapterList.js | 5 ++--- dist/dto/petChapter/ChapterList.js.map | 2 +- dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js | 2 ++ dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map | 2 +- src/dto/petChapter/ChapterList.ts | 5 ++--- src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dist/dto/petChapter/ChapterList.js b/dist/dto/petChapter/ChapterList.js index 62901c1..2623664 100644 --- a/dist/dto/petChapter/ChapterList.js +++ b/dist/dto/petChapter/ChapterList.js @@ -21,12 +21,11 @@ class ChapterResDto { this.chapterId = null; this.chapter = null; this.chapterTitle = null; - this.episodePerchapterCount = 0; + this.episodePerchapterCount = null; this.chapterId = firstPartTableContents._id; this.chapter = firstPartTableContents.chapter; this.chapterTitle = firstPartTableContents.title; - console.log('!!!! : ' + firstPartTableContents.petDiary.length); - this.episodePerchapterCount = firstPartTableContents.petDiary.length; + this.episodePerchapterCount; } } exports.ChapterResDto = ChapterResDto; diff --git a/dist/dto/petChapter/ChapterList.js.map b/dist/dto/petChapter/ChapterList.js.map index 8273cc7..1d79b9f 100644 --- a/dist/dto/petChapter/ChapterList.js.map +++ b/dist/dto/petChapter/ChapterList.js.map @@ -1 +1 @@ -{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAOtB,YAAY,sBAA8C;QAN/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QACjB,2BAAsB,GAAC,CAAC,CAAA;QAI/B,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;QAC9C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAC7D,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,MAAM,CAAA;IACxE,CAAC;CACJ;AAdD,sCAcC"} \ No newline at end of file +{"version":3,"file":"ChapterList.js","sourceRoot":"","sources":["../../../src/dto/petChapter/ChapterList.ts"],"names":[],"mappings":";;;AAKA,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAa,iBAAiB;IAA9B;QACW,kBAAa,GAAG,EAAG,CAAA;IAI9B,CAAC;IAHG,cAAc,CAAC,OAAqB;QAChC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC;CACJ;AALD,8CAKC;AACD,MAAa,aAAa;IAOtB,YAAY,sBAA8C;QAN/C,cAAS,GAAC,IAAI,CAAA;QACd,YAAO,GAAC,IAAI,CAAA;QACZ,iBAAY,GAAC,IAAI,CAAA;QACjB,2BAAsB,GAAC,IAAI,CAAA;QAIlC,IAAI,CAAC,SAAS,GAAC,sBAAsB,CAAC,GAAG,CAAA;QACzC,IAAI,CAAC,OAAO,GAAC,sBAAsB,CAAC,OAAO,CAAA;QAC3C,IAAI,CAAC,YAAY,GAAC,sBAAsB,CAAC,KAAK,CAAA;QAC9C,IAAI,CAAC,sBAAsB,CAAA;IAC/B,CAAC;CACJ;AAbD,sCAaC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js index b6ff85ef..ccc82c2 100644 --- a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js @@ -27,6 +27,7 @@ class SecondPartDiariesOfMonth { exports.SecondPartDiariesOfMonth = SecondPartDiariesOfMonth; class SecondPartDiaries { constructor(userDiary) { + this.diaryId = null; this.days = null; this.dayOfWeek = null; this.feeling = null; @@ -35,6 +36,7 @@ class SecondPartDiaries { this.contents = null; this.img = null; const weeks = ["일", "월", "화", "수", "목", "금", "토"]; + this.diaryId = userDiary._id; this.days = userDiary.date.getDate(); this.dayOfWeek = weeks[userDiary.date.getDay()]; this.feeling = userDiary.feeling; diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map index 5261b1b..40fc5a3 100644 --- a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"SecondPartDiariesOfMonthResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts"],"names":[],"mappings":";;;AAGA,MAAa,8BAA8B;IAMvC,YAAY,aAAwC,EAAE,yBAAsD;QALpG,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,iBAAY,GAAG,IAAI,CAAA;QACnB,mBAAc,GAAG,EAAE,CAAA;QAGvB,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,KAAK,CAAA;QACvC,IAAI,CAAC,cAAc,GAAG,yBAAyB,CAAA;IACnD,CAAC;CACJ;AAZD,wEAYC;AAED,MAAa,wBAAwB;IAKjC,YAAY,KAAc,EAAE,WAA0B;QAJ9C,UAAK,GAAG,IAAI,CAAA;QACZ,8BAAyB,GAAG,IAAI,CAAA;QAChC,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CACtC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;CACJ;AAZD,4DAYC;AAED,MAAa,iBAAiB;IAS1B,YAAY,SAAsB;QAR1B,SAAI,GAAG,IAAI,CAAA;QACX,cAAS,GAAG,IAAI,CAAA;QAChB,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,QAAG,GAAG,IAAI,CAAA;QAGd,MAAM,KAAK,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,CAAC,CAAA;QAE3C,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CACJ;AApBD,8CAoBC"} \ No newline at end of file +{"version":3,"file":"SecondPartDiariesOfMonthResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts"],"names":[],"mappings":";;;AAGA,MAAa,8BAA8B;IAMvC,YAAY,aAAwC,EAAE,yBAAsD;QALpG,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,iBAAY,GAAG,IAAI,CAAA;QACnB,mBAAc,GAAG,EAAE,CAAA;QAGvB,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,KAAK,CAAA;QACvC,IAAI,CAAC,cAAc,GAAG,yBAAyB,CAAA;IACnD,CAAC;CACJ;AAZD,wEAYC;AAED,MAAa,wBAAwB;IAKjC,YAAY,KAAc,EAAE,WAA0B;QAJ9C,UAAK,GAAG,IAAI,CAAA;QACZ,8BAAyB,GAAG,IAAI,CAAA;QAChC,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CACtC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;CACJ;AAZD,4DAYC;AAED,MAAa,iBAAiB;IAU1B,YAAY,SAAsB;QAT1B,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,cAAS,GAAG,IAAI,CAAA;QAChB,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,QAAG,GAAG,IAAI,CAAA;QAGd,MAAM,KAAK,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CACJ;AArBD,8CAqBC"} \ No newline at end of file diff --git a/src/dto/petChapter/ChapterList.ts b/src/dto/petChapter/ChapterList.ts index 3f23f5a..e504ebc 100644 --- a/src/dto/petChapter/ChapterList.ts +++ b/src/dto/petChapter/ChapterList.ts @@ -20,15 +20,14 @@ export class ChapterResDto{ public chapterId=null public chapter=null public chapterTitle=null - public episodePerchapterCount=0 + public episodePerchapterCount=null constructor(firstPartTableContents:IFirstPartTableContents){ this.chapterId=firstPartTableContents._id this.chapter=firstPartTableContents.chapter this.chapterTitle=firstPartTableContents.title - console.log('!!!! : '+firstPartTableContents.petDiary.length) - this.episodePerchapterCount = firstPartTableContents.petDiary.length + this.episodePerchapterCount } } diff --git a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts index 7a643a9..cbe104c 100644 --- a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts +++ b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts @@ -30,6 +30,7 @@ export class SecondPartDiariesOfMonth{ } export class SecondPartDiaries{ + private diaryId = null private days = null private dayOfWeek = null private feeling = null @@ -40,7 +41,7 @@ export class SecondPartDiaries{ constructor(userDiary : IUserDiary){ const weeks = ["일","월","화","수","목","금","토"] - + this.diaryId = userDiary._id this.days = userDiary.date.getDate() this.dayOfWeek = weeks[userDiary.date.getDay()] this.feeling = userDiary.feeling From b8cdb5652366e0095435367b63986b7e80b0d3bd Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 07:37:40 +0900 Subject: [PATCH 133/168] refactoer : add kind --- src/api/controller/petController.ts | 2 + src/api/service/rainbowService.ts | 17 ++++-- .../mainPageDto/RainbowMainPageResDto.ts | 61 +++++++++++-------- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index c7e1b14..3398459 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -10,6 +10,8 @@ module.exports = { getRegisterPetInfo:async(req,res)=>{ try{ const result = await petService.getPetInfo() + console.log(typeof(statusCode.OK)) + console.log(typeof(statusCode.INTERNAL_SERVER_ERROR)) return res.status(statusCode.OK).send(util.success(statusCode.OK,responseMessage.SUCCESS_GET_PET_INFO,result)) }catch(error){ console.error(error) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index d816267..0ad2479 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -44,12 +44,17 @@ module.exports = { populate: { path: "petDiary", populate: { - path: "petEmotions" + path: "petEmotions", + populate : { + path:"pet" + } } } } } }) + const findPet = await Pet.findById(petId) + const isRainbowPet = await isRainbow(findUser.pets) const rainbowButtonCheck = await rainbowCheck(findUser.pets) const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck) @@ -68,8 +73,8 @@ module.exports = { let memoriesResDto = [null, null] console.log('validMemoriesLength : '+validMemories.length) if (validMemories.length == 2) { - memoriesResDto[0] = new MemoriesResDto(validMemories, petId) - memoriesResDto[1] = new MemoriesResDto(validMemories, petId) + memoriesResDto[0] = new MemoriesResDto(validMemories, findPet) + memoriesResDto[1] = new MemoriesResDto(validMemories, findPet) } else if (validMemories.length > 2) { let firstTableContentsIndex = await getRandomNumber(validMemories.length) let secondTableContentsIndex = await getRandomNumber(validMemories.length) @@ -86,10 +91,10 @@ module.exports = { console.log('secondTableCOntetnsIndex : '+secondTableContentsIndex) console.log('fisrt : '+validMemories[firstTableContentsIndex]) console.log('second : '+validMemories[secondTableContentsIndex]) - memoriesResDto[0] = new MemoriesResDto2(validMemories[firstTableContentsIndex], petId) - memoriesResDto[1] = new MemoriesResDto2(validMemories[secondTableContentsIndex], petId) + memoriesResDto[0] = new MemoriesResDto2(validMemories[firstTableContentsIndex], findPet) + memoriesResDto[1] = new MemoriesResDto2(validMemories[secondTableContentsIndex], findPet) } else if (validMemories.length == 1) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0][0], petId) + memoriesResDto[0] = new MemoriesResDto(validMemories[0][0], findPet) } rainbowMainPageResDto.setMemories(memoriesResDto) diff --git a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts index 9057693..5ca9404 100644 --- a/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts +++ b/src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts @@ -2,44 +2,46 @@ import { IPetDiary } from "../../../interfaces/diary/IPetDiary"; import { IHelp } from "../../../interfaces/etc/IHelp"; import { IPet } from "../../../interfaces/pet/IPet"; import { IBook } from "../../../interfaces/book/IBook"; +import PetEmotions from "../../../models/diary/PetEmotions"; -export class RainbowMainPageResDto{ +export class RainbowMainPageResDto { public rainbowMainPage = { - title : null, - bookImg : null, - rainbowCheck : false, - memories : [], - help : [] + title: null, + bookImg: null, + rainbowCheck: false, + memories: [], + help: [] } - constructor(book : IBook,isRainbowPet : boolean,rainbowButtonCheck : boolean){ + constructor(book: IBook, isRainbowPet: boolean, rainbowButtonCheck: boolean) { this.rainbowMainPage.title = isRainbowPet ? "우리들의 무지개" : "무지개 준비하기"//작가와 무지개다리를 건넌 동물의 이름 합친거 - this.rainbowMainPage.bookImg = book.imgs + this.rainbowMainPage.bookImg = book.imgs this.rainbowMainPage.rainbowCheck = rainbowButtonCheck } - setMemories(memories : MemoriesResDto[] | MemoriesResDto2[]){ + setMemories(memories: MemoriesResDto[] | MemoriesResDto2[]) { this.rainbowMainPage.memories = memories } - setHelp(helps : HelpResDto[]){ + setHelp(helps: HelpResDto[]) { this.rainbowMainPage.help = helps } } -export class MemoriesResDto{ +export class MemoriesResDto { private diaryId; private title; private contents; private date; private feeling; + private kind; - constructor(petDiaries : IPetDiary[], petId : IPet){ + constructor(petDiaries: IPetDiary[], petId: IPet) { const diaryIndex = this.getRandomMemoryIndex(petDiaries.length) const randomDiary = petDiaries[diaryIndex] - console.log('ccc : '+petDiaries) - console.log('aaaa :'+randomDiary) - console.log('bbbb :'+diaryIndex) - console.log("랜덤된 petEmotion "+randomDiary.petEmotions.filter(petEmotion => + console.log('ccc : ' + petDiaries) + console.log('aaaa :' + randomDiary) + console.log('bbbb :' + diaryIndex) + console.log("랜덤된 petEmotion " + randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0]) this.diaryId = randomDiary._id @@ -48,40 +50,49 @@ export class MemoriesResDto{ this.date = randomDiary.date this.feeling = randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0].feeling + this.kind = randomDiary.petEmotions.filter(PetEmotions => + PetEmotions.pet == petId)[0].pet.kind + console.log('kind : ' + randomDiary.petEmotions.filter(PetEmotions => + PetEmotions.pet == petId)[0]) } - getRandomMemoryIndex(max : number){ + getRandomMemoryIndex(max: number) { let min = Math.ceil(0); max = Math.floor(max); - return Math.floor(Math.random()*(max-min))+min; + return Math.floor(Math.random() * (max - min)) + min; } } -export class MemoriesResDto2{ +export class MemoriesResDto2 { private diaryId; private title; private contents; private date; private feeling; + private kind; - constructor(petDiary : IPetDiary, petId : IPet){ + constructor(petDiary: IPetDiary, findPet:IPet) { + console.log('petId : '+findPet) this.diaryId = petDiary._id this.title = petDiary.title this.contents = petDiary.contents this.date = petDiary.date - this.feeling = petDiary.petEmotions.filter(petEmotions => - petEmotions.pet == petId)[0].feeling + console.log('petDiary : '+petDiary) + console.log('pet : '+petDiary.petEmotions.filter(petEmotions => + petEmotions.pet._id == findPet._id)) + this.feeling = petDiary.petEmotions[0].feeling + this.kind = findPet.kind } } -export class HelpResDto{ +export class HelpResDto { private classification; private title; private url; - constructor(help : IHelp){ + constructor(help: IHelp) { this.classification = help.classification; this.title = help.title; - this.url = help.url; + this.url = help.url; } } \ No newline at end of file From d22af42b4b11b4ba7ad64c812d201bae3ea9defe Mon Sep 17 00:00:00 2001 From: sol Date: Fri, 16 Jul 2021 14:02:41 +0900 Subject: [PATCH 134/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=EB=B3=84=20=EC=9D=BC=EA=B8=B0=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/chapterService.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/api/service/chapterService.ts b/src/api/service/chapterService.ts index 65aa89d..80568ba 100644 --- a/src/api/service/chapterService.ts +++ b/src/api/service/chapterService.ts @@ -28,25 +28,27 @@ module.exports = { //.populate({path:"petDiary",populate:({path:"petEmotions"})}) console.log('!!!! : '+findFirstTableContents) let newChapterDiary = new PetChapterDiaryResDto(findFirstTableContents) - + console.log("newchapterDiary",newChapterDiary); //월별로 자르기 - for (let m = 12; m >= 1; m--) { + for (let m = 12; m >0; m--) { let cnt = 0; //1화부터 let monthly = new MonthlyDiaryResDto() - - for (let i = 0; i < findFirstTableContents.petDiary.length; i++) { - - if (m == findFirstTableContents.petDiary[i].date.getMonth()) { + + for (let i = findFirstTableContents.petDiary.length-1; i >=0 ; i--) { + console.log(findFirstTableContents.petDiary[i].date.getMonth()) + if (m == findFirstTableContents.petDiary[i].date.getMonth()+1) { cnt++; + console.log("month",m,findFirstTableContents.petDiary[i]) let newDiary = new DiariesResDto(findFirstTableContents.petDiary[i])//diary monthly.setDiaries(newDiary) + console.log("출력 다이어리 : ",newDiary) //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } } if (cnt == 0) continue monthly.setMonthCount(cnt) - monthly.setMonth(m) + monthly.setMonth(m) newChapterDiary.setMonthly(monthly) } console.log(newChapterDiary) From 9b01a03262de5b2f98fce6a6e3fbd774d62dda18 Mon Sep 17 00:00:00 2001 From: sol Date: Fri, 16 Jul 2021 15:06:33 +0900 Subject: [PATCH 135/168] =?UTF-8?q?refactor:=202=EB=B6=80=20=EB=AA=A9?= =?UTF-8?q?=EC=B0=A8=EB=B3=84=20=EC=9D=BC=EA=B8=B0=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EA=B2=B0=EA=B3=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts index cbe104c..1510478 100644 --- a/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts +++ b/src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts @@ -5,7 +5,7 @@ export class SecondPartDiariesOfMonthResDto{ private _id = null private chapter = null private chapterTitle = null - private diariesOfMonth = [] + private diariesOfMonth = null constructor(tableContents : ISecondPartTableContents, secondPartyDiariesOfMonth : SecondPartDiariesOfMonth[]){ this._id = tableContents._id @@ -23,10 +23,11 @@ export class SecondPartDiariesOfMonth{ constructor(month : number, userDiaries : IUserDiary[]){ this.month = month this.diaryCountOfTableContents = userDiaries.length - this.diaries.push(userDiaries.sort((a,b)=> - b.date.getDate() - a.date.getDate() - ).map(diary=> new SecondPartDiaries(diary))) + this.diaries = userDiaries.sort((a,b)=> + b.date.getDate() - a.date.getDate() + ).map(diary=> new SecondPartDiaries(diary)) } + } export class SecondPartDiaries{ From b4086f8d38a3b681a6d2ba6c294fa6d0426fe7e1 Mon Sep 17 00:00:00 2001 From: sol Date: Fri, 16 Jul 2021 16:30:56 +0900 Subject: [PATCH 136/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EA=B0=84=20=EA=B2=B0=EA=B3=BC=EA=B0=92=20?= =?UTF-8?q?=20=EC=9D=BC=EA=B8=B0ID=20=EC=82=BD=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index 9c44b07..4434263 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -41,6 +41,7 @@ export class TheBestMoment { //[사랑],[기쁨],[보통] } export class TheBestMomentDiary { + private diaryId=null private chapter = null private episode = null private title = null @@ -54,6 +55,7 @@ export class TheBestMomentDiary { async init(diaryPerFeeling: IPetDiary) { //console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) if (diaryPerFeeling != undefined) { + this.diaryId= diaryPerFeeling._id this.chapter = diaryPerFeeling.tableContents.chapter this.episode = diaryPerFeeling.episode this.title = diaryPerFeeling.title From cc3c8fa8a4d76e253161fccf64c7cfed6dd74276 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 16:40:02 +0900 Subject: [PATCH 137/168] =?UTF-8?q?refactor=20:=20post=20method=20?= =?UTF-8?q?=EB=8D=94=EB=AF=B8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/diaryController.js | 4 ++-- dist/api/controller/diaryController.js.map | 2 +- dist/api/controller/petController.js | 8 +++++--- dist/api/controller/petController.js.map | 2 +- dist/api/router/diary/index.js | 2 +- dist/api/router/diary/index.js.map | 2 +- dist/api/router/pet/index.js | 3 ++- dist/api/router/pet/index.js.map | 2 +- dist/api/service/diaryService.js | 6 +++--- dist/api/service/diaryService.js.map | 2 +- dist/api/service/petService.js | 6 +++--- dist/api/service/petService.js.map | 2 +- dist/api/service/rainbowService.js | 16 ++++++++++------ dist/api/service/rainbowService.js.map | 2 +- dist/api/service/secondPartService.js | 2 +- dist/api/service/secondPartService.js.map | 2 +- .../rainbow/mainPageDto/RainbowMainPageResDto.js | 10 ++++++++-- .../mainPageDto/RainbowMainPageResDto.js.map | 2 +- .../ReadyPartingAndStartRecordResDto.js | 1 + .../ReadyPartingAndStartRecordResDto.js.map | 2 +- src/api/controller/diaryController.ts | 4 ++-- src/api/controller/petController.ts | 7 ++++--- src/api/router/diary/index.ts | 2 +- src/api/router/pet/index.ts | 3 ++- src/api/service/diaryService.ts | 6 +++--- src/api/service/petService.ts | 6 +++--- src/api/service/rainbowService.ts | 2 +- src/api/service/secondPartService.ts | 2 +- .../ReadyPartingAndStartRecordResDto.ts | 1 + 29 files changed, 64 insertions(+), 47 deletions(-) diff --git a/dist/api/controller/diaryController.js b/dist/api/controller/diaryController.js index 136eb09..54ce542 100644 --- a/dist/api/controller/diaryController.js +++ b/dist/api/controller/diaryController.js @@ -33,9 +33,9 @@ module.exports = { }), postPetDiary: (req, res) => __awaiter(this, void 0, void 0, function* () { const diaryData = req.body; - const diaryImages = req.files.map(file => file.location); + //const diaryImages = req.files.map(file => file.location) try { - const result = yield diaryService.postPetDiary(diaryData, diaryImages); + const result = yield diaryService.postPetDiary(diaryData); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PETDIARY, "")); } catch (err) { diff --git a/dist/api/controller/diaryController.js.map b/dist/api/controller/diaryController.js.map index b277890..28b22a3 100644 --- a/dist/api/controller/diaryController.js.map +++ b/dist/api/controller/diaryController.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 0dc8c6d..70bc3fa 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -17,6 +17,8 @@ module.exports = { getRegisterPetInfo: (req, res) => __awaiter(void 0, void 0, void 0, function* () { try { const result = yield petService.getPetInfo(); + console.log(typeof (statusCode.OK)); + console.log(typeof (statusCode.INTERNAL_SERVER_ERROR)); return res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_GET_PET_INFO, result)); } catch (error) { @@ -30,7 +32,7 @@ module.exports = { // console.log('toObject : '+reqData) //const reqData = req.body let reqData = req.body; - let images = req.files.map(file => file.location); + //let images = req.files.map(file=>file.location) //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) // console.log('11111111111111 : '+typeof(reqData.pets[0])) @@ -43,9 +45,9 @@ module.exports = { // console.log('startDate : '+reqData.pets[0].startDate) //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) - console.log('images : ' + images); + //console.log('images : '+images) try { - const result = yield petService.registerPet(reqData, images); + const result = yield petService.registerPet(reqData); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)); } catch (err) { diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 6e2a139..05d865d 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC/B,IAAG;YACC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC5C,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,oBAAoB,EAAC,MAAM,CAAC,CAAC,CAAA;SACjH;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC9I;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,IAAI,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAA,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/C,4CAA4C;QAC5C,uCAAuC;QACvC,2DAA2D;QAC3D,yCAAyC;QACzC,0CAA0C;QAC1C,yCAAyC;QACzC,kDAAkD;QAClD,8CAA8C;QAC9C,gDAAgD;QAChD,wDAAwD;QACxD,iEAAiE;QACjE,yCAAyC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7D,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC/B,IAAG;YACC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAA;YACrD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,oBAAoB,EAAC,MAAM,CAAC,CAAC,CAAA;SACjH;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC9I;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,iDAAiD;QAEjD,4CAA4C;QAC5C,uCAAuC;QACvC,2DAA2D;QAC3D,yCAAyC;QACzC,0CAA0C;QAC1C,yCAAyC;QACzC,kDAAkD;QAClD,8CAA8C;QAC9C,gDAAgD;QAChD,wDAAwD;QACxD,iEAAiE;QACjE,yCAAyC;QACzC,iCAAiC;QACjC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file diff --git a/dist/api/router/diary/index.js b/dist/api/router/diary/index.js index 5ef5f6f..8a60f75 100644 --- a/dist/api/router/diary/index.js +++ b/dist/api/router/diary/index.js @@ -3,7 +3,7 @@ var router = express.Router(); var diaryController = require('../../controller/diaryController'); var upload = require('../../../modules/multer'); router.post('/prologue/:userId', diaryController.postPrologue); //1부 프롤로그 작성 -router.post('/pet', upload.array('images', 5), diaryController.postPetDiary); //반려동물 일기 작성 +router.post('/pet', diaryController.postPetDiary); //반려동물 일기 작성 router.get('/pet/:id', diaryController.getPetDiary); //반려동물 일기 상세 조회 router.put('/pet/:id', diaryController.putPetDiary); //반려동물 일기 수정 router.delete('/pet/:id', diaryController.deletePetDiary); //반려동물 일기 삭제 diff --git a/dist/api/router/diary/index.js.map b/dist/api/router/diary/index.js.map index f5a005f..2e8f9ff 100644 --- a/dist/api/router/diary/index.js.map +++ b/dist/api/router/diary/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AACjE,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAC1E,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AACrF,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AACjE,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAC1E,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AAC5D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js b/dist/api/router/pet/index.js index bef64de..84c2cc6 100644 --- a/dist/api/router/pet/index.js +++ b/dist/api/router/pet/index.js @@ -3,7 +3,8 @@ var router = express.Router(); var petController = require('../../controller/petController'); var upload = require('../../../modules/multer'); router.get('/register/petInfo', petController.getRegisterPetInfo); -router.post('/register', upload.array('images', 5), petController.registerPet); //register pet +//router.post('/register',upload.array('images',5),petController.registerPet) //register pet +router.post('/register', petController.registerPet); //router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index 32ab98a..ae0c1ca 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAChE,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA,CAAC,cAAc;AAC1F,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAChE,4FAA4F;AAC5F,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA;AAClD,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index e29dd8a..efa0940 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -38,7 +38,7 @@ module.exports = { console.log('user : ' + user); const setBook = user.book; setBook.title = bookData.title, - setBook.imgs = bookData.imgs, + setBook.imgs = "임시 이미지", setBook.author = bookData.userName; //Create tableContents object const tableContents = new TableContents_1.default(); @@ -94,7 +94,7 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; } }), - postPetDiary: (diaryData, diaryImages) => __awaiter(void 0, void 0, void 0, function* () { + postPetDiary: (diaryData) => __awaiter(void 0, void 0, void 0, function* () { const writeDate = yield new Date(diaryData.date); writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) @@ -104,7 +104,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: diaryImages, + imgs: "임시 이미지", title: diaryData.title, contents: diaryData.contents }); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 85bdedc..2d6e944 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 2872eb4..c592419 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -36,7 +36,7 @@ module.exports = { throw error; } }), - registerPet: (reqData, images) => __awaiter(void 0, void 0, void 0, function* () { + registerPet: (reqData) => __awaiter(void 0, void 0, void 0, function* () { const { pets, userId } = reqData; console.log('petstype : ' + typeof (pets)); console.log('pets[0]type : ' + typeof (pets[0])); @@ -50,7 +50,7 @@ module.exports = { //error handling const findUser = yield User_1.default.findById(reqData.userId); console.log('findUser : ' + findUser); - console.log('image : ' + images[0]); + //console.log('image : '+images[0]) let pets = []; const startDate = new Date(reqData[0].startDate); startDate.setDate(startDate.getDate() + 1); @@ -59,7 +59,7 @@ module.exports = { name: reqData.pets[i].name, kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, - imgs: images[i], + imgs: "asdasd", user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 8b25d22..2eb7f8a 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 8ead77b..71a834d 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -53,12 +53,16 @@ module.exports = { populate: { path: "petDiary", populate: { - path: "petEmotions" + path: "petEmotions", + populate: { + path: "pet" + } } } } } }); + const findPet = yield Pet_1.default.findById(petId); const isRainbowPet = yield isRainbow(findUser.pets); const rainbowButtonCheck = yield rainbowCheck(findUser.pets); const rainbowMainPageResDto = new RainbowMainPageResDto_1.RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck); @@ -71,8 +75,8 @@ module.exports = { let memoriesResDto = [null, null]; console.log('validMemoriesLength : ' + validMemories.length); if (validMemories.length == 2) { - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, petId); - memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, petId); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, findPet); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories, findPet); } else if (validMemories.length > 2) { let firstTableContentsIndex = yield getRandomNumber(validMemories.length); @@ -91,11 +95,11 @@ module.exports = { console.log('secondTableCOntetnsIndex : ' + secondTableContentsIndex); console.log('fisrt : ' + validMemories[firstTableContentsIndex]); console.log('second : ' + validMemories[secondTableContentsIndex]); - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[firstTableContentsIndex], petId); - memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[secondTableContentsIndex], petId); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[firstTableContentsIndex], findPet); + memoriesResDto[1] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[secondTableContentsIndex], findPet); } else if (validMemories.length == 1) { - memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto(validMemories[0][0], petId); + memoriesResDto[0] = new RainbowMainPageResDto_1.MemoriesResDto2(validMemories[0], findPet); } rainbowMainPageResDto.setMemories(memoriesResDto); //helpResDto diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 9a64283..25d7503 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index 726aa0a..95a72cf 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -190,7 +190,7 @@ module.exports = { let newUserDiary = new UserDiary_1.default({ tableContents: diaryData.chapterId, episode: secondPartTableContents.userDiary.length, - imgs: diaryData.diaryImages, + imgs: "더미 이미지", title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index 5d05aae..c8a8bbe 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js index 55f027e..d1690d2 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js @@ -35,6 +35,8 @@ class MemoriesResDto { this.contents = randomDiary.contents; this.date = randomDiary.date; this.feeling = randomDiary.petEmotions.filter(petEmotion => petEmotion.pet == petId)[0].feeling; + this.kind = randomDiary.petEmotions.filter(PetEmotions => PetEmotions.pet == petId)[0].pet.kind; + console.log('kind : ' + randomDiary.petEmotions.filter(PetEmotions => PetEmotions.pet == petId)[0]); } getRandomMemoryIndex(max) { let min = Math.ceil(0); @@ -44,12 +46,16 @@ class MemoriesResDto { } exports.MemoriesResDto = MemoriesResDto; class MemoriesResDto2 { - constructor(petDiary, petId) { + constructor(petDiary, findPet) { + console.log('petId : ' + findPet); this.diaryId = petDiary._id; this.title = petDiary.title; this.contents = petDiary.contents; this.date = petDiary.date; - this.feeling = petDiary.petEmotions.filter(petEmotions => petEmotions.pet == petId)[0].feeling; + console.log('petDiary : ' + petDiary); + console.log('pet : ' + petDiary.petEmotions.filter(petEmotions => petEmotions.pet._id == findPet._id)); + this.feeling = petDiary.petEmotions[0].feeling; + this.kind = findPet.kind; } } exports.MemoriesResDto2 = MemoriesResDto2; diff --git a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map index 2acd1c1..9adcf38 100644 --- a/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map +++ b/dist/dto/rainbow/mainPageDto/RainbowMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RainbowMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/mainPageDto/RainbowMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js index 042ad54..a323730 100644 --- a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js @@ -17,6 +17,7 @@ class BookInfoResDto { this.title = null; this.bookImg = null; this.author = null; + console.log('!!!!! : ' + book); this.title = book.title; this.bookImg = book.imgs; this.author = book.author; diff --git a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map index 2fbb76e..8301faf 100644 --- a/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map +++ b/dist/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"ReadyPartingAndStartRecordResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gCAAgC;IAKzC,YAAY,UAAmB,EAAE,WAAoB,EAAE,QAAyB;QAJhF,eAAU,GAAG,CAAC,CAAC;QACf,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,EAAE,CAAA;QAGT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAVD,4EAUC;AAED,MAAa,cAAc;IAIvB,YAAY,IAAY;QAHxB,UAAK,GAAG,IAAI,CAAC;QACb,YAAO,GAAG,IAAI,CAAC;QACf,WAAM,GAAG,IAAI,CAAC;QAEV,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;IAC7B,CAAC;CACJ;AATD,wCASC"} \ No newline at end of file +{"version":3,"file":"ReadyPartingAndStartRecordResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,gCAAgC;IAKzC,YAAY,UAAmB,EAAE,WAAoB,EAAE,QAAyB;QAJhF,eAAU,GAAG,CAAC,CAAC;QACf,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,EAAE,CAAA;QAGT,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC5B,CAAC;CACJ;AAVD,4EAUC;AAED,MAAa,cAAc;IAIvB,YAAY,IAAY;QAHxB,UAAK,GAAG,IAAI,CAAC;QACb,YAAO,GAAG,IAAI,CAAC;QACf,WAAM,GAAG,IAAI,CAAC;QAEV,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,IAAI,CAAC,CAAA;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;IAC7B,CAAC;CACJ;AAVD,wCAUC"} \ No newline at end of file diff --git a/src/api/controller/diaryController.ts b/src/api/controller/diaryController.ts index df98d84..5afeb0f 100644 --- a/src/api/controller/diaryController.ts +++ b/src/api/controller/diaryController.ts @@ -23,9 +23,9 @@ module.exports = { }, postPetDiary: async (req, res) => { const diaryData = req.body; - const diaryImages = req.files.map(file => file.location) + //const diaryImages = req.files.map(file => file.location) try { - const result = await diaryService.postPetDiary(diaryData, diaryImages) + const result = await diaryService.postPetDiary(diaryData) res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_POST_PETDIARY, "")) } catch (err) { console.error(err) diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 3398459..5de7fcc 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -24,7 +24,8 @@ module.exports = { // console.log('toObject : '+reqData) //const reqData = req.body let reqData = req.body - let images = req.files.map(file=>file.location) + //let images = req.files.map(file=>file.location) + //console.log('reqData : '+ reqData.pets[0]) //const test = JSON.parse(reqData.pets) // console.log('11111111111111 : '+typeof(reqData.pets[0])) @@ -37,9 +38,9 @@ module.exports = { // console.log('startDate : '+reqData.pets[0].startDate) //console.log('reqData index : '+reqData.pets[0].name) //undifned //console.log('reqData2 : '+typeof(test)) - console.log('images : '+images) + //console.log('images : '+images) try { - const result = await petService.registerPet(reqData, images); + const result = await petService.registerPet(reqData); res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET, result)) } catch (err) { if (err.statusCode == null) { diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index 1eb0792..d92a43f 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -4,7 +4,7 @@ var diaryController = require('../../controller/diaryController') var upload = require('../../../modules/multer') router.post('/prologue/:userId',diaryController.postPrologue) //1부 프롤로그 작성 -router.post('/pet',upload.array('images',5),diaryController.postPetDiary)//반려동물 일기 작성 +router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index 1b57e8b..22ef4bf 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -4,7 +4,8 @@ var petController = require('../../controller/petController') var upload = require('../../../modules/multer') router.get('/register/petInfo',petController.getRegisterPetInfo) -router.post('/register',upload.array('images',5),petController.registerPet) //register pet +//router.post('/register',upload.array('images',5),petController.registerPet) //register pet +router.post('/register',petController.registerPet) //router.post('/register/images',upload.array('images',4),petController.registerPetImg) module.exports = router; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index b850cc7..5b2e837 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -27,7 +27,7 @@ module.exports = { console.log('user : ' + user) const setBook = user.book setBook.title = bookData.title, - setBook.imgs = bookData.imgs, + setBook.imgs = "임시 이미지", setBook.author = bookData.userName //Create tableContents object @@ -87,7 +87,7 @@ module.exports = { throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } } }, - postPetDiary: async (diaryData, diaryImages) => { + postPetDiary: async (diaryData) => { const writeDate = await new Date(diaryData.date) writeDate.setDate(writeDate.getDate() + 1); // console.log(FirstPartTableContents.findById(diaryData._id)) @@ -97,7 +97,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: diaryImages, + imgs: "임시 이미지", title: diaryData.title, contents: diaryData.contents diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index d42cc09..ee5eda0 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -25,7 +25,7 @@ module.exports = { throw error } }, - registerPet: async (reqData, images) => { + registerPet: async (reqData) => { const {pets, userId} = reqData console.log('petstype : '+typeof(pets)) @@ -40,7 +40,7 @@ module.exports = { //error handling const findUser = await User.findById(reqData.userId) console.log('findUser : '+findUser) - console.log('image : '+images[0]) + //console.log('image : '+images[0]) let pets=[]; const startDate= new Date(reqData[0].startDate) startDate.setDate(startDate.getDate() + 1); @@ -49,7 +49,7 @@ module.exports = { name: reqData.pets[i].name, kind: reqData.pets[i].kind, gender: reqData.pets[i].gender, - imgs : images[i], + imgs : "asdasd", user: mongoose.Types.ObjectId(reqData.userId), rainbow: false, startDate: new Date(startDate) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 0ad2479..14e05f1 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -94,7 +94,7 @@ module.exports = { memoriesResDto[0] = new MemoriesResDto2(validMemories[firstTableContentsIndex], findPet) memoriesResDto[1] = new MemoriesResDto2(validMemories[secondTableContentsIndex], findPet) } else if (validMemories.length == 1) { - memoriesResDto[0] = new MemoriesResDto(validMemories[0][0], findPet) + memoriesResDto[0] = new MemoriesResDto2(validMemories[0], findPet) } rainbowMainPageResDto.setMemories(memoriesResDto) diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index e110e5b..59192d4 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -204,7 +204,7 @@ module.exports = { let newUserDiary = new UserDiary({ tableContents: diaryData.chapterId, episode: secondPartTableContents.userDiary.length, - imgs: diaryData.diaryImages, + imgs: "더미 이미지", title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling diff --git a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts index 8b39abc..38a394b 100644 --- a/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts +++ b/src/dto/rainbow/readyPartingAndStartRecordDto/ReadyPartingAndStartRecordResDto.ts @@ -17,6 +17,7 @@ export class BookInfoResDto{ bookImg = null; author = null; constructor(book : IBook){ + console.log('!!!!! : '+book) this.title = book.title this.bookImg = book.imgs this.author = book.author From 878ae08e0610b00671099bc75b0eb6d0dc3182b7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 16:41:34 +0900 Subject: [PATCH 138/168] refactor : dist update --- dist/api/service/chapterService.js | 10 +++++++--- dist/api/service/chapterService.js.map | 2 +- .../rainbow/theBestMomentDto/TheBestMomentResDto.js | 2 ++ .../theBestMomentDto/TheBestMomentResDto.js.map | 2 +- dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js | 4 ++-- .../secondPart/SecondPartDiariesOfMonthResDto.js.map | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dist/api/service/chapterService.js b/dist/api/service/chapterService.js index 9f6419b..669a3b7 100644 --- a/dist/api/service/chapterService.js +++ b/dist/api/service/chapterService.js @@ -35,16 +35,20 @@ module.exports = { //.populate({path:"petDiary",populate:({path:"petEmotions"})}) console.log('!!!! : ' + findFirstTableContents); let newChapterDiary = new PetChapterDiary_1.PetChapterDiaryResDto(findFirstTableContents); + console.log("newchapterDiary", newChapterDiary); //월별로 자르기 - for (let m = 12; m >= 1; m--) { + for (let m = 12; m > 0; m--) { let cnt = 0; //1화부터 let monthly = new PetChapterDiary_1.MonthlyDiaryResDto(); - for (let i = 0; i < findFirstTableContents.petDiary.length; i++) { - if (m == findFirstTableContents.petDiary[i].date.getMonth()) { + for (let i = findFirstTableContents.petDiary.length - 1; i >= 0; i--) { + console.log(findFirstTableContents.petDiary[i].date.getMonth()); + if (m == findFirstTableContents.petDiary[i].date.getMonth() + 1) { cnt++; + console.log("month", m, findFirstTableContents.petDiary[i]); let newDiary = new PetChapterDiary_1.DiariesResDto(findFirstTableContents.petDiary[i]); //diary monthly.setDiaries(newDiary); + console.log("출력 다이어리 : ", newDiary); //console.log(findFirstTableContents.petDiary[i].petEmotions[0].feeling) } } diff --git a/dist/api/service/chapterService.js.map b/dist/api/service/chapterService.js.map index e363b68..eebd564 100644 --- a/dist/api/service/chapterService.js.map +++ b/dist/api/service/chapterService.js.map @@ -1 +1 @@ -{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chapterService.js","sourceRoot":"","sources":["../../../src/api/service/chapterService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js index 0835bc4..684d3b8 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -46,6 +46,7 @@ class TheBestMoment { exports.TheBestMoment = TheBestMoment; class TheBestMomentDiary { constructor(diaryPerFeeling) { + this.diaryId = null; this.chapter = null; this.episode = null; this.title = null; @@ -57,6 +58,7 @@ class TheBestMomentDiary { return __awaiter(this, void 0, void 0, function* () { //console.log('!!!!!!!!!!!!!!!!!!!!!!!!! : ' + diaryPerFeeling) if (diaryPerFeeling != undefined) { + this.diaryId = diaryPerFeeling._id; this.chapter = diaryPerFeeling.tableContents.chapter; this.episode = diaryPerFeeling.episode; this.title = diaryPerFeeling.title; diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 5261b65..232e699 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAO3B,YAAY,eAA0B;QAN9B,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,+DAA+D;YAC/D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AArBD,gDAqBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAQ3B,YAAY,eAA0B;QAP9B,YAAO,GAAC,IAAI,CAAA;QACZ,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,+DAA+D;YAC/D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAE,eAAe,CAAC,GAAG,CAAA;gBACjC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AAvBD,gDAuBC"} \ No newline at end of file diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js index ccc82c2..746ceae 100644 --- a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js @@ -6,7 +6,7 @@ class SecondPartDiariesOfMonthResDto { this._id = null; this.chapter = null; this.chapterTitle = null; - this.diariesOfMonth = []; + this.diariesOfMonth = null; this._id = tableContents._id; this.chapter = tableContents.chapter; this.chapterTitle = tableContents.title; @@ -21,7 +21,7 @@ class SecondPartDiariesOfMonth { this.diaries = []; this.month = month; this.diaryCountOfTableContents = userDiaries.length; - this.diaries.push(userDiaries.sort((a, b) => b.date.getDate() - a.date.getDate()).map(diary => new SecondPartDiaries(diary))); + this.diaries = userDiaries.sort((a, b) => b.date.getDate() - a.date.getDate()).map(diary => new SecondPartDiaries(diary)); } } exports.SecondPartDiariesOfMonth = SecondPartDiariesOfMonth; diff --git a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map index 40fc5a3..4ac306f 100644 --- a/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map +++ b/dist/dto/secondPart/SecondPartDiariesOfMonthResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"SecondPartDiariesOfMonthResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts"],"names":[],"mappings":";;;AAGA,MAAa,8BAA8B;IAMvC,YAAY,aAAwC,EAAE,yBAAsD;QALpG,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,iBAAY,GAAG,IAAI,CAAA;QACnB,mBAAc,GAAG,EAAE,CAAA;QAGvB,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,KAAK,CAAA;QACvC,IAAI,CAAC,cAAc,GAAG,yBAAyB,CAAA;IACnD,CAAC;CACJ;AAZD,wEAYC;AAED,MAAa,wBAAwB;IAKjC,YAAY,KAAc,EAAE,WAA0B;QAJ9C,UAAK,GAAG,IAAI,CAAA;QACZ,8BAAyB,GAAG,IAAI,CAAA;QAChC,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CACtC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;CACJ;AAZD,4DAYC;AAED,MAAa,iBAAiB;IAU1B,YAAY,SAAsB;QAT1B,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,cAAS,GAAG,IAAI,CAAA;QAChB,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,QAAG,GAAG,IAAI,CAAA;QAGd,MAAM,KAAK,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CACJ;AArBD,8CAqBC"} \ No newline at end of file +{"version":3,"file":"SecondPartDiariesOfMonthResDto.js","sourceRoot":"","sources":["../../../src/dto/secondPart/SecondPartDiariesOfMonthResDto.ts"],"names":[],"mappings":";;;AAGA,MAAa,8BAA8B;IAMvC,YAAY,aAAwC,EAAE,yBAAsD;QALpG,QAAG,GAAG,IAAI,CAAA;QACV,YAAO,GAAG,IAAI,CAAA;QACd,iBAAY,GAAG,IAAI,CAAA;QACnB,mBAAc,GAAG,IAAI,CAAA;QAGzB,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;QACpC,IAAI,CAAC,YAAY,GAAG,aAAa,CAAC,KAAK,CAAA;QACvC,IAAI,CAAC,cAAc,GAAG,yBAAyB,CAAA;IACnD,CAAC;CACJ;AAZD,wEAYC;AAED,MAAa,wBAAwB;IAKjC,YAAY,KAAc,EAAE,WAA0B;QAJ9C,UAAK,GAAG,IAAI,CAAA;QACZ,8BAAyB,GAAG,IAAI,CAAA;QAChC,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,yBAAyB,GAAG,WAAW,CAAC,MAAM,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAC,EAAE,CACvC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC,GAAG,CAAC,KAAK,CAAA,EAAE,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAA;IAC3C,CAAC;CAEJ;AAbD,4DAaC;AAED,MAAa,iBAAiB;IAU1B,YAAY,SAAsB;QAT1B,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,cAAS,GAAG,IAAI,CAAA;QAChB,YAAO,GAAG,IAAI,CAAA;QACd,SAAI,GAAG,IAAI,CAAA;QACX,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,QAAG,GAAG,IAAI,CAAA;QAGd,MAAM,KAAK,GAAG,CAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QACpC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;QACb,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;QAClC,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAChC,CAAC;CACJ;AArBD,8CAqBC"} \ No newline at end of file From 2edf882b22a43998add5b234fe0d86f83d432caa Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 16:51:50 +0900 Subject: [PATCH 139/168] =?UTF-8?q?refactor=20:=20imgurl=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/diaryService.ts | 4 ++-- src/api/service/secondPartService.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 5b2e837..204ba2a 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -27,7 +27,7 @@ module.exports = { console.log('user : ' + user) const setBook = user.book setBook.title = bookData.title, - setBook.imgs = "임시 이미지", + setBook.imgs = "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", setBook.author = bookData.userName //Create tableContents object @@ -97,7 +97,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: "임시 이미지", + imgs: "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", title: diaryData.title, contents: diaryData.contents diff --git a/src/api/service/secondPartService.ts b/src/api/service/secondPartService.ts index 59192d4..491159c 100644 --- a/src/api/service/secondPartService.ts +++ b/src/api/service/secondPartService.ts @@ -204,7 +204,7 @@ module.exports = { let newUserDiary = new UserDiary({ tableContents: diaryData.chapterId, episode: secondPartTableContents.userDiary.length, - imgs: "더미 이미지", + imgs: "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling From 1f744d95f00c4e960e595347e8edb2b324426075 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Fri, 16 Jul 2021 17:28:21 +0900 Subject: [PATCH 140/168] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=EB=B7=B0=20=EB=A9=98=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/rainbow/partingDto/PartingRainbowResDto.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts index ca520c9..0f36b35 100644 --- a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts +++ b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts @@ -8,7 +8,7 @@ export class PartingRainbowResDto{ constructor(diaryCount : number, pet : IPet){ let petName = pet.kind == 1 ? "고양이" : "강아지" - this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, this.partingRainbowBridge.diaryCount = diaryCount } -} \ No newline at end of file +} From 02a9f81c4e9df871c05e8807eef718a51bf5a4cb Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 18:12:35 +0900 Subject: [PATCH 141/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=EC=88=9C=EA=B0=84=20=EC=9D=B4=EC=8A=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/rainbowService.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index 14e05f1..aaf6eb9 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -300,6 +300,8 @@ module.exports = { if (diaries === null) return null const diaryLength = diaries.length const theBestMomentDiaries = [] + console.log('부정 일기 길이 : '+diaryLength) + console.log('찾자 diary!!!! : '+diaries) if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { theBestMomentDiaries.push(new TheBestMomentDiary(diaries[i])) @@ -311,6 +313,7 @@ module.exports = { const indexArray = [] while (indexArray.length < 2) { let index = getRandomNumber(diaryLength) + console.log('index!!!! : '+index) if (!indexArray.includes(index)) { indexArray.push(index) } From 96d135539857276482f910b0b4a779ce111e4efc Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 18:13:58 +0900 Subject: [PATCH 142/168] =?UTF-8?q?refactor=20:=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 4 ++-- dist/api/service/diaryService.js.map | 2 +- dist/api/service/rainbowService.js | 3 +++ dist/api/service/rainbowService.js.map | 2 +- dist/api/service/secondPartService.js | 2 +- dist/api/service/secondPartService.js.map | 2 +- dist/dto/rainbow/partingDto/PartingRainbowResDto.js | 2 +- dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index efa0940..39a14a2 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -38,7 +38,7 @@ module.exports = { console.log('user : ' + user); const setBook = user.book; setBook.title = bookData.title, - setBook.imgs = "임시 이미지", + setBook.imgs = "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", setBook.author = bookData.userName; //Create tableContents object const tableContents = new TableContents_1.default(); @@ -104,7 +104,7 @@ module.exports = { tableContents: diaryData._id, episode: temp.petDiary.length, date: writeDate, - imgs: "임시 이미지", + imgs: "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", title: diaryData.title, contents: diaryData.contents }); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 2d6e944..77f2feb 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 71a834d..e38e86b 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -292,6 +292,8 @@ module.exports = { return null; const diaryLength = diaries.length; const theBestMomentDiaries = []; + console.log('부정 일기 길이 : ' + diaryLength); + console.log('찾자 diary!!!! : ' + diaries); if (diaryLength < 2) { for (let i = 0; i < diaryLength; i++) { theBestMomentDiaries.push(new TheBestMomentResDto_1.TheBestMomentDiary(diaries[i])); @@ -304,6 +306,7 @@ module.exports = { const indexArray = []; while (indexArray.length < 2) { let index = getRandomNumber(diaryLength); + console.log('index!!!! : ' + index); if (!indexArray.includes(index)) { indexArray.push(index); } diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 25d7503..9a16651 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/secondPartService.js b/dist/api/service/secondPartService.js index 95a72cf..261c0d8 100644 --- a/dist/api/service/secondPartService.js +++ b/dist/api/service/secondPartService.js @@ -190,7 +190,7 @@ module.exports = { let newUserDiary = new UserDiary_1.default({ tableContents: diaryData.chapterId, episode: secondPartTableContents.userDiary.length, - imgs: "더미 이미지", + imgs: "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", title: diaryData.title, contents: diaryData.contents, feeling: diaryData.feeling diff --git a/dist/api/service/secondPartService.js.map b/dist/api/service/secondPartService.js.map index c8a8bbe..cc9a22f 100644 --- a/dist/api/service/secondPartService.js.map +++ b/dist/api/service/secondPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"secondPartService.js","sourceRoot":"","sources":["../../../src/api/service/secondPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js index 9eb9a59..bf06567 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js @@ -8,7 +8,7 @@ class PartingRainbowResDto { diaryCount: 0, }; let petName = pet.kind == 1 ? "고양이" : "강아지"; - this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, this.partingRainbowBridge.diaryCount = diaryCount; } } diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map index 9820f3b..86df0e4 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,UAAmB,EAAE,GAAU;QALpC,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;YACb,UAAU,EAAG,CAAC;SACjB,CAAA;QAGG,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,OAAO,2HAA2H,GAAG,CAAC,IAAI,wBAAwB;YACvQ,IAAI,CAAC,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAA;IACrD,CAAC;CACJ;AAXD,oDAWC"} \ No newline at end of file +{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,UAAmB,EAAE,GAAU;QALpC,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;YACb,UAAU,EAAG,CAAC;SACjB,CAAA;QAGG,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,OAAO,6HAA6H,GAAG,CAAC,IAAI,wBAAwB;YACzQ,IAAI,CAAC,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAA;IACrD,CAAC;CACJ;AAXD,oDAWC"} \ No newline at end of file From 9087f5b22019c39a670922c564cd127770213ad1 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 19:38:47 +0900 Subject: [PATCH 143/168] =?UTF-8?q?refactor=20:=20=ED=94=84=EB=A1=A4?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=EB=8F=8C=EB=A0=A4=EB=A7=89=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 6 +++++- dist/api/service/diaryService.js.map | 2 +- dist/api/service/rainbowService.js | 1 + dist/api/service/rainbowService.js.map | 2 +- src/api/service/diaryService.ts | 6 +++++- src/api/service/rainbowService.ts | 1 + 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 39a14a2..7de41ef 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -36,6 +36,10 @@ module.exports = { //Create user object const user = yield User_1.default.findById(userId).populate('book'); console.log('user : ' + user); + console.log('userBook : ' + user.book); + if (user.book.title != null) { + throw { statusCode: 404, responseMessage: "이미 책이 존재합니다, 없던일로 하겠습니다. 휴먼" }; + } const setBook = user.book; setBook.title = bookData.title, setBook.imgs = "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", @@ -91,7 +95,7 @@ module.exports = { } catch (err) { console.log(err); - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER }; + throw err; } }), postPetDiary: (diaryData) => __awaiter(void 0, void 0, void 0, function* () { diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 77f2feb..7679428 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index e38e86b..d9e0c92 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -67,6 +67,7 @@ module.exports = { const rainbowButtonCheck = yield rainbowCheck(findUser.pets); const rainbowMainPageResDto = new RainbowMainPageResDto_1.RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck); const firstPartTableContents = findUser.book.tableContents.firstPartTableContents; + console.log('firstPartTableContents : ' + firstPartTableContents); const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => tableContents.petDiary.filter(petDiary => petDiary.pets.includes(petId)))[0]; console.log('validMemories : ' + validMemories); console.log('!!!!!!!!!!!!!!!!!!!!! : ' + validMemories[0]); diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 9a16651..19956e7 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 204ba2a..552066f 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -25,6 +25,10 @@ module.exports = { //Create user object const user = await User.findById(userId).populate('book') console.log('user : ' + user) + console.log('userBook : '+user.book) + if(user.book.title != null){ + throw {statusCode : 404, responseMessage : "이미 책이 존재합니다, 없던일로 하겠습니다. 휴먼"} + } const setBook = user.book setBook.title = bookData.title, setBook.imgs = "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", @@ -84,7 +88,7 @@ module.exports = { //error handling } catch (err) { console.log(err) - throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_USER } + throw err } }, postPetDiary: async (diaryData) => { diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index aaf6eb9..efd76f5 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -59,6 +59,7 @@ module.exports = { const rainbowButtonCheck = await rainbowCheck(findUser.pets) const rainbowMainPageResDto = new RainbowMainPageResDto(findUser.book, isRainbowPet, rainbowButtonCheck) const firstPartTableContents = findUser.book.tableContents.firstPartTableContents + console.log('firstPartTableContents : '+firstPartTableContents) const validMemories = firstPartTableContents.filter(tableContents => tableContents.petDiary.length > 0).map(tableContents => From 1c1d1036efab0fadf45aa095f85d681904af40de Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 19:53:50 +0900 Subject: [PATCH 144/168] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=EB=8B=A4=EB=A6=AC=20=EB=A9=98=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dto/rainbow/partingDto/PartingRainbowResDto.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts index 0f36b35..aa5fbd4 100644 --- a/src/dto/rainbow/partingDto/PartingRainbowResDto.ts +++ b/src/dto/rainbow/partingDto/PartingRainbowResDto.ts @@ -8,7 +8,7 @@ export class PartingRainbowResDto{ constructor(diaryCount : number, pet : IPet){ let petName = pet.kind == 1 ? "고양이" : "강아지" - this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.contents =`작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, this.partingRainbowBridge.diaryCount = diaryCount } } From 6dd05a9cd83f69f81237580522e7f0aba1417b04 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 19:54:29 +0900 Subject: [PATCH 145/168] =?UTF-8?q?refactor=20:=20=EB=AC=B4=EC=A7=80?= =?UTF-8?q?=EA=B0=9C=20=EB=8B=A4=EB=A6=AC=20=EB=A9=98=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/dto/rainbow/partingDto/PartingRainbowResDto.js | 2 +- dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js index bf06567..b686a53 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js @@ -8,7 +8,7 @@ class PartingRainbowResDto { diaryCount: 0, }; let petName = pet.kind == 1 ? "고양이" : "강아지"; - this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}이는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, + this.partingRainbowBridge.contents = `작가님과 함께했던 ${diaryCount}화의 이야기 속에서 \n${pet.name}는(은) 의젓하고 당당한 ${petName}로서 \n행복한 인생을 보낼 수 있었어요. \n그리고 지금은 작가님보다 한 발 앞서서 \n먼저 무지개 다리로 가 친구들과 함께 \n작가님을 기다리기로 했습니다. \n\n그동안 행복한 일상을 선물해주셔서 감사합니다. \n${pet.name}이가 느꼈던 최고의 순간들을 모아봤어요.`, this.partingRainbowBridge.diaryCount = diaryCount; } } diff --git a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map index 86df0e4..bc4ea01 100644 --- a/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map +++ b/dist/dto/rainbow/partingDto/PartingRainbowResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,UAAmB,EAAE,GAAU;QALpC,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;YACb,UAAU,EAAG,CAAC;SACjB,CAAA;QAGG,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,GAAG,CAAC,IAAI,kBAAkB,OAAO,6HAA6H,GAAG,CAAC,IAAI,wBAAwB;YACzQ,IAAI,CAAC,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAA;IACrD,CAAC;CACJ;AAXD,oDAWC"} \ No newline at end of file +{"version":3,"file":"PartingRainbowResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/partingDto/PartingRainbowResDto.ts"],"names":[],"mappings":";;;AAEA,MAAa,oBAAoB;IAM7B,YAAY,UAAmB,EAAE,GAAU;QALpC,yBAAoB,GAAG;YAC1B,QAAQ,EAAG,EAAE;YACb,UAAU,EAAG,CAAC;SACjB,CAAA;QAGG,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,QAAQ,GAAE,aAAa,UAAU,gBAAgB,GAAG,CAAC,IAAI,iBAAiB,OAAO,6HAA6H,GAAG,CAAC,IAAI,wBAAwB;YACxQ,IAAI,CAAC,oBAAoB,CAAC,UAAU,GAAG,UAAU,CAAA;IACrD,CAAC;CACJ;AAXD,oDAWC"} \ No newline at end of file From a76c6951a13d74e202c9bc1ef43395fc75bf0c4c Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 20:21:47 +0900 Subject: [PATCH 146/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EA=B0=84=20=EB=82=A0=EC=A7=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/rainbowService.js | 3 ++- dist/api/service/rainbowService.js.map | 2 +- dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js | 9 ++++++++- .../rainbow/theBestMomentDto/TheBestMomentResDto.js.map | 2 +- src/api/service/rainbowService.ts | 3 ++- src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts | 9 ++++++++- 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index d9e0c92..6538ef5 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -212,6 +212,7 @@ module.exports = { getTheBestMoment: (userId, petId) => __awaiter(void 0, void 0, void 0, function* () { try { const pet = yield Pet_1.default.findById(petId); + const timeTogether = (yield User_1.default.findById(userId).populate('book')).book.date; const TheBestMomentPetInfo = new TheBestMomentResDto_1.TheBestMomentPetInformation(pet); const diaryPerFeeling = []; for (let i = 0; i < 6; i++) { @@ -223,7 +224,7 @@ module.exports = { diaryPerFeeling.push(diaries); } } - const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(); + const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(timeTogether); for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); // let commentPerFeeling ={ diff --git a/dist/api/service/rainbowService.js.map b/dist/api/service/rainbowService.js.map index 19956e7..cfcc844 100644 --- a/dist/api/service/rainbowService.js.map +++ b/dist/api/service/rainbowService.js.map @@ -1 +1 @@ -{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"rainbowService.js","sourceRoot":"","sources":["../../../src/api/service/rainbowService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js index 684d3b8..1b55a62 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js @@ -12,9 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.TheBestMomentDiary = exports.TheBestMoment = exports.TheBestMomentPetInformation = exports.TheBestMomentsResDto = void 0; const dateMethod = require("../../../modules/dateMethod"); class TheBestMomentsResDto { - constructor() { + constructor(timeTogether) { this.pet = {}; this.theBestMoments = []; + this.timeTogether = {}; + this.init(timeTogether); + } + init(timeTogether) { + return __awaiter(this, void 0, void 0, function* () { + this.timeTogether = `${(yield dateMethod.toStringByFormatting(timeTogether))} - ${yield dateMethod.toStringByFormatting(new Date())}`; + }); } setTheBestMoment(theBestMoment) { this.theBestMoments.push(theBestMoment); diff --git a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map index 232e699..940ed30 100644 --- a/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map +++ b/dist/dto/rainbow/theBestMomentDto/TheBestMomentResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAI7B;QAHQ,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;IAEX,CAAC;IAEjB,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AAbD,oDAaC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAQ3B,YAAY,eAA0B;QAP9B,YAAO,GAAC,IAAI,CAAA;QACZ,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,+DAA+D;YAC/D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAE,eAAe,CAAC,GAAG,CAAA;gBACjC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AAvBD,gDAuBC"} \ No newline at end of file +{"version":3,"file":"TheBestMomentResDto.js","sourceRoot":"","sources":["../../../../src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,UAAU,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAEzD,MAAa,oBAAoB;IAK7B,YAAY,YAAmB;QAJvB,QAAG,GAAG,EAAE,CAAA;QACR,mBAAc,GAAG,EAAE,CAAA;QACnB,iBAAY,GAAG,EAAE,CAAA;QAGrB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAC3B,CAAC;IAEK,IAAI,CAAC,YAAmB;;YAC1B,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,UAAU,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,MAAM,MAAM,UAAU,CAAC,oBAAoB,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAA;QACzI,CAAC;KAAA;IAED,gBAAgB,CAAC,aAA4B;QACzC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3C,CAAC;IAED,uBAAuB,CAAC,OAAoC;QACxD,IAAI,CAAC,GAAG,GAAG,OAAO,CAAA;IACtB,CAAC;CACJ;AApBD,oDAoBC;AAED,MAAa,2BAA2B;IAIpC,YAAY,GAAS;QAHb,SAAI,GAAG,IAAI,CAAA;QACX,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACJ;AARD,kEAQC;AAED,MAAa,aAAa;IAKtB,YAAY,iBAAiB,EAAE,kBAAwC;QAJ/D,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAC,OAAO,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAAA;IACrC,CAAC;CACJ;AAVD,sCAUC;AAED,MAAa,kBAAkB;IAQ3B,YAAY,eAA0B;QAP9B,YAAO,GAAC,IAAI,CAAA;QACZ,YAAO,GAAG,IAAI,CAAA;QACd,YAAO,GAAG,IAAI,CAAA;QACd,UAAK,GAAG,IAAI,CAAA;QACZ,aAAQ,GAAG,IAAI,CAAA;QACf,SAAI,GAAG,IAAI,CAAA;QAGf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IAC9B,CAAC;IAEK,IAAI,CAAC,eAA0B;;YACjC,+DAA+D;YAC/D,IAAI,eAAe,IAAI,SAAS,EAAE;gBAC9B,IAAI,CAAC,OAAO,GAAE,eAAe,CAAC,GAAG,CAAA;gBACjC,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAA;gBACpD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAA;gBACtC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAA;gBAClC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;gBACxC,IAAI,CAAC,IAAI,GAAG,MAAM,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;aAC1E;QACL,CAAC;KAAA;CACJ;AAvBD,gDAuBC"} \ No newline at end of file diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index efd76f5..c4fc55f 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -220,6 +220,7 @@ module.exports = { getTheBestMoment: async (userId, petId) => { try { const pet = await Pet.findById(petId) + const timeTogether = (await User.findById(userId).populate('book')).book.date const TheBestMomentPetInfo = new TheBestMomentPetInformation(pet) const diaryPerFeeling = [] for (let i = 0; i < 6; i++) { @@ -231,7 +232,7 @@ module.exports = { } } - const theBestMomentsResDto = new TheBestMomentsResDto() + const theBestMomentsResDto = new TheBestMomentsResDto(timeTogether) for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) diff --git a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts index 4434263..70af85b 100644 --- a/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts +++ b/src/dto/rainbow/theBestMomentDto/TheBestMomentResDto.ts @@ -6,8 +6,15 @@ const dateMethod = require("../../../modules/dateMethod") export class TheBestMomentsResDto { private pet = {} private theBestMoments = [] + private timeTogether = {} - constructor() { } + constructor(timeTogether : Date) { + this.init(timeTogether) + } + + async init(timeTogether : Date){ + this.timeTogether = `${(await dateMethod.toStringByFormatting(timeTogether))} - ${await dateMethod.toStringByFormatting(new Date())}` + } setTheBestMoment(theBestMoment: TheBestMoment) { this.theBestMoments.push(theBestMoment) From 334c2abad3fc6b16a3a48bc40a8942219f6ea1a2 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 21:16:52 +0900 Subject: [PATCH 147/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/service/petService.ts | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index ee5eda0..55efb7a 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -30,27 +30,27 @@ module.exports = { console.log('petstype : '+typeof(pets)) console.log('pets[0]type : '+typeof(pets[0])) - console.log('pets[0] : '+pets[0]) + console.log('pets[0] : '+JSON.stringify(pets[0])) //console.log('############# : '+reqData[1].name) console.log('petsLength : '+pets.length) console.log('petsName : '+pets[0].name) - console.log('petsKind : '+pets[0].kind) + console.log('petsKind : '+pets[0].startDate) console.log('userId : '+userId) try{ //error handling - const findUser = await User.findById(reqData.userId) + const findUser = await User.findById(userId) console.log('findUser : '+findUser) //console.log('image : '+images[0]) - let pets=[]; - const startDate= new Date(reqData[0].startDate) + let petsArr=[]; + const startDate= new Date(pets[0].startDate) startDate.setDate(startDate.getDate() + 1); - for (let i = 0; i < reqData.pets.length; i++) { + for (let i = 0; i < pets.length; i++) { let pet = new Pet({ - name: reqData.pets[i].name, - kind: reqData.pets[i].kind, - gender: reqData.pets[i].gender, - imgs : "asdasd", - user: mongoose.Types.ObjectId(reqData.userId), + name: pets[i].name, + kind: pets[i].kind, + gender: pets[i].gender, + imgs : "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", + user: mongoose.Types.ObjectId(userId), rainbow: false, startDate: new Date(startDate) @@ -60,12 +60,12 @@ module.exports = { }); await pet.save() findUser.pets.push(pet) - pets[i]=pet; + petsArr[i]=pet; } await findUser.save() console.log(reqData); //db save - const saveInfo = pets.map(pet=>pet._id) + const saveInfo = petsArr.map(pet=>pet._id) return saveInfo }catch(err){ console.log(err) From a2ce9586012911c71bba831b82f3bc727507a3ef Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 21:17:21 +0900 Subject: [PATCH 148/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/petService.js | 26 +++++++++++++------------- dist/api/service/petService.js.map | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index c592419..9e36133 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -40,27 +40,27 @@ module.exports = { const { pets, userId } = reqData; console.log('petstype : ' + typeof (pets)); console.log('pets[0]type : ' + typeof (pets[0])); - console.log('pets[0] : ' + pets[0]); + console.log('pets[0] : ' + JSON.stringify(pets[0])); //console.log('############# : '+reqData[1].name) console.log('petsLength : ' + pets.length); console.log('petsName : ' + pets[0].name); - console.log('petsKind : ' + pets[0].kind); + console.log('petsKind : ' + pets[0].startDate); console.log('userId : ' + userId); try { //error handling - const findUser = yield User_1.default.findById(reqData.userId); + const findUser = yield User_1.default.findById(userId); console.log('findUser : ' + findUser); //console.log('image : '+images[0]) - let pets = []; - const startDate = new Date(reqData[0].startDate); + let petsArr = []; + const startDate = new Date(pets[0].startDate); startDate.setDate(startDate.getDate() + 1); - for (let i = 0; i < reqData.pets.length; i++) { + for (let i = 0; i < pets.length; i++) { let pet = new Pet_1.default({ - name: reqData.pets[i].name, - kind: reqData.pets[i].kind, - gender: reqData.pets[i].gender, - imgs: "asdasd", - user: mongoose.Types.ObjectId(reqData.userId), + name: pets[i].name, + kind: pets[i].kind, + gender: pets[i].gender, + imgs: "https://watcha.s3.ap-northeast-2.amazonaws.com/images/origin/%EC%B1%85+%EC%9D%B4%EB%AF%B8%EC%A7%80.jpg", + user: mongoose.Types.ObjectId(userId), rainbow: false, startDate: new Date(startDate) // findUser, UserId만 해서 되면 가능 @@ -69,12 +69,12 @@ module.exports = { }); yield pet.save(); findUser.pets.push(pet); - pets[i] = pet; + petsArr[i] = pet; } yield findUser.save(); console.log(reqData); //db save - const saveInfo = pets.map(pet => pet._id); + const saveInfo = petsArr.map(pet => pet._id); return saveInfo; } catch (err) { diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index 2eb7f8a..a8633dd 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file From 200bbaca17c50e21de616ac7aa7a3eca968062f2 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Fri, 16 Jul 2021 21:32:47 +0900 Subject: [PATCH 149/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/petService.js | 3 ++- dist/api/service/petService.js.map | 2 +- dist/dto/petDiary/SavePetResDto.js | 11 +++++++++++ dist/dto/petDiary/SavePetResDto.js.map | 1 + src/api/service/petService.ts | 3 ++- src/dto/petDiary/SavePetResDto.ts | 7 +++++++ 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 dist/dto/petDiary/SavePetResDto.js create mode 100644 dist/dto/petDiary/SavePetResDto.js.map create mode 100644 src/dto/petDiary/SavePetResDto.ts diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index 9e36133..a9f4628 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const User_1 = __importDefault(require("../../models/user/User")); const Pet_1 = __importDefault(require("../../models/pet/Pet")); const PetInfoDto_1 = require("../../dto/rainbow/petDto/PetInfoDto"); +const SavePetResDto_1 = require("../../dto/petDiary/SavePetResDto"); const responseMessage = require('../../modules/responseMessage'); const statusCode = require('../../modules/statusCode'); const util = require('../../modules/util'); @@ -75,7 +76,7 @@ module.exports = { console.log(reqData); //db save const saveInfo = petsArr.map(pet => pet._id); - return saveInfo; + return new SavePetResDto_1.SavePetResDto(saveInfo); } catch (err) { console.log(err); diff --git a/dist/api/service/petService.js.map b/dist/api/service/petService.js.map index a8633dd..35b35c1 100644 --- a/dist/api/service/petService.js.map +++ b/dist/api/service/petService.js.map @@ -1 +1 @@ -{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"petService.js","sourceRoot":"","sources":["../../../src/api/service/petService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/petDiary/SavePetResDto.js b/dist/dto/petDiary/SavePetResDto.js new file mode 100644 index 0000000..a38ec22 --- /dev/null +++ b/dist/dto/petDiary/SavePetResDto.js @@ -0,0 +1,11 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.SavePetResDto = void 0; +class SavePetResDto { + constructor(petId) { + this.petId = []; + this.petId = petId; + } +} +exports.SavePetResDto = SavePetResDto; +//# sourceMappingURL=SavePetResDto.js.map \ No newline at end of file diff --git a/dist/dto/petDiary/SavePetResDto.js.map b/dist/dto/petDiary/SavePetResDto.js.map new file mode 100644 index 0000000..238b79b --- /dev/null +++ b/dist/dto/petDiary/SavePetResDto.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SavePetResDto.js","sourceRoot":"","sources":["../../../src/dto/petDiary/SavePetResDto.ts"],"names":[],"mappings":";;;AAAA,MAAa,aAAa;IAGtB,YAAY,KAAK;QAFT,UAAK,GAAG,EAAE,CAAA;QAGd,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;CACJ;AAND,sCAMC"} \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 55efb7a..4c6033a 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -2,6 +2,7 @@ import { Request, Response, NextFunction } from 'express' import User from '../../models/user/User' import Pet from '../../models/pet/Pet' import { PetInfoDto, PetsInfoDto } from '../../dto/rainbow/petDto/PetInfoDto' +import { SavePetResDto } from '../../dto/petDiary/SavePetResDto' const responseMessage = require('../../modules/responseMessage') const statusCode = require('../../modules/statusCode') const util = require('../../modules/util') @@ -66,7 +67,7 @@ module.exports = { console.log(reqData); //db save const saveInfo = petsArr.map(pet=>pet._id) - return saveInfo + return new SavePetResDto(saveInfo) }catch(err){ console.log(err) throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; diff --git a/src/dto/petDiary/SavePetResDto.ts b/src/dto/petDiary/SavePetResDto.ts new file mode 100644 index 0000000..35972a1 --- /dev/null +++ b/src/dto/petDiary/SavePetResDto.ts @@ -0,0 +1,7 @@ +export class SavePetResDto{ + private petId = [] + + constructor(petId){ + this.petId = petId + } +} \ No newline at end of file From bb1c660476b5699594b1c3bd27468e1832d469e7 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Fri, 16 Jul 2021 22:17:04 +0900 Subject: [PATCH 150/168] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6cff723..7dce877 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ 야용...냥냥😺 ---------------------------------------------------- +![MASCOTA_로고](https://user-images.githubusercontent.com/76844556/125953954-569cf975-b298-481b-bbfe-4faf4e6d767f.gif) ## :hammer: Avengers @@ -171,3 +172,4 @@ main ---------------------------------------------------- +![mascota_orange](https://user-images.githubusercontent.com/76844556/125953999-1fa041ca-c696-4a07-8b90-9d6297b014dc.png) From af3dd4f78ad24e7495dfebeae469dcef81516dc1 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Fri, 16 Jul 2021 22:17:36 +0900 Subject: [PATCH 151/168] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7dce877..c251b12 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ ---------------------------------------------------- +![mascota_orange](https://user-images.githubusercontent.com/76844556/125953999-1fa041ca-c696-4a07-8b90-9d6297b014dc.png) ## :panda_face: 프로젝트 설명 @@ -172,4 +173,4 @@ main ---------------------------------------------------- -![mascota_orange](https://user-images.githubusercontent.com/76844556/125953999-1fa041ca-c696-4a07-8b90-9d6297b014dc.png) + From a8920d936a49ae9bd179939746ad36b4a3782b3d Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 00:31:22 +0900 Subject: [PATCH 152/168] =?UTF-8?q?feat=20:=20=EC=97=BD=EC=9D=B4=20?= =?UTF-8?q?=EC=B1=8C=EB=A6=B0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/controller/diaryController.js | 15 +++++++++++++++ dist/api/controller/diaryController.js.map | 2 +- dist/api/controller/petController.js | 14 +------------- dist/api/controller/petController.js.map | 2 +- dist/api/router/diary/index.js | 1 + dist/api/router/diary/index.js.map | 2 +- dist/api/router/pet/index.js.map | 2 +- dist/api/service/diaryService.js | 16 ++++++++++++++++ dist/api/service/diaryService.js.map | 2 +- dist/api/service/petService.js | 12 +----------- dist/api/service/petService.js.map | 2 +- src/api/controller/diaryController.ts | 14 ++++++++++++++ src/api/controller/petController.ts | 14 +------------- src/api/router/diary/index.ts | 1 + src/api/router/pet/index.ts | 1 - src/api/service/diaryService.ts | 15 +++++++++++++++ src/api/service/petService.ts | 13 +------------ 17 files changed, 72 insertions(+), 56 deletions(-) diff --git a/dist/api/controller/diaryController.js b/dist/api/controller/diaryController.js index 54ce542..d5b88c8 100644 --- a/dist/api/controller/diaryController.js +++ b/dist/api/controller/diaryController.js @@ -92,6 +92,21 @@ module.exports = { } return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); } + }), + postPetDiaryWithImage: (req, res) => __awaiter(this, void 0, void 0, function* () { + const images = req.files.map(img => img.location); + const diaryInfo = req.body; + try { + yield diaryService.postPetDiaryWithImage(images, diaryInfo); + } + catch (err) { + console.error(err); + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); + } }) }; //# sourceMappingURL=diaryController.js.map \ No newline at end of file diff --git a/dist/api/controller/diaryController.js.map b/dist/api/controller/diaryController.js.map index 28b22a3..dc9d944 100644 --- a/dist/api/controller/diaryController.js.map +++ b/dist/api/controller/diaryController.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryController.js","sourceRoot":"","sources":["../../../src/api/controller/diaryController.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controller/petController.js b/dist/api/controller/petController.js index 70bc3fa..6e62a94 100644 --- a/dist/api/controller/petController.js +++ b/dist/api/controller/petController.js @@ -58,18 +58,6 @@ module.exports = { console.error(err); res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)); } - }), - // registerPetImg:async(req,res)=>{ - // const image = req.files.map(file=>file.location) - // const petImageInfo = req.body - // console.log('petImageInfo : '+petImageInfo) - // try{ - // await petService.registerPetImg(image,petImageInfo) - // res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) - // }catch(err){ - // console.error(err) - // res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) - // } - // } + }) }; //# sourceMappingURL=petController.js.map \ No newline at end of file diff --git a/dist/api/controller/petController.js.map b/dist/api/controller/petController.js.map index 05d865d..d003523 100644 --- a/dist/api/controller/petController.js.map +++ b/dist/api/controller/petController.js.map @@ -1 +1 @@ -{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC/B,IAAG;YACC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAA;YACrD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,oBAAoB,EAAC,MAAM,CAAC,CAAC,CAAA;SACjH;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC9I;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,iDAAiD;QAEjD,4CAA4C;QAC5C,uCAAuC;QACvC,2DAA2D;QAC3D,yCAAyC;QACzC,0CAA0C;QAC1C,yCAAyC;QACzC,kDAAkD;QAClD,8CAA8C;QAC9C,gDAAgD;QAChD,wDAAwD;QACxD,iEAAiE;QACjE,yCAAyC;QACzC,iCAAiC;QACjC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;IACD,mCAAmC;IACnC,uDAAuD;IACvD,oCAAoC;IACpC,kDAAkD;IAClD,WAAW;IACX,8DAA8D;IAC9D,gHAAgH;IAChH,mBAAmB;IACnB,6BAA6B;IAC7B,0FAA0F;IAC1F,QAAQ;IACR,IAAI;CACP,CAAA"} \ No newline at end of file +{"version":3,"file":"petController.js","sourceRoot":"","sources":["../../../src/api/controller/petController.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,IAAI,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AACxC,IAAI,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAC9D,IAAI,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAGnD,MAAM,CAAC,OAAO,GAAG;IACb,kBAAkB,EAAC,CAAM,GAAG,EAAC,GAAG,EAAC,EAAE;QAC/B,IAAG;YACC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,OAAO,CAAC,GAAG,CAAC,OAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAA;YACrD,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAC,eAAe,CAAC,oBAAoB,EAAC,MAAM,CAAC,CAAC,CAAA;SACjH;QAAA,OAAM,KAAK,EAAC;YACT,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;SAC9I;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5B,kDAAkD;QAClD,yCAAyC;QACzC,qCAAqC;QACrC,0BAA0B;QAC1B,IAAI,OAAO,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,iDAAiD;QAEjD,4CAA4C;QAC5C,uCAAuC;QACvC,2DAA2D;QAC3D,yCAAyC;QACzC,0CAA0C;QAC1C,yCAAyC;QACzC,kDAAkD;QAClD,8CAA8C;QAC9C,gDAAgD;QAChD,wDAAwD;QACxD,iEAAiE;QACjE,yCAAyC;QACzC,iCAAiC;QACjC,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrD,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAA;SAC5G;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,qBAAqB,CAAC;gBAClD,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC,qBAAqB,CAAC;aAC/D;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAA;SAClF;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file diff --git a/dist/api/router/diary/index.js b/dist/api/router/diary/index.js index 8a60f75..b1a8419 100644 --- a/dist/api/router/diary/index.js +++ b/dist/api/router/diary/index.js @@ -7,5 +7,6 @@ router.post('/pet', diaryController.postPetDiary); //반려동물 일기 작성 router.get('/pet/:id', diaryController.getPetDiary); //반려동물 일기 상세 조회 router.put('/pet/:id', diaryController.putPetDiary); //반려동물 일기 수정 router.delete('/pet/:id', diaryController.deletePetDiary); //반려동물 일기 삭제 +router.post('/pet/withImage', upload.array('images', 5), diaryController.postPetDiaryWithImage); module.exports = router; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/api/router/diary/index.js.map b/dist/api/router/diary/index.js.map index 2e8f9ff..684d5b4 100644 --- a/dist/api/router/diary/index.js.map +++ b/dist/api/router/diary/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AACjE,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAC1E,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AAC5D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/diary/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,eAAe,GAAG,OAAO,CAAC,kCAAkC,CAAC,CAAA;AACjE,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAC,YAAY;AAC1E,MAAM,CAAC,IAAI,CAAC,MAAM,EAAC,eAAe,CAAC,YAAY,CAAC,CAAA,CAAA,YAAY;AAC5D,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,eAAe;AACjE,MAAM,CAAC,GAAG,CAAC,UAAU,EAAC,eAAe,CAAC,WAAW,CAAC,CAAA,CAAA,YAAY;AAC9D,MAAM,CAAC,MAAM,CAAC,UAAU,EAAC,eAAe,CAAC,cAAc,CAAC,CAAA,CAAA,YAAY;AACpE,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAC,CAAC,CAAC,EAAC,eAAe,CAAC,qBAAqB,CAAC,CAAA;AAC5F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/router/pet/index.js.map b/dist/api/router/pet/index.js.map index ae0c1ca..1d9decc 100644 --- a/dist/api/router/pet/index.js.map +++ b/dist/api/router/pet/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAChE,4FAA4F;AAC5F,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA;AAClD,uFAAuF;AAEvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/router/pet/index.ts"],"names":[],"mappings":"AAAA,IAAI,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAChC,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;AAC7B,IAAI,aAAa,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAA;AAC7D,IAAI,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAE/C,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;AAChE,4FAA4F;AAC5F,MAAM,CAAC,IAAI,CAAC,WAAW,EAAC,aAAa,CAAC,WAAW,CAAC,CAAA;AAClD,uFAAuF;AACvF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"} \ No newline at end of file diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 7de41ef..b7e755c 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -217,6 +217,22 @@ module.exports = { console.log(err); throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY }; } + }), + postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { + const pets = diaryInfo.character; + console.log('images : ' + images); + try { + console.log('title : ' + diaryInfo.title); + console.log('content : ' + diaryInfo.contents); + console.log('date : ' + diaryInfo.date); + console.log('_id : ' + diaryInfo._id); + pets.array.forEach(pet => { + console.log('petInfo : ' + pet); + }); + } + catch (err) { + throw err; + } }) }; //# sourceMappingURL=diaryService.js.map \ No newline at end of file diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 7679428..fac708f 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/service/petService.js b/dist/api/service/petService.js index a9f4628..41341a4 100644 --- a/dist/api/service/petService.js +++ b/dist/api/service/petService.js @@ -82,16 +82,6 @@ module.exports = { console.log(err); throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; } - }), - // registerPetImg:async(image,petImageInfo)=>{ - // try{ - // for(let i=0;i{ + const images = req.files.map(img=>img.location) + const diaryInfo = req.body + try{ + await diaryService.postPetDiaryWithImage(images,diaryInfo) + }catch(err){ + console.error(err) + if (err.statusCode == null) { + err.statusCode = statusCode.INTERNAL_SERVER_ERROR; + err.responseMessage = responseMessage.INTERNAL_SERVER_ERROR; + } + return res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) + } } } \ No newline at end of file diff --git a/src/api/controller/petController.ts b/src/api/controller/petController.ts index 5de7fcc..1d31f71 100644 --- a/src/api/controller/petController.ts +++ b/src/api/controller/petController.ts @@ -50,17 +50,5 @@ module.exports = { console.error(err) res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) } - }, - // registerPetImg:async(req,res)=>{ - // const image = req.files.map(file=>file.location) - // const petImageInfo = req.body - // console.log('petImageInfo : '+petImageInfo) - // try{ - // await petService.registerPetImg(image,petImageInfo) - // res.status(statusCode.OK).send(util.success(statusCode.OK, responseMessage.SUCCESS_REGISTER_PET_IMG)) - // }catch(err){ - // console.error(err) - // res.status(err.statusCode).send(util.fail(err.statusCode, err.responseMessage)) - // } - // } + } } \ No newline at end of file diff --git a/src/api/router/diary/index.ts b/src/api/router/diary/index.ts index d92a43f..fb6a7f4 100644 --- a/src/api/router/diary/index.ts +++ b/src/api/router/diary/index.ts @@ -8,4 +8,5 @@ router.post('/pet',diaryController.postPetDiary)//반려동물 일기 작성 router.get('/pet/:id',diaryController.getPetDiary)//반려동물 일기 상세 조회 router.put('/pet/:id',diaryController.putPetDiary)//반려동물 일기 수정 router.delete('/pet/:id',diaryController.deletePetDiary)//반려동물 일기 삭제 +router.post('/pet/withImage',upload.array('images',5),diaryController.postPetDiaryWithImage) module.exports = router; \ No newline at end of file diff --git a/src/api/router/pet/index.ts b/src/api/router/pet/index.ts index 22ef4bf..b59ba75 100644 --- a/src/api/router/pet/index.ts +++ b/src/api/router/pet/index.ts @@ -7,5 +7,4 @@ router.get('/register/petInfo',petController.getRegisterPetInfo) //router.post('/register',upload.array('images',5),petController.registerPet) //register pet router.post('/register',petController.registerPet) //router.post('/register/images',upload.array('images',4),petController.registerPetImg) - module.exports = router; \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 552066f..cd4d938 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -217,5 +217,20 @@ module.exports = { console.log(err) throw { statusCode: statusCode.BAD_REQUEST, responseMessage: responseMessage.NO_DIARY } } + }, + postPetDiaryWithImage:async(images, diaryInfo)=>{ + const pets = diaryInfo.character + console.log('images : '+images) + try{ + console.log('title : '+diaryInfo.title) + console.log('content : '+diaryInfo.contents) + console.log('date : '+diaryInfo.date) + console.log('_id : '+diaryInfo._id) + pets.array.forEach(pet => { + console.log('petInfo : '+pet) + }); + }catch(err){ + throw err + } } } \ No newline at end of file diff --git a/src/api/service/petService.ts b/src/api/service/petService.ts index 4c6033a..3b781d3 100644 --- a/src/api/service/petService.ts +++ b/src/api/service/petService.ts @@ -72,16 +72,5 @@ module.exports = { console.log(err) throw { statusCode: statusCode.INTERNAL_SERVER_ERROR, responseMessage: responseMessage.INTERNAL_SERVER_ERROR }; } - }, - - // registerPetImg:async(image,petImageInfo)=>{ - // try{ - // for(let i=0;i Date: Sat, 17 Jul 2021 01:43:22 +0900 Subject: [PATCH 153/168] =?UTF-8?q?refactor=20:=201=EB=B6=80=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20kind=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/firstPartService.js | 21 +++++++++++++---- dist/api/service/firstPartService.js.map | 2 +- .../mainPageDto/FirstPartMainPageResDto.js | 2 ++ .../FirstPartMainPageResDto.js.map | 2 +- src/api/service/firstPartService.ts | 23 +++++++++++++++---- .../mainPageDto/FirstPartMainPageResDto.ts | 3 +++ 6 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dist/api/service/firstPartService.js b/dist/api/service/firstPartService.js index 66907b9..bc745ec 100644 --- a/dist/api/service/firstPartService.js +++ b/dist/api/service/firstPartService.js @@ -44,9 +44,12 @@ module.exports = { path: "firstPartTableContents", populate: ({ path: "petDiary", - populate: { - path: "petEmotions" - } + populate: ({ + path: "petEmotions", + populate: { + path: "pet" + } + }) }) }) }) @@ -67,14 +70,22 @@ module.exports = { findUser.book.tableContents.firstPartTableContents.push(new FirstPartTableContents_1.default()); } const firstPartMainPageResDto = new FirstPartMainPageResDto_1.FirstPartMainPageResDto(findUser.book); - let allPetDiaries = yield PetDiary_1.default.find({}).populate('tableContents'); + let allPetDiaries = yield PetDiary_1.default.find({}).populate({ + path: "tableContents" + }).populate({ + path: "petEmotions", + populate: { + path: "pet" + } + }); let petDiaryNumber = (yield allPetDiaries).length; + const test = allPetDiaries[petDiaryNumber - 1]; + console.log(`!!!!!!!!!!! : ` + test); //가장 마지막 일기 const lastDiary = new FirstPartMainPageResDto_1.DiaryResDto(allPetDiaries[petDiaryNumber - 1]); firstPartMainPageResDto.setNextEpisode(lastDiary); //tableContents let lastTableNumber = findUser.book.tableContents.firstPartTableContents.length; - console.log("lastTable", TableContents_1.default); for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new FirstPartMainPageResDto_1.TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]); firstPartMainPageResDto.setTableContents(tableContentsResDto); diff --git a/dist/api/service/firstPartService.js.map b/dist/api/service/firstPartService.js.map index f4c1c65..b6f2697 100644 --- a/dist/api/service/firstPartService.js.map +++ b/dist/api/service/firstPartService.js.map @@ -1 +1 @@ -{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"firstPartService.js","sourceRoot":"","sources":["../../../src/api/service/firstPartService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js index ceb181d..62c98c6 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js @@ -46,6 +46,7 @@ class DiaryResDto { } init(petDiary) { return __awaiter(this, void 0, void 0, function* () { + console.log('findPet : ' + petDiary.petEmotions[0]); const firstPartTableContents = petDiary.tableContents; this.chapter = firstPartTableContents.chapter; this.episode = firstPartTableContents.petDiary.length; @@ -57,6 +58,7 @@ class DiaryResDto { this.title = petDiary.title; this.contents = petDiary.contents; this.date = yield dateMethod.toStringByFormatting(petDiary.date); + this.kind = petDiary.petEmotions[0].pet.kind; }); } } diff --git a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map index bc356e2..93bb234 100644 --- a/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map +++ b/dist/dto/firstPart/mainPageDto/FirstPartMainPageResDto.js.map @@ -1 +1 @@ -{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"FirstPartMainPageResDto.js","sourceRoot":"","sources":["../../../../src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/firstPartService.ts b/src/api/service/firstPartService.ts index ca30d23..7edf5f7 100644 --- a/src/api/service/firstPartService.ts +++ b/src/api/service/firstPartService.ts @@ -32,9 +32,12 @@ module.exports = { path: "firstPartTableContents", populate: ({ path: "petDiary", - populate: { - path: "petEmotions" - } + populate: ({ + path: "petEmotions", + populate:{ + path : "pet" + } + }) }) }) }) @@ -57,15 +60,25 @@ module.exports = { } const firstPartMainPageResDto = new FirstPartMainPageResDto(findUser.book) - let allPetDiaries = await PetDiary.find({}).populate('tableContents') + let allPetDiaries = await PetDiary.find({}).populate({ + path : "tableContents" + }).populate({ + path : "petEmotions", + populate:{ + path : "pet" + } + }) + let petDiaryNumber=(await allPetDiaries).length + const test = allPetDiaries[petDiaryNumber-1] + console.log(`!!!!!!!!!!! : `+test) //가장 마지막 일기 const lastDiary = new DiaryResDto(allPetDiaries[petDiaryNumber-1]) firstPartMainPageResDto.setNextEpisode(lastDiary) //tableContents let lastTableNumber=findUser.book.tableContents.firstPartTableContents.length - console.log("lastTable", TableContents) + for (let i = 0; i < lastTableNumber; i++) { let tableContentsResDto = new TableContentsResDto(findUser.book.tableContents.firstPartTableContents[i]) firstPartMainPageResDto.setTableContents(tableContentsResDto) diff --git a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts index 6604e5a..803612a 100644 --- a/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts +++ b/src/dto/firstPart/mainPageDto/FirstPartMainPageResDto.ts @@ -43,6 +43,7 @@ export class DiaryResDto { private title; private contents; private date; + private kind; //가장 마지막 화 들어감 constructor(petDiary: IPetDiary) { @@ -50,6 +51,7 @@ export class DiaryResDto { } async init(petDiary: IPetDiary) { + console.log('findPet : '+petDiary.petEmotions[0]) const firstPartTableContents = petDiary.tableContents this.chapter = firstPartTableContents.chapter this.episode = firstPartTableContents.petDiary.length; @@ -61,6 +63,7 @@ export class DiaryResDto { this.title = petDiary.title; this.contents = petDiary.contents; this.date = await dateMethod.toStringByFormatting(petDiary.date); + this.kind = petDiary.petEmotions[0].pet.kind } } From cbd98bda6cd40680499d1c2e260195e2bb5d4f85 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 02:15:50 +0900 Subject: [PATCH 154/168] reafactor : postPet image --- dist/api/service/diaryService.js | 4 ++-- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index b7e755c..7d4f2d5 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -225,8 +225,8 @@ module.exports = { console.log('title : ' + diaryInfo.title); console.log('content : ' + diaryInfo.contents); console.log('date : ' + diaryInfo.date); - console.log('_id : ' + diaryInfo._id); - pets.array.forEach(pet => { + console.log('tableContents_id : ' + diaryInfo._id); + pets.forEach(pet => { console.log('petInfo : ' + pet); }); } diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index fac708f..6ae2ac5 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index cd4d938..6037a7f 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -225,8 +225,8 @@ module.exports = { console.log('title : '+diaryInfo.title) console.log('content : '+diaryInfo.contents) console.log('date : '+diaryInfo.date) - console.log('_id : '+diaryInfo._id) - pets.array.forEach(pet => { + console.log('tableContents_id : '+diaryInfo._id) + pets.forEach(pet => { console.log('petInfo : '+pet) }); }catch(err){ From 2ac37dd94b686fea5bb6a3403a49e1e17c75c674 Mon Sep 17 00:00:00 2001 From: sol Date: Sat, 17 Jul 2021 03:50:36 +0900 Subject: [PATCH 155/168] =?UTF-8?q?README=20=EA=B8=B0=EB=8A=A5=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 113 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c251b12..e8b579e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Mascota-Server +# zMascota-Server 야용...냥냥😺 ---------------------------------------------------- @@ -6,8 +6,8 @@ ## :hammer: Avengers -| 이솔 | 이현종 | 강수미 | -| :----------------------------------------------------------: | :----------------------------------------------------------: | :----------------------------------------------------------: | +| 이솔 | 이현종 | 강수미 | +| :--------------------------------------: | :--------------------------------------: | :--------------------------------------: | | ![image](https://user-images.githubusercontent.com/57162257/124487068-3c141680-dde9-11eb-97b3-ff82ab180239.png) | ![image](https://user-images.githubusercontent.com/57162257/124487598-e1c78580-dde9-11eb-8672-254506d3e484.png) | ![image](https://user-images.githubusercontent.com/57162257/124487807-189d9b80-ddea-11eb-88f1-4a1b2a04683d.png) | @@ -39,12 +39,104 @@ > > > -> #### -> 죽음에 대한 거부감을 줄이고 준비의 필요성을 높인다. +> -> 죽음에 대한 거부감을 줄이고 준비의 필요성을 높인다. ---------------------------------------------------- +## ❣ Feature + +🌺 **1부 - 솔** + +------ + +[[POST\]로그인 API](https://www.notion.so/POST-API-d8789d6072cb47f698b019fb3f9b5e69) + +[[POST\]회원가입 API](https://www.notion.so/POST-API-458da9c291c645fe813fdece59a26b06) + +[[POST\]반려동물 등록 API ](https://www.notion.so/POST-API-570d51c21ec048e8aca462fb34f04fee) + +[[POST\]프롤로그 작성 API](https://www.notion.so/POST-API-023cbd99b1834715ad692b22a83dd116) + +[[GET\] 1부 홈 화면 API](https://www.notion.so/GET-1-API-f1c1f97c984343ab9cb12e4ca0539388) + +[[POST\] 반려동물 일기 작성 API ](https://www.notion.so/POST-API-f39c866cc485481d9a6fab0765a70b8f) + +[[GET\]일기 조회 API](https://www.notion.so/GET-API-f069e944c8f646ba87964b94b3484887) + +[[PUT\]일기 수정 API](https://www.notion.so/PUT-API-94b5e889542446c7ac7fe15826dbe566) + +[[DELETE\] 일기 삭제 API](https://www.notion.so/DELETE-API-2740e249af1446b0af67dba5348f7079) + +[[GET\] 목차별 일기 조회 API](https://www.notion.so/GET-API-7d3d2b4c39724c13a3080f45962de778) + +[[GET\] 목차 리스트 API](https://www.notion.so/GET-API-5c2b74531aee4d269911d50f9e75d50b) + +[[POST\] 목차 추가 API](https://www.notion.so/POST-API-c4bb24ecce23476f9350ca4df3db4a78) + +[[PUT\] 목차 수정 API](https://www.notion.so/PUT-API-7d275a4b7ddc46f88d20299ad720cd65) + +[[DELETE\] 목차 삭제 API](https://www.notion.so/DELETE-API-75ad7e25f9f24db8ba4a97ba084dcbe3) + +[[GET\] 반려동물 정보 API - new](https://www.notion.so/GET-API-new-ffa6b8dc68dd4c8aad3eddc4e3f23e8a) + +------ + +🌷 **1.5 부 - 리드 혀니** + +------ + +[[Get\]1.5부 무지개 홈 화면API](https://www.notion.so/Get-1-5-API-a4e4c3749d6e48c295b6d8f4c885fff2) + +[[Put\] 1.5부 무지개 반려동물 적용 API& 1.5부 무지개 반려동물 무지개 다리 멘트API](https://www.notion.so/Put-1-5-API-1-5-API-ee0baa92a7d84bc7b61ec9ea77da553a) + +[[Delete\] 1.5부 무지개 이별준비 취소하기](https://www.notion.so/Delete-1-5-f8e5197c5d204da9acdd01b993f5e840) + +[[Get\]1.5부 무지개 이별에 준비하는 작가의 기록 시작 API](https://www.notion.so/Get-1-5-API-9a62bc023c10401cab230b83ffc10c96) + +[[Get\]1.5부 무지개 최고의 순간 API](https://www.notion.so/Get-1-5-API-bd049d93217f43f894fa7ec261a38bcb) + +[[Get\] 1.5부 무지개 작가의 말 작성 시 반려동물 이름 불러오기 API](https://www.notion.so/Get-1-5-API-8a4e08b97e2047618cbc06a6786ec870) + +[[Post\]1.5부 무지개 작가의 말 - 에필로그 API](https://www.notion.so/Post-1-5-API-774b9cccd19a4879aa26c0cfcfc620fc) + +[[Get\] 1.5부 무지개 서브 홈 API](https://www.notion.so/Get-1-5-API-ad57037e73bb4a39b456b4252188a347) + +[[Get\] 캘린더 뷰 API](https://www.notion.so/Get-API-26b42f6d2cec4344b6b1fb2062cdee30) + +------ + +🌹 **2부 - 수 미 (홈/목차 - 혀니, 일기 - 솔)** + +[[GET\]2부 홈화면 API](https://www.notion.so/GET-2-API-4cb15d73b18e4aee88c820fd1d4a3c37) + +[[GET\]목차별 일기조회API](https://www.notion.so/GET-API-6c6e844b938b40668f18464ac30b57f1) + +[[GET\] 2부 목차 리스트 API](https://www.notion.so/GET-2-API-efdd94a18aba47c8a48ddf141eaf9e76) + +[[Post\] 2부 목차 추가 API](https://www.notion.so/Post-2-API-112fbee763b64be8b3ce5c84b1abbdbb) + +[[PUT\] 2부 목차 수정 API](https://www.notion.so/PUT-2-API-05533cedeeef4e86af4fdc8318f56c96) + +[[DELETE\] 목차 삭제 API](https://www.notion.so/DELETE-API-ffea94c0c28841d8a67cc2702d5eea70) + +[[POST\] 작가 일기 작성 API](https://www.notion.so/POST-API-db6ddfdaa1004db794127a7eb58e3a36) + +[[GET\]작가일기 조회 API](https://www.notion.so/GET-API-147c5a0f71204e7d964d02305acfca42) + +[[PUT\]작가일기 수정 API](https://www.notion.so/PUT-API-4a148a1d5f404889a0a7b1e94512468a) + +[[DELETE\] 작가일기 삭제 API](https://www.notion.so/DELETE-API-f2869d911b5e4d79a68a3c1e03beae86) + +[[GET\]대처법 API - 릴리즈](https://www.notion.so/GET-API-9c3e32bbc98d455a92885545a69fd697) + +[[GET\]도움 기관 연결API - 릴리즈](https://www.notion.so/GET-API-3719969de9c742f99752cb57aa3a3eea) + +[[GET\]마이페이지API - 릴리즈](https://www.notion.so/GET-API-68db22f818c546e9b2881bf8d0618e42) + + + ## :ice_cream: 서버 아키텍처 ![image](https://user-images.githubusercontent.com/57162257/124490748-75e71c00-dded-11eb-86bd-3487d46a244f.png) @@ -141,11 +233,11 @@ main - 제목 -| Title | Content | -| :------: | :-------------: | +| Title | Content | +| :------: | :------: | | feat | 새로운 기능추가 | -| refactor | 코드 리팩토링 | -| fix | 버그 수정 | +| refactor | 코드 리팩토링 | +| fix | 버그 수정 | - 본문 @@ -166,7 +258,6 @@ main -반환데이터에 반려동물 img 추가 ``` - @@ -174,3 +265,16 @@ main ---------------------------------------------------- +### 4. **User Flow** + +![Mascota Work Flow 2](C:\Users\dlthf\Downloads\Mascota Work Flow 2.png) + +![Mascota Work Flow 3](C:\Users\dlthf\Downloads\Mascota Work Flow 3.png) + +![Mascota Work Flow 4](C:\Users\dlthf\Downloads\Mascota Work Flow 4.png) + +![Mascota Work Flow 5](C:\Users\dlthf\Downloads\Mascota Work Flow 5.png) + + + +![Mascota Work Flow 6](C:\Users\dlthf\Downloads\Mascota Work Flow 6.png) \ No newline at end of file From 562eea480b290df904500f350365187d022a7c57 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 17 Jul 2021 04:01:39 +0900 Subject: [PATCH 156/168] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e8b579e..ce4e3b9 100644 --- a/README.md +++ b/README.md @@ -267,6 +267,7 @@ main ### 4. **User Flow** + ![Mascota Work Flow 2](C:\Users\dlthf\Downloads\Mascota Work Flow 2.png) ![Mascota Work Flow 3](C:\Users\dlthf\Downloads\Mascota Work Flow 3.png) @@ -275,6 +276,4 @@ main ![Mascota Work Flow 5](C:\Users\dlthf\Downloads\Mascota Work Flow 5.png) - - -![Mascota Work Flow 6](C:\Users\dlthf\Downloads\Mascota Work Flow 6.png) \ No newline at end of file +![Mascota Work Flow 6](C:\Users\dlthf\Downloads\Mascota Work Flow 6.png) From 4013e87c8c2a6ff5937468b9666c6f721f8bb124 Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 17 Jul 2021 04:02:37 +0900 Subject: [PATCH 157/168] Update README.md --- README.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ce4e3b9..5dc44ed 100644 --- a/README.md +++ b/README.md @@ -267,13 +267,9 @@ main ### 4. **User Flow** +![Mascota Work Flow 2](https://user-images.githubusercontent.com/76844556/125996424-80c7c794-98dd-4b8c-80b6-b04240661d5c.png) +![Mascota Work Flow 3](https://user-images.githubusercontent.com/76844556/125996432-1bfe58d8-df3e-423d-a02e-4dd079dbbf41.png) +![Mascota Work Flow 4](https://user-images.githubusercontent.com/76844556/125996438-84db8ff4-8ce1-4d02-845f-0a28d702613f.png) +![Mascota Work Flow 5](https://user-images.githubusercontent.com/76844556/125996450-75407294-eeb4-4e8c-9f39-15a7d2ac9be3.png) +![Mascota Work Flow 6](https://user-images.githubusercontent.com/76844556/125996465-b5ebf482-35ce-4da6-aebb-65c7c37dfc20.png) -![Mascota Work Flow 2](C:\Users\dlthf\Downloads\Mascota Work Flow 2.png) - -![Mascota Work Flow 3](C:\Users\dlthf\Downloads\Mascota Work Flow 3.png) - -![Mascota Work Flow 4](C:\Users\dlthf\Downloads\Mascota Work Flow 4.png) - -![Mascota Work Flow 5](C:\Users\dlthf\Downloads\Mascota Work Flow 5.png) - -![Mascota Work Flow 6](C:\Users\dlthf\Downloads\Mascota Work Flow 6.png) From 1e3dce27c92b19ae50397b307583998c79bc74bb Mon Sep 17 00:00:00 2001 From: sol lee <76844556+soleu@users.noreply.github.com> Date: Sat, 17 Jul 2021 04:02:44 +0900 Subject: [PATCH 158/168] Create README.md From 910b89e4555567bc922bae80e9fe979b020a431e Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 04:48:00 +0900 Subject: [PATCH 159/168] =?UTF-8?q?refactor=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20with=20img?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 34 ++++++++++++++++++++--- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 41 +++++++++++++++++++++++++--- src/interfaces/diary/IPetDiary.ts | 2 +- 4 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 7d4f2d5..acac0da 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,16 +219,42 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const pets = diaryInfo.character; + const petInfo = diaryInfo.character; console.log('images : ' + images); + console.log('diaryInfo : ' + petInfo); + console.log('diaryInfo length : ' + petInfo.length); try { console.log('title : ' + diaryInfo.title); console.log('content : ' + diaryInfo.contents); console.log('date : ' + diaryInfo.date); console.log('tableContents_id : ' + diaryInfo._id); - pets.forEach(pet => { - console.log('petInfo : ' + pet); - }); + const writeDate = yield new Date(diaryInfo.date); + writeDate.setDate(writeDate.getDate() + 1); + const firstTableContents = (yield FirstPartTableContents_1.default.findById(diaryInfo._io)).populate('petDiary'); + const episode = firstTableContents.petDiary.length; + let newDiary = new PetDiary_1.default({ + title: diaryInfo.title, + contents: diaryInfo.contents, + imgs: images, + episode, + date: writeDate + }); //set petEmotions, pets, tableContents + firstTableContents.setPetDiary(newDiary); + //petEmotion 생성 & + petInfo.forEach((info) => __awaiter(void 0, void 0, void 0, function* () { + //const perPet = await Pet.findById(info._id) + let newEmotion = new PetEmotions_1.default({ + pet: info._id, + feeling: info.feeling + }); //set petDiary + newEmotion.setPetDiary(newDiary); + newDiary.setPet(info._id); + newDiary.setPetEmotions(newEmotion); + yield newEmotion.save(); + })); + newDiary.setTableContents(firstTableContents); + yield firstTableContents.save(); + yield newDiary.save(); } catch (err) { throw err; diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 6ae2ac5..d688766 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 6037a7f..4ccb3cd 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,16 +219,49 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const pets = diaryInfo.character + const petInfo = diaryInfo.character console.log('images : '+images) + console.log('diaryInfo : '+petInfo) + console.log('diaryInfo length : '+petInfo.length) try{ console.log('title : '+diaryInfo.title) console.log('content : '+diaryInfo.contents) console.log('date : '+diaryInfo.date) console.log('tableContents_id : '+diaryInfo._id) - pets.forEach(pet => { - console.log('petInfo : '+pet) - }); + + const writeDate = await new Date(diaryInfo.date) + writeDate.setDate(writeDate.getDate() + 1); + + const firstTableContents = (await FirstPartTableContents.findById(diaryInfo._io)).populate('petDiary') + const episode = firstTableContents.petDiary.length + + let newDiary = new PetDiary({ + title : diaryInfo.title, + contents : diaryInfo.contents, + imgs : images, + episode , + date : writeDate + })//set petEmotions, pets, tableContents + firstTableContents.setPetDiary(newDiary) + + //petEmotion 생성 & + petInfo.forEach(async info => { + //const perPet = await Pet.findById(info._id) + let newEmotion = new PetEmotions({ + pet : info._id, + feeling : info.feeling + })//set petDiary + newEmotion.setPetDiary(newDiary) + newDiary.setPet(info._id) + newDiary.setPetEmotions(newEmotion) + + await newEmotion.save() + }) + newDiary.setTableContents(firstTableContents) + + await firstTableContents.save() + await newDiary.save() + }catch(err){ throw err } diff --git a/src/interfaces/diary/IPetDiary.ts b/src/interfaces/diary/IPetDiary.ts index ae867e9..b809a9d 100644 --- a/src/interfaces/diary/IPetDiary.ts +++ b/src/interfaces/diary/IPetDiary.ts @@ -18,7 +18,7 @@ export interface IPetDiary extends Document{ export interface IPetDiaryDocument extends IPetDiary{ setPet : (pet : IPet) => Promise - setTableContents : (tableContents : ITableContents) => Promise + setTableContents : (tableContents : IFirstPartTableContents) => Promise setPetEmotions : (petEmotions : IPetEmotions) => Promise } From 59e7048d5515d6e54329bd65217cdd3fd9fb6439 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 05:01:42 +0900 Subject: [PATCH 160/168] =?UTF-8?q?refactor=20:=20=EC=B5=9C=EA=B3=A0?= =?UTF-8?q?=EC=9D=98=20=EC=88=9C=EA=B0=84=20comment=20=EC=9D=B4=EC=8A=88?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/rainbowService.js | 2 +- src/api/service/rainbowService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/api/service/rainbowService.js b/dist/api/service/rainbowService.js index 6538ef5..4b1cc71 100644 --- a/dist/api/service/rainbowService.js +++ b/dist/api/service/rainbowService.js @@ -226,7 +226,7 @@ module.exports = { } const theBestMomentsResDto = new TheBestMomentResDto_1.TheBestMomentsResDto(timeTogether); for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 2 }); + const commentPerFeeling = yield Comments_1.default.findOne({ feeling: j, classification: 1 }); // let commentPerFeeling ={ // comments : "", // feeling : j diff --git a/src/api/service/rainbowService.ts b/src/api/service/rainbowService.ts index c4fc55f..8cc413f 100644 --- a/src/api/service/rainbowService.ts +++ b/src/api/service/rainbowService.ts @@ -234,7 +234,7 @@ module.exports = { const theBestMomentsResDto = new TheBestMomentsResDto(timeTogether) for (let j = 0; j < 6; j++) { //긍정3개, 부정3개 - const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 2}) + const commentPerFeeling = await Comments.findOne({ feeling: j , classification : 1}) // let commentPerFeeling ={ // comments : "", From 6f7b227e5362329a3b1ab76aaf551ac75242e0ea Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 05:08:44 +0900 Subject: [PATCH 161/168] =?UTF-8?q?fix=20:=20=EB=B0=98=EB=A0=A4=EB=8F=99?= =?UTF-8?q?=EB=AC=BC=20=EB=93=B1=EB=A1=9D=ED=95=98=EA=B8=B0=20populate?= =?UTF-8?q?=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 2 +- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index acac0da..51a8144 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -230,7 +230,7 @@ module.exports = { console.log('tableContents_id : ' + diaryInfo._id); const writeDate = yield new Date(diaryInfo.date); writeDate.setDate(writeDate.getDate() + 1); - const firstTableContents = (yield FirstPartTableContents_1.default.findById(diaryInfo._io)).populate('petDiary'); + const firstTableContents = yield FirstPartTableContents_1.default.findById(diaryInfo._io).populate('petDiary'); const episode = firstTableContents.petDiary.length; let newDiary = new PetDiary_1.default({ title: diaryInfo.title, diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index d688766..069e02b 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 4ccb3cd..3a7c963 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -232,7 +232,7 @@ module.exports = { const writeDate = await new Date(diaryInfo.date) writeDate.setDate(writeDate.getDate() + 1); - const firstTableContents = (await FirstPartTableContents.findById(diaryInfo._io)).populate('petDiary') + const firstTableContents = await FirstPartTableContents.findById(diaryInfo._io).populate('petDiary') const episode = firstTableContents.petDiary.length let newDiary = new PetDiary({ From fbf9043adca2c8179f736e044164286f8472b7c3 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 05:20:02 +0900 Subject: [PATCH 162/168] =?UTF-8?q?refacotr=20:=20populate=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 2 +- src/api/service/diaryService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 51a8144..716fa63 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -230,7 +230,7 @@ module.exports = { console.log('tableContents_id : ' + diaryInfo._id); const writeDate = yield new Date(diaryInfo.date); writeDate.setDate(writeDate.getDate() + 1); - const firstTableContents = yield FirstPartTableContents_1.default.findById(diaryInfo._io).populate('petDiary'); + const firstTableContents = yield FirstPartTableContents_1.default.findById(diaryInfo._id).populate('petDiary'); const episode = firstTableContents.petDiary.length; let newDiary = new PetDiary_1.default({ title: diaryInfo.title, diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 3a7c963..65d8850 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -232,7 +232,7 @@ module.exports = { const writeDate = await new Date(diaryInfo.date) writeDate.setDate(writeDate.getDate() + 1); - const firstTableContents = await FirstPartTableContents.findById(diaryInfo._io).populate('petDiary') + const firstTableContents = await FirstPartTableContents.findById(diaryInfo._id).populate('petDiary') const episode = firstTableContents.petDiary.length let newDiary = new PetDiary({ From 56af16cc9f5ba314981ed08681a0c48198195d8e Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 05:34:28 +0900 Subject: [PATCH 163/168] =?UTF-8?q?refacotr=20:=20=EB=B0=98=EB=A0=A4?= =?UTF-8?q?=EB=8F=99=EB=AC=BC=20=EB=93=B1=EB=A1=9D=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/api/service/diaryService.js | 1 + dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 716fa63..f99e27b 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -222,6 +222,7 @@ module.exports = { const petInfo = diaryInfo.character; console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); + console.log('diaryInfo : ' + typeof (petInfo)); console.log('diaryInfo length : ' + petInfo.length); try { console.log('title : ' + diaryInfo.title); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 069e02b..c478b2b 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kEAAyC;AAEzC,6FAAoE;AACpE,+GAAsF;AACtF,+DAAsC;AACtC,2EAAkD;AAClD,iFAAwD;AACxD,8EAA0F;AAC1F,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAM,CAAC,OAAO,GAAG;IACb,YAAY,EAAE,CAAO,MAAM,EAAE,QAAQ,EAAE,EAAE;QACrC,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnB,oBAAoB;YACpB,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;YAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACpC,IAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,EAAC;gBACvB,MAAM,EAAC,UAAU,EAAG,GAAG,EAAE,eAAe,EAAG,6BAA6B,EAAC,CAAA;aAC5E;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACzB,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK;gBAC9B,OAAO,CAAC,IAAI,GAAG,wGAAwG;gBACvH,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAElC,6BAA6B;YAC7B,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAA;YACzC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAA;YACrC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAC1B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,sCAAsC;YACtC,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,2BAA2B,GAAG,IAAI,gCAAsB,CAAC;oBAC3D,OAAO;oBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;iBAC7C,CAAC,CAAA;gBACF,MAAM,2BAA2B,CAAC,IAAI,EAAE,CAAA;gBACxC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACtE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;aACxB;YAED,iBAAiB;YACjB,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;gBAC3B,aAAa,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACtD,OAAO,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM;gBAChE,eAAe;gBACf,oBAAoB;gBACpB,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,wBAAwB;aACrC,CAAC,CAAA;YACF,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;gBAC/B,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;gBACrB,OAAO,EAAE,CAAC;aACb,CAAC,CAAA;YACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;YAEtC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAClE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YACvB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YACxB,MAAM,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACpD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;YACpB,gBAAgB;SACnB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,SAAS,EAAE,EAAE;QAC9B,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAChD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,8DAA8D;QAC9D,MAAM,IAAI,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtF,iCAAiC;QACjC,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;YAC3B,aAAa,EAAE,SAAS,CAAC,GAAG;YAC5B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC7B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,wGAAwG;YAC9G,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAE/B,CAAC,CAAA;QAEF,IAAI;YACA,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC3B,eAAe;gBACf,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;oBAC/B,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;oBAC/B,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC1C,CAAC,CAAA;gBACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBACtC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;aAC1B;YAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACxB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YAExB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA,CAAC,iCAAiC;YACrE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC5H,IAAI,kBAAkB,GAAG,MAAM,IAAI,uCAAkB,CAAC,YAAY,CAAC,CAAA,CAAC,KAAK;YACzE,0FAA0F;YAE1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtD,IAAI,WAAW,GAAG,IAAI,mCAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1D,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;gBACnD,kBAAkB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;aACjD;YACD,OAAO,kBAAkB,CAAA;SAE5B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,SAAS,EAAE,EAAE;QACzC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACvD,YAAY,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAA;YACvD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAA;YAC3C,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;YACrC,YAAY,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAA;YACzC,YAAY,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YACpC,YAAY,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;YAC1C,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC5B,eAAe;gBACf,IAAI,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAA;gBAC/B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;gBACxC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;gBAChD,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;aACvB;YACD,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;YACzB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,cAAc,EAAE,CAAO,UAAU,EAAE,EAAE;QACjC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACzG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,CAAA;YACtC,aAAa;YACb,6CAA6C;YAC7C,qEAAqE;YACrE,IAAI,uBAAuB,GAAG,YAAY,CAAC,aAAa,CAAA;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9D,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,EAAE;oBACvD,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;iBAChD;aACJ;YACD,IAAI,UAAU,GAAG,CAAC,MAAM,gCAAsB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;YAE1H,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACxC,IAAI,IAAI,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;gBACjD,IAAI,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;oBACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBACvC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;iBACpB;aACJ;YAED,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAM,UAAU,EAAC,EAAE;gBAChD,MAAM,qBAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAA;YACxD,CAAC,CAAA,CAAC,CAAA;YAEF,MAAM,kBAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/C,MAAM,uBAAuB,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACzB,OAAO,eAAe,CAAC,uBAAuB,CAAC;SAClD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,qBAAqB,EAAC,CAAM,MAAM,EAAE,SAAS,EAAC,EAAE;QAC5C,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,CAAA;QACnC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,CAAA;QACnC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACjD,IAAG;YACC,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACrC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YAEhD,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAChD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAE3C,MAAM,kBAAkB,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;YACpG,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAA;YAElD,IAAI,QAAQ,GAAG,IAAI,kBAAQ,CAAC;gBACxB,KAAK,EAAG,SAAS,CAAC,KAAK;gBACvB,QAAQ,EAAG,SAAS,CAAC,QAAQ;gBAC7B,IAAI,EAAG,MAAM;gBACb,OAAO;gBACP,IAAI,EAAG,SAAS;aACnB,CAAC,CAAA,CAAA,sCAAsC;YACxC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAExC,kBAAkB;YAClB,OAAO,CAAC,OAAO,CAAC,CAAM,IAAI,EAAC,EAAE;gBACzB,6CAA6C;gBAC7C,IAAI,UAAU,GAAG,IAAI,qBAAW,CAAC;oBAC7B,GAAG,EAAG,IAAI,CAAC,GAAG;oBACd,OAAO,EAAG,IAAI,CAAC,OAAO;iBACzB,CAAC,CAAA,CAAA,cAAc;gBAChB,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;gBAChC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACzB,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBAEnC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YAC3B,CAAC,CAAA,CAAC,CAAA;YACF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;YAE7C,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAExB;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 65d8850..49b89a7 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -222,6 +222,7 @@ module.exports = { const petInfo = diaryInfo.character console.log('images : '+images) console.log('diaryInfo : '+petInfo) + console.log('diaryInfo : '+typeof(petInfo)) console.log('diaryInfo length : '+petInfo.length) try{ console.log('title : '+diaryInfo.title) From 38547205ffa0f4f53c7e5c2ceb82da8e303c9d47 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 12:17:24 +0900 Subject: [PATCH 164/168] refactor : updatwe --- dist/api/service/diaryService.js | 2 +- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index f99e27b..bdfd0c4 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,7 +219,7 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const petInfo = diaryInfo.character; + const petInfo = JSON.parse(diaryInfo.character); console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); console.log('diaryInfo : ' + typeof (petInfo)); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index c478b2b..a70ecbb 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 49b89a7..aaef3d0 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,7 +219,7 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const petInfo = diaryInfo.character + const petInfo = JSON.parse(diaryInfo.character) console.log('images : '+images) console.log('diaryInfo : '+petInfo) console.log('diaryInfo : '+typeof(petInfo)) From bcc0343134825b04b30b49320aa8611fb4c62275 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 12:19:06 +0900 Subject: [PATCH 165/168] refactor : update --- dist/api/service/diaryService.js | 2 +- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index bdfd0c4..4ad1662 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,7 +219,7 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const petInfo = JSON.parse(diaryInfo.character); + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)); console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); console.log('diaryInfo : ' + typeof (petInfo)); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index a70ecbb..415153a 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index aaef3d0..68c11bb 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,7 +219,7 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const petInfo = JSON.parse(diaryInfo.character) + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)) console.log('images : '+images) console.log('diaryInfo : '+petInfo) console.log('diaryInfo : '+typeof(petInfo)) From f29ee4b011653fcd607f59b4f70bd91ea166ea76 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 12:22:07 +0900 Subject: [PATCH 166/168] refactor : update --- dist/api/service/diaryService.js | 2 +- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 4ad1662..6f1ef52 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,7 +219,7 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)); + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character.character)); console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); console.log('diaryInfo : ' + typeof (petInfo)); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index 415153a..a2a16cd 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 68c11bb..22d3360 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,7 +219,7 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)) + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character.character)) console.log('images : '+images) console.log('diaryInfo : '+petInfo) console.log('diaryInfo : '+typeof(petInfo)) From 31c7cd56efc651beca4ecdda774f545fd6471473 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 12:23:37 +0900 Subject: [PATCH 167/168] refactor : update --- dist/api/service/diaryService.js | 2 +- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index 6f1ef52..c9f9c02 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,7 +219,7 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const petInfo = JSON.parse(JSON.stringify(diaryInfo.character.character)); + const petInfo = JSON.parse(diaryInfo.character.character); console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); console.log('diaryInfo : ' + typeof (petInfo)); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index a2a16cd..bc229dd 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index 22d3360..fe14e0e 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,7 +219,7 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const petInfo = JSON.parse(JSON.stringify(diaryInfo.character.character)) + const petInfo = JSON.parse(diaryInfo.character.character) console.log('images : '+images) console.log('diaryInfo : '+petInfo) console.log('diaryInfo : '+typeof(petInfo)) From ea832a39b7e12cb7984d8eb9bab4fc11314c01c7 Mon Sep 17 00:00:00 2001 From: hyunjong_96 Date: Sat, 17 Jul 2021 12:26:13 +0900 Subject: [PATCH 168/168] refactor : update --- dist/api/service/diaryService.js | 4 +++- dist/api/service/diaryService.js.map | 2 +- src/api/service/diaryService.ts | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dist/api/service/diaryService.js b/dist/api/service/diaryService.js index c9f9c02..1d3c2ba 100644 --- a/dist/api/service/diaryService.js +++ b/dist/api/service/diaryService.js @@ -219,7 +219,9 @@ module.exports = { } }), postPetDiaryWithImage: (images, diaryInfo) => __awaiter(void 0, void 0, void 0, function* () { - const petInfo = JSON.parse(diaryInfo.character.character); + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)).character; + console.log('test2 : ' + JSON.parse(petInfo)); + console.log('test ! : ' + JSON.parse(JSON.stringify(petInfo))); console.log('images : ' + images); console.log('diaryInfo : ' + petInfo); console.log('diaryInfo : ' + typeof (petInfo)); diff --git a/dist/api/service/diaryService.js.map b/dist/api/service/diaryService.js.map index bc229dd..4a78528 100644 --- a/dist/api/service/diaryService.js.map +++ b/dist/api/service/diaryService.js.map @@ -1 +1 @@ -{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kEAAyC;AAEzC,6FAAoE;AACpE,+GAAsF;AACtF,+DAAsC;AACtC,2EAAkD;AAClD,iFAAwD;AACxD,8EAA0F;AAC1F,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,wBAAwB,CAAC,CAAA;AACjC,OAAO,CAAC,sBAAsB,CAAC,CAAA;AAC/B,OAAO,CAAC,0CAA0C,CAAC,CAAA;AACnD,OAAO,CAAC,mDAAmD,CAAC,CAAA;AAC5D,OAAO,CAAC,6BAA6B,CAAC,CAAA;AACtC,OAAO,CAAC,gCAAgC,CAAC,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;AAChE,MAAM,UAAU,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AAEtD,MAAM,CAAC,OAAO,GAAG;IACb,YAAY,EAAE,CAAO,MAAM,EAAE,QAAQ,EAAE,EAAE;QACrC,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnB,oBAAoB;YACpB,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACzD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;YAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACpC,IAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,EAAC;gBACvB,MAAM,EAAC,UAAU,EAAG,GAAG,EAAE,eAAe,EAAG,6BAA6B,EAAC,CAAA;aAC5E;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAA;YACzB,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK;gBAC9B,OAAO,CAAC,IAAI,GAAG,wGAAwG;gBACvH,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAA;YAElC,6BAA6B;YAC7B,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAA;YACzC,OAAO,CAAC,aAAa,GAAG,aAAa,CAAA;YACrC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAC1B,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;YACpB,sCAAsC;YACtC,MAAM,iBAAiB,GAAG,IAAI,gCAAsB,CAAC;gBACjD,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAC,CAAA;YACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAC9B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAElE,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,2BAA2B,GAAG,IAAI,gCAAsB,CAAC;oBAC3D,OAAO;oBACP,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;iBAC7C,CAAC,CAAA;gBACF,MAAM,2BAA2B,CAAC,IAAI,EAAE,CAAA;gBACxC,aAAa,CAAC,sBAAsB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACtE,OAAO,GAAG,OAAO,GAAG,CAAC,CAAA;aACxB;YAED,iBAAiB;YACjB,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;gBAC3B,aAAa,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBACtD,OAAO,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM;gBAChE,eAAe;gBACf,oBAAoB;gBACpB,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,wBAAwB;aACrC,CAAC,CAAA;YACF,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;gBAC/B,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;gBACrB,OAAO,EAAE,CAAC;aACb,CAAC,CAAA;YACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;YAEtC,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAClE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YACvB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YACxB,MAAM,aAAa,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACpD,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;YAE1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;YACpB,gBAAgB;SACnB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;IACD,YAAY,EAAE,CAAO,SAAS,EAAE,EAAE;QAC9B,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAChD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,8DAA8D;QAC9D,MAAM,IAAI,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtF,iCAAiC;QACjC,IAAI,WAAW,GAAG,IAAI,kBAAQ,CAAC;YAC3B,aAAa,EAAE,SAAS,CAAC,GAAG;YAC5B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;YAC7B,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,wGAAwG;YAC9G,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAE/B,CAAC,CAAA;QAEF,IAAI;YACA,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC3B,eAAe;gBACf,MAAM,UAAU,GAAG,IAAI,qBAAW,CAAC;oBAC/B,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;oBAC/B,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC1C,CAAC,CAAA;gBACF,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBACtC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;aAC1B;YAED,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACxB,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;YAExB,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA,CAAC,iCAAiC;YACrE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,EAAE;QAC9B,IAAI;YACA,MAAM,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAC5H,IAAI,kBAAkB,GAAG,MAAM,IAAI,uCAAkB,CAAC,YAAY,CAAC,CAAA,CAAC,KAAK;YACzE,0FAA0F;YAE1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtD,IAAI,WAAW,GAAG,IAAI,mCAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1D,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;gBACnD,kBAAkB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;aACjD;YACD,OAAO,kBAAkB,CAAA;SAE5B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,WAAW,EAAE,CAAO,UAAU,EAAE,SAAS,EAAE,EAAE;QACzC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YACvD,YAAY,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAA;YACvD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAA;YAC3C,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;YACrC,YAAY,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,CAAA;YACzC,YAAY,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;YACpC,YAAY,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;YAC1C,cAAc;YACd,IAAI,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAA;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC3B,MAAM,OAAO,GAAG,MAAM,aAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAC9E,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;gBAC5B,eAAe;gBACf,IAAI,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAA;gBAC/B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;gBACxC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;gBAChD,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;gBACjC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;aACvB;YACD,MAAM,YAAY,CAAC,IAAI,EAAE,CAAA;YACzB,OAAO,eAAe,CAAC,qBAAqB,CAAC;SAEhD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,cAAc,EAAE,CAAO,UAAU,EAAE,EAAE;QACjC,IAAI;YACA,IAAI,YAAY,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACzG,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,YAAY,CAAC,CAAA;YACtC,aAAa;YACb,6CAA6C;YAC7C,qEAAqE;YACrE,IAAI,uBAAuB,GAAG,YAAY,CAAC,aAAa,CAAA;YACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9D,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,EAAE;oBACvD,uBAAuB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;iBAChD;aACJ;YACD,IAAI,UAAU,GAAG,CAAC,MAAM,gCAAsB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;YAE1H,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACxC,IAAI,IAAI,GAAG,MAAM,kBAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;gBACjD,IAAI,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE;oBACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBACvC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;iBACpB;aACJ;YAED,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAM,UAAU,EAAC,EAAE;gBAChD,MAAM,qBAAW,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAA;YACxD,CAAC,CAAA,CAAC,CAAA;YAEF,MAAM,kBAAQ,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAA;YAC/C,MAAM,uBAAuB,CAAC,IAAI,EAAE,CAAA;YACpC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;YACzB,OAAO,eAAe,CAAC,uBAAuB,CAAC;SAClD;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAA;SAC1F;IACL,CAAC,CAAA;IACD,qBAAqB,EAAC,CAAM,MAAM,EAAE,SAAS,EAAC,EAAE;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;QACzD,OAAO,CAAC,GAAG,CAAC,WAAW,GAAC,MAAM,CAAC,CAAA;QAC/B,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAO,CAAC,CAAA;QACnC,OAAO,CAAC,GAAG,CAAC,cAAc,GAAC,OAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACjD,IAAG;YACC,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,YAAY,GAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,GAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACrC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YAEhD,MAAM,SAAS,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAChD,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YAE3C,MAAM,kBAAkB,GAAG,MAAM,gCAAsB,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;YACpG,MAAM,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAA;YAElD,IAAI,QAAQ,GAAG,IAAI,kBAAQ,CAAC;gBACxB,KAAK,EAAG,SAAS,CAAC,KAAK;gBACvB,QAAQ,EAAG,SAAS,CAAC,QAAQ;gBAC7B,IAAI,EAAG,MAAM;gBACb,OAAO;gBACP,IAAI,EAAG,SAAS;aACnB,CAAC,CAAA,CAAA,sCAAsC;YACxC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YAExC,kBAAkB;YAClB,OAAO,CAAC,OAAO,CAAC,CAAM,IAAI,EAAC,EAAE;gBACzB,6CAA6C;gBAC7C,IAAI,UAAU,GAAG,IAAI,qBAAW,CAAC;oBAC7B,GAAG,EAAG,IAAI,CAAC,GAAG;oBACd,OAAO,EAAG,IAAI,CAAC,OAAO;iBACzB,CAAC,CAAA,CAAA,cAAc;gBAChB,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;gBAChC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACzB,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;gBAEnC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YAC3B,CAAC,CAAA,CAAC,CAAA;YACF,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;YAE7C,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAA;YAC/B,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAExB;QAAA,OAAM,GAAG,EAAC;YACP,MAAM,GAAG,CAAA;SACZ;IACL,CAAC,CAAA;CACJ,CAAA"} \ No newline at end of file +{"version":3,"file":"diaryService.js","sourceRoot":"","sources":["../../../src/api/service/diaryService.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/api/service/diaryService.ts b/src/api/service/diaryService.ts index fe14e0e..82ff251 100644 --- a/src/api/service/diaryService.ts +++ b/src/api/service/diaryService.ts @@ -219,7 +219,10 @@ module.exports = { } }, postPetDiaryWithImage:async(images, diaryInfo)=>{ - const petInfo = JSON.parse(diaryInfo.character.character) + const petInfo = JSON.parse(JSON.stringify(diaryInfo.character)).character + + console.log('test2 : '+JSON.parse(petInfo)) + console.log('test ! : '+JSON.parse(JSON.stringify(petInfo))) console.log('images : '+images) console.log('diaryInfo : '+petInfo) console.log('diaryInfo : '+typeof(petInfo))