From f0696061c43686c33c269254f21f11356d61aa85 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 09:32:17 +0100 Subject: [PATCH 001/165] feat: Setup Data Seeding --- database/package.json | 4 +- database/yarn.lock | 231 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 230 insertions(+), 5 deletions(-) diff --git a/database/package.json b/database/package.json index c01c75f2b..d69926340 100644 --- a/database/package.json +++ b/database/package.json @@ -19,6 +19,7 @@ "lint": "eslint . --ext .js,.ts" }, "devDependencies": { + "@types/faker": "^5.5.9", "@types/node": "^16.10.3", "@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/parser": "^4.29.2", @@ -39,6 +40,7 @@ "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "ts-mysql-migrate": "^1.0.2", - "typeorm": "^0.2.38" + "typeorm": "^0.2.38", + "typeorm-seeding": "^1.6.1" } } diff --git a/database/yarn.lock b/database/yarn.lock index 1afbc7f09..7ea8914c1 100644 --- a/database/yarn.lock +++ b/database/yarn.lock @@ -122,6 +122,11 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== +"@types/faker@^5.5.9": + version "5.5.9" + resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c" + integrity sha512-uCx6mP3UY5SIO14XlspxsGjgaemrxpssJI0Ol+GfhxtcKpv9pgRZYsS4eeKeHVLje6Qtc8lGszuBI461+gVZBA== + "@types/json-schema@^7.0.7": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" @@ -457,7 +462,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camelcase@^5.3.1: +camelcase@^5.0.0, 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== @@ -473,7 +478,7 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0: +chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -523,6 +528,13 @@ cli-boxes@^2.2.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + cli-highlight@^2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-2.1.11.tgz#49736fa452f0aaf4fae580e30acb26828d2dc1bf" @@ -535,6 +547,20 @@ cli-highlight@^2.1.11: parse5-htmlparser2-tree-adapter "^6.0.0" yargs "^16.0.0" +cli-spinners@^2.2.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -551,6 +577,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -637,6 +668,11 @@ debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: dependencies: ms "2.1.2" +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -654,6 +690,13 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + 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" @@ -1002,6 +1045,11 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +faker@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f" + integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8= + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -1066,6 +1114,14 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -1106,7 +1162,7 @@ generate-function@^2.3.1: dependencies: is-property "^1.0.2" -get-caller-file@^2.0.5: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -1141,6 +1197,18 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^7.1.3: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" @@ -1434,6 +1502,11 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + is-negative-zero@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" @@ -1605,6 +1678,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -1620,6 +1700,13 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== + dependencies: + chalk "^2.4.2" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -1675,6 +1762,11 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + 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" @@ -1712,6 +1804,11 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + mysql2@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079" @@ -1841,6 +1938,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + optionator@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" @@ -1853,6 +1957,20 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +ora@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.3.tgz#752a1b7b4be4825546a7a3d59256fa523b6b6d05" + integrity sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg== + dependencies: + chalk "^3.0.0" + cli-cursor "^3.1.0" + cli-spinners "^2.2.0" + is-interactive "^1.0.0" + log-symbols "^3.0.0" + mute-stream "0.0.8" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -1865,6 +1983,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -1872,11 +1997,23 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + package-json@^6.3.0: version "6.5.0" resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" @@ -1929,6 +2066,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -2094,7 +2236,7 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -reflect-metadata@^0.1.13: +reflect-metadata@0.1.13, reflect-metadata@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== @@ -2128,6 +2270,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -2148,6 +2295,14 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -2216,6 +2371,11 @@ seq-queue@^0.0.5: resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + sha.js@^2.4.11: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -2532,6 +2692,18 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeorm-seeding@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/typeorm-seeding/-/typeorm-seeding-1.6.1.tgz#4fe3a1aec9a611007d1135419cde286cced8defd" + integrity sha512-xJIW1pp72hv6npPqbQ7xDvawcDmS60EDUjK++UCfiqT0WE4xTzCn+QK1ZijLkD3GYCqFPuFt4nmeyRJn6VO2Vw== + dependencies: + chalk "^4.0.0" + faker "4.1.0" + glob "7.1.6" + ora "4.0.3" + reflect-metadata "0.1.13" + yargs "15.3.1" + typeorm@^0.2.38: version "0.2.38" resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.2.38.tgz#2af08079919f6ab04cd17017f9faa2c8d5cd566f" @@ -2635,6 +2807,13 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= + dependencies: + defaults "^1.0.3" + which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -2646,6 +2825,11 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -2665,6 +2849,15 @@ word-wrap@^1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2707,6 +2900,11 @@ xmlbuilder@~11.0.0: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -2731,11 +2929,36 @@ yargonaut@^1.1.4: figlet "^1.1.1" parent-require "^1.0.0" +yargs-parser@^18.1.1: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs@15.3.1: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.1" + yargs@^16.0.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" From 15d1e6545b67cd4ca97e2d6d633260918966b217 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 10:19:13 +0100 Subject: [PATCH 002/165] user factory and seed --- database/package.json | 2 ++ database/src/factories/user.factory.ts | 26 ++++++++++++++++++++++++++ database/src/seeds/create-user.seed.ts | 8 ++++++++ database/yarn.lock | 10 ++++++++++ 4 files changed, 46 insertions(+) create mode 100644 database/src/factories/user.factory.ts create mode 100644 database/src/seeds/create-user.seed.ts diff --git a/database/package.json b/database/package.json index d69926340..ff238ee13 100644 --- a/database/package.json +++ b/database/package.json @@ -36,7 +36,9 @@ "typescript": "^4.3.5" }, "dependencies": { + "crypto": "^1.0.1", "dotenv": "^10.0.0", + "faker": "^5.5.3", "mysql2": "^2.3.0", "reflect-metadata": "^0.1.13", "ts-mysql-migrate": "^1.0.2", diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts new file mode 100644 index 000000000..7fbccbdb3 --- /dev/null +++ b/database/src/factories/user.factory.ts @@ -0,0 +1,26 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { User } from '../../entity/User' +import { randomBytes } from 'crypto' + +interface UserContext { + pubkey?: Buffer + email?: string + firstName?: string + lastName?: string + username?: string + disabled?: boolean +} + +define(User, (faker: typeof Faker, context: UserContext) => { + const user = new User() + + user.pubkey = context.pubkey ? context.pubkey : randomBytes(32) + user.email = context.email ? context.email : faker.internet.email() + user.firstName = context.firstName ? context.firstName : faker.name.firstName() + user.lastName = context.lastName ? context.lastName : faker.name.lastName() + user.username = context.username ? context.username : faker.internet.userName() + user.disabled = context.disabled ? context.disabled : false + + return user +}) diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts new file mode 100644 index 000000000..b95d1bbe3 --- /dev/null +++ b/database/src/seeds/create-user.seed.ts @@ -0,0 +1,8 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { User } from '../../entity/User' + +export class CreateUser implements Seeder { + public async run(factory: Factory): Promise { + await factory(User)().create() + } +} diff --git a/database/yarn.lock b/database/yarn.lock index 7ea8914c1..25b236371 100644 --- a/database/yarn.lock +++ b/database/yarn.lock @@ -647,6 +647,11 @@ crypto-random-string@^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== +crypto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037" + integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig== + debug@^2.2.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1050,6 +1055,11 @@ faker@4.1.0: resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f" integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8= +faker@^5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e" + integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" From 0b3ead83691c3454dc684239b946469ae1f2deef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 18 Nov 2021 19:17:51 +0100 Subject: [PATCH 003/165] simple seed is working --- database/.env.dist | 4 +++- database/ormconfig.js | 15 +++++++++++++++ database/package.json | 4 +++- database/src/factories/user.factory.ts | 5 +++-- database/src/index.ts | 9 +++++++++ database/src/seeds/create-user.seed.ts | 2 +- 6 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 database/ormconfig.js diff --git a/database/.env.dist b/database/.env.dist index 8488fb1bf..644dcaaf4 100644 --- a/database/.env.dist +++ b/database/.env.dist @@ -4,4 +4,6 @@ DB_USER=root DB_PASSWORD= DB_DATABASE=gradido_community MIGRATIONS_TABLE=migrations -MIGRATIONS_DIRECTORY=./migrations/ \ No newline at end of file +MIGRATIONS_DIRECTORY=./migrations/ + +TYPEORM_SEEDING_FACTORIES=src/factories/**/*{.ts,.js} diff --git a/database/ormconfig.js b/database/ormconfig.js new file mode 100644 index 000000000..71e444061 --- /dev/null +++ b/database/ormconfig.js @@ -0,0 +1,15 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ + +const CONFIG = require('./src/config') + +module.export = { + name: 'default', + type: 'mysql', + host: CONFIG.DB_HOST, + port: CONFIG.DB_PORT, + username: CONFIG.DB_USER, + password: CONFIG.DB_PASSWORD, + database: CONFIG.DB_DATABASE, + seeds: ['src/seeds/**/*{.ts,.js}'], + factories: ['src/factories/**/*{.ts,.js}'], +} diff --git a/database/package.json b/database/package.json index ff238ee13..a84026e6a 100644 --- a/database/package.json +++ b/database/package.json @@ -16,7 +16,9 @@ "dev_up": "nodemon -w ./ --ext ts --exec ts-node src/index.ts up", "dev_down": "nodemon -w ./ --ext ts --exec ts-node src/index.ts down", "dev_reset": "nodemon -w ./ --ext ts --exec ts-node src/index.ts reset", - "lint": "eslint . --ext .js,.ts" + "lint": "eslint . --ext .js,.ts", + "seed:config": "ts-node ./node_modules/typeorm-seeding/dist/cli.js config", + "seed": "nodemon -w ./ --ext ts --exec ts-node src/index.ts seed" }, "devDependencies": { "@types/faker": "^5.5.9", diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts index 7fbccbdb3..5f9bb420b 100644 --- a/database/src/factories/user.factory.ts +++ b/database/src/factories/user.factory.ts @@ -12,9 +12,10 @@ interface UserContext { disabled?: boolean } -define(User, (faker: typeof Faker, context: UserContext) => { - const user = new User() +define(User, (faker: typeof Faker, context?: UserContext) => { + if (!context) context = {} + const user = new User() user.pubkey = context.pubkey ? context.pubkey : randomBytes(32) user.email = context.email ? context.email : faker.internet.email() user.firstName = context.firstName ? context.firstName : faker.name.firstName() diff --git a/database/src/index.ts b/database/src/index.ts index 2492a1306..9341b3d45 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -4,6 +4,8 @@ import { Migration } from 'ts-mysql-migrate' import CONFIG from './config' import prepare from './prepare' import connection from './typeorm/connection' +import { useSeeding, runSeeder } from 'typeorm-seeding' +import { CreateUserSeed } from './seeds/create-user.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -47,6 +49,13 @@ const run = async (command: string) => { case 'reset': await migration.reset() // use for resetting database break + case 'seed': + await useSeeding({ + root: process.cwd(), + configName: 'ormconfig.js', + }) + await runSeeder(CreateUserSeed) + break default: throw new Error(`Unsupported command ${command}`) } diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts index b95d1bbe3..a6de48a0c 100644 --- a/database/src/seeds/create-user.seed.ts +++ b/database/src/seeds/create-user.seed.ts @@ -1,7 +1,7 @@ import { Factory, Seeder } from 'typeorm-seeding' import { User } from '../../entity/User' -export class CreateUser implements Seeder { +export class CreateUserSeed implements Seeder { public async run(factory: Factory): Promise { await factory(User)().create() } From d4883928f9dc4cdb85f0cef1f0c8e41b624c3ebe Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 11:17:03 +0100 Subject: [PATCH 004/165] factory for login user --- database/entity/0001-init_db/User.ts | 16 ++++--- database/entity/0002-add_settings/User.ts | 16 ++++--- database/src/factories/login-user.factory.ts | 47 ++++++++++++++++++++ database/src/factories/user.factory.ts | 2 + database/src/seeds/create-user.seed.ts | 7 ++- 5 files changed, 77 insertions(+), 11 deletions(-) create mode 100644 database/src/factories/login-user.factory.ts diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index d76711eb1..5f64c34bc 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -3,22 +3,28 @@ import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' // Moriz: I do not like the idea of having two user tables @Entity('state_users') export class User extends BaseEntity { - @PrimaryGeneratedColumn() + @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number + @Column({ default: 0, name: 'index_id' }) + indexId: number + + @Column({ default: 0, name: 'group_id', unsigned: true }) + groupId: number + @Column({ type: 'binary', length: 32, name: 'public_key' }) pubkey: Buffer - @Column() + @Column({ length: 255, nullable: true, default: null }) email: string - @Column({ name: 'first_name' }) + @Column({ name: 'first_name', length: 255, nullable: true, default: null }) firstName: string - @Column({ name: 'last_name' }) + @Column({ name: 'last_name', length: 255, nullable: true, default: null }) lastName: string - @Column() + @Column({ length: 255, nullable: true, default: null }) username: string @Column() diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index 51bbef164..8ec279fdb 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -4,22 +4,28 @@ import { UserSetting } from './UserSetting' // Moriz: I do not like the idea of having two user tables @Entity('state_users') export class User extends BaseEntity { - @PrimaryGeneratedColumn() + @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number + @Column({ default: 0, name: 'index_id' }) + indexId: number + + @Column({ default: 0, name: 'group_id', unsigned: true }) + groupId: number + @Column({ type: 'binary', length: 32, name: 'public_key' }) pubkey: Buffer - @Column() + @Column({ length: 255, nullable: true, default: null }) email: string - @Column({ name: 'first_name' }) + @Column({ name: 'first_name', length: 255, nullable: true, default: null }) firstName: string - @Column({ name: 'last_name' }) + @Column({ name: 'last_name', length: 255, nullable: true, default: null }) lastName: string - @Column() + @Column({ length: 255, nullable: true, default: null }) username: string @Column() diff --git a/database/src/factories/login-user.factory.ts b/database/src/factories/login-user.factory.ts new file mode 100644 index 000000000..5fd64f233 --- /dev/null +++ b/database/src/factories/login-user.factory.ts @@ -0,0 +1,47 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { LoginUser } from '../../entity/LoginUser' +import { randomBytes } from 'crypto' + +interface LoginUserContext { + email?: string + firstName?: string + lastName?: string + username?: string + description?: string + password?: BigInt + pubKey?: Buffer + privKey?: Buffer + emailHash?: Buffer + createdAt?: Date + emailChecked?: boolean + passphraseShown?: boolean + language?: string + disabled?: boolean + groupId?: number + publisherId?: number +} + +define(LoginUser, (faker: typeof Faker, context?: LoginUserContext) => { + if (!context) context = {} + + const user = new LoginUser() + user.email = context.email ? context.email : faker.internet.email() + user.firstName = context.firstName ? context.firstName : faker.name.firstName() + user.lastName = context.lastName ? context.lastName : faker.name.lastName() + user.username = context.username ? context.username : faker.internet.userName() + user.description = context.description ? context.description : faker.random.words(4) + user.password = context.password ? context.password : BigInt(0) + user.pubKey = context.pubKey ? context.pubKey : randomBytes(32) + user.privKey = context.privKey ? context.privKey : randomBytes(80) + user.emailHash = context.emailHash ? context.emailHash : randomBytes(32) + user.createdAt = context.createdAt ? context.createdAt : faker.date.recent() + user.emailChecked = context.emailChecked ? context.emailChecked : true + user.passphraseShown = context.passphraseShown ? context.passphraseShown : false + user.language = context.language ? context.language : 'en' + user.disabled = context.disabled ? context.disabled : false + user.groupId = context.groupId ? context.groupId : 1 + user.publisherId = context.publisherId ? context.publisherId : 0 + + return user +}) diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts index 5f9bb420b..ffa32e815 100644 --- a/database/src/factories/user.factory.ts +++ b/database/src/factories/user.factory.ts @@ -22,6 +22,8 @@ define(User, (faker: typeof Faker, context?: UserContext) => { user.lastName = context.lastName ? context.lastName : faker.name.lastName() user.username = context.username ? context.username : faker.internet.userName() user.disabled = context.disabled ? context.disabled : false + user.groupId = 0 + user.indexId = 0 return user }) diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts index a6de48a0c..6ac165a7e 100644 --- a/database/src/seeds/create-user.seed.ts +++ b/database/src/seeds/create-user.seed.ts @@ -3,6 +3,11 @@ import { User } from '../../entity/User' export class CreateUserSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)().create() + await factory(User)({ + email: 'peter@lustig.de', + firstName: 'Peter', + lastName: 'Lustig', + username: 'peter', + }).create() } } From 535c0b04388e6f9f5431e7bdcba06ff54d4ae081 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 11:21:41 +0100 Subject: [PATCH 005/165] no eslint warnings --- database/migrations/0001-init_db.ts | 3 +++ database/migrations/0002-add_settings.ts | 3 +++ database/migrations/0003-login_server_tables.ts | 3 +++ database/migrations/0004-login_server_data.ts | 3 +++ 4 files changed, 12 insertions(+) diff --git a/database/migrations/0001-init_db.ts b/database/migrations/0001-init_db.ts index b402c0f72..242037363 100644 --- a/database/migrations/0001-init_db.ts +++ b/database/migrations/0001-init_db.ts @@ -1,3 +1,6 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + /* FIRST MIGRATION * * This migration is special since it takes into account that diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts index d26a2b4cc..1b3b8a1a4 100644 --- a/database/migrations/0002-add_settings.ts +++ b/database/migrations/0002-add_settings.ts @@ -1,3 +1,6 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + /* FIRST MIGRATION * * This migration is special since it takes into account that diff --git a/database/migrations/0003-login_server_tables.ts b/database/migrations/0003-login_server_tables.ts index dacc211ac..54e7bca54 100644 --- a/database/migrations/0003-login_server_tables.ts +++ b/database/migrations/0003-login_server_tables.ts @@ -1,3 +1,6 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + /* FIRST MIGRATION * * This migration is special since it takes into account that diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts index dad7d1e34..f319b16ab 100644 --- a/database/migrations/0004-login_server_data.ts +++ b/database/migrations/0004-login_server_data.ts @@ -1,3 +1,6 @@ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + /* FIRST MIGRATION * * This migration is special since it takes into account that From a518ed50966099a3121ec0cde72628a89dc0bd92 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 11:35:03 +0100 Subject: [PATCH 006/165] factory for server user --- database/src/factories/server-user.factory.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 database/src/factories/server-user.factory.ts diff --git a/database/src/factories/server-user.factory.ts b/database/src/factories/server-user.factory.ts new file mode 100644 index 000000000..ab3dca811 --- /dev/null +++ b/database/src/factories/server-user.factory.ts @@ -0,0 +1,30 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { ServerUser } from '../../entity/ServerUser' + +interface ServerUserContext { + username?: string + password?: BigInt + email?: string + role?: string + activated?: number + lastLogin?: Date + created?: Date + modified?: Date +} + +define(ServerUser, (faker: typeof Faker, context?: ServerUserContext) => { + if (!context) context = {} + + const user = new ServerUser() + user.username = context.username ? context.username : faker.internet.userName() + user.password = context.password ? context.password : BigInt(0) + user.email = context.email ? context.email : faker.internet.email() + user.role = context.role ? context.role : 'admin' + user.activated = context.activated ? context.activated : 0 + user.lastLogin = context.lastLogin ? context.lastLogin : faker.date.recent() + user.created = context.created ? context.created : faker.date.recent() + user.modified = context.modified ? context.modified : faker.date.recent() + + return user +}) From 8f066595fc472b318d16a111958baa5628e50361 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 11:49:06 +0100 Subject: [PATCH 007/165] factory for login user backup --- .../src/factories/login-user-backup.factory.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 database/src/factories/login-user-backup.factory.ts diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts new file mode 100644 index 000000000..35363263e --- /dev/null +++ b/database/src/factories/login-user-backup.factory.ts @@ -0,0 +1,18 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { LoginUserBackup } from '../../entity/LoginUserBackup' + +interface LoginUserBackupContext { + passphrase?: string + mnemonicType?: number +} + +define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { + if (!context) context = {} + + const userBackup = new LoginUserBackup() + userBackup.passphrase = context.passphrase ? context.passphrase : faker.random.words(24) + userBackup.mnemonicType = context.mnemonicType ? context.mnemonicType : 2 + + return userBackup +}) From 0ae04898f4185af2352f8bccfc5c42ee79b474ef Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 23 Nov 2021 17:59:44 +0100 Subject: [PATCH 008/165] add one to one relation from login_user to login_user_backup --- .../entity/0003-login_server_tables/LoginUserBackup.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/database/entity/0003-login_server_tables/LoginUserBackup.ts b/database/entity/0003-login_server_tables/LoginUserBackup.ts index af152e534..0f8cf78a9 100644 --- a/database/entity/0003-login_server_tables/LoginUserBackup.ts +++ b/database/entity/0003-login_server_tables/LoginUserBackup.ts @@ -1,16 +1,18 @@ -import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, JoinColumn, OneToOne } from 'typeorm' +import { LoginUser } from '../LoginUser' @Entity('login_user_backups') export class LoginUserBackup extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'user_id', nullable: false }) - userId: number - @Column({ type: 'text', name: 'passphrase', nullable: false }) passphrase: string @Column({ name: 'mnemonic_type', default: -1 }) mnemonicType: number + + @OneToOne(() => LoginUser, { nullable: false }) + @JoinColumn({ name: 'user_id' }) + loginUser: LoginUser } From 2ea309643cb4723c74ebdbb4ba67452365251cc6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 24 Nov 2021 08:59:44 +0100 Subject: [PATCH 009/165] starting refactor user seed --- database/src/seeds/create-user.seed.ts | 42 ++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts index 6ac165a7e..b2f6be6ab 100644 --- a/database/src/seeds/create-user.seed.ts +++ b/database/src/seeds/create-user.seed.ts @@ -1,13 +1,43 @@ import { Factory, Seeder } from 'typeorm-seeding' import { User } from '../../entity/User' +// import { LoginUser } from '../../entity/LoginUser' + +/* +interface UserContext { + // from login user (contains state user) + email?: string + firstName?: string + lastName?: string + username?: string + description?: string + password?: BigInt + pubKey?: Buffer + privKey?: Buffer + emailHash?: Buffer + createdAt?: Date + emailChecked?: boolean + passphraseShown?: boolean + language?: string + disabled?: boolean + groupId?: number + publisherId?: number + // from login user backup + passphrase?: string + mnemonicType?: number + // from server user + role?: string + activated?: number + lastLogin?: Date + modified?: Date + // flag for admin + isAdmin?: boolean +} +*/ export class CreateUserSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)({ - email: 'peter@lustig.de', - firstName: 'Peter', - lastName: 'Lustig', - username: 'peter', - }).create() + // const loginUser = await factory(LoginUser)().make() + // console.log(loginUser.email) + await factory(User)().create() } } From 89529149aed1645d8e1c75d1d8f9c207c3250c05 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:17:15 +0100 Subject: [PATCH 010/165] Create new table for admin interface so that we can store the pending creations. --- database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts diff --git a/database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts new file mode 100644 index 000000000..e76d31fd6 --- /dev/null +++ b/database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts @@ -0,0 +1,4 @@ +import { BaseEntity, Entity } from "typeorm"; + +@Entity('login_pending_tasks_admin') +export class LoginPendingTasksAdmin extends BaseEntity {} From b3d69bae0df6998eceb9a48689563005fab3536d Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:21:06 +0100 Subject: [PATCH 011/165] Moved new entity to folder 0005 since it needs to correspond to migrations scripts. --- .../LoginPendingTasksAdmin.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/entity/{0004-admin_tables => 0005-admin_tables}/LoginPendingTasksAdmin.ts (100%) diff --git a/database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts similarity index 100% rename from database/entity/0004-admin_tables/LoginPendingTasksAdmin.ts rename to database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts From d79a40cbb0873bf10e15ff23d2b93d72d293a365 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:21:38 +0100 Subject: [PATCH 012/165] Export of the new entity. --- database/entity/LoginPendingTasksAdmin.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 database/entity/LoginPendingTasksAdmin.ts diff --git a/database/entity/LoginPendingTasksAdmin.ts b/database/entity/LoginPendingTasksAdmin.ts new file mode 100644 index 000000000..b8580a638 --- /dev/null +++ b/database/entity/LoginPendingTasksAdmin.ts @@ -0,0 +1 @@ +export { LoginPendingTasksAdmin } from './0004-admin_tables/LoginPendingTasksAdmin' From 84387c9a02d5eda3dcdd6a5da176e3b0e7045a39 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:22:41 +0100 Subject: [PATCH 013/165] Deploy new entity. --- database/entity/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/entity/index.ts b/database/entity/index.ts index 5e4e98118..2db836904 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -10,6 +10,7 @@ import { TransactionSendCoin } from './TransactionSendCoin' import { User } from './User' import { UserSetting } from './UserSetting' import { UserTransaction } from './UserTransaction' +import { LoginPendingTasksAdmin } from './LoginPendingTasksAdmin' export const entities = [ Balance, @@ -24,4 +25,5 @@ export const entities = [ User, UserSetting, UserTransaction, + LoginPendingTasksAdmin, ] From 9915a78c7e441f94c7e2fb2705f8810ef150cf5c Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:37:35 +0100 Subject: [PATCH 014/165] Creation script and deletion script. --- database/migrations/0005-admin_tables.ts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 database/migrations/0005-admin_tables.ts diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts new file mode 100644 index 000000000..3730755f0 --- /dev/null +++ b/database/migrations/0005-admin_tables.ts @@ -0,0 +1,24 @@ +/* MIGRATION FOR ADMIN INTERFACE + */ + +export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn(` + CREATE TABLE \`login_pending_tasks_admin\` ( + \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT, + \`user_id\` int UNSIGNED DEFAULT 0, + \`request\` varbinary(2048) NOT NULL, + \`created\` datetime NOT NULL, + \`finished\` datetime DEFAULT '2000-01-01 000000', + \`result_json\` text DEFAULT NULL, + \`param_json\` text DEFAULT NULL, + \`task_type_id\` int UNSIGNED NOT NULL, + \`child_pending_task_id\` int UNSIGNED DEFAULT 0, + \`parent_pending_task_id\` int UNSIGNED DEFAULT 0, + PRIMARY KEY (\`id\`) + ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4; + `) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn(`DROP TABLE \`login_pending_tasks_admin\`;`) +} From 3e363db42e4ba46223bb4c57ffd1174efb6070d6 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:40:45 +0100 Subject: [PATCH 015/165] Adding a description of the migration. --- database/migrations/0005-admin_tables.ts | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts index 3730755f0..8e1219715 100644 --- a/database/migrations/0005-admin_tables.ts +++ b/database/migrations/0005-admin_tables.ts @@ -1,19 +1,24 @@ /* MIGRATION FOR ADMIN INTERFACE + * + * This migration is special since it takes into account that + * the database can be setup already but also may not be. + * Therefore you will find all `CREATE TABLE` statements with + * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the + * downgrade function all `DROP TABLE` with a `IF EXISTS`. + * This ensures compatibility for existing or non-existing + * databases. */ export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { await queryFn(` CREATE TABLE \`login_pending_tasks_admin\` ( \`id\` int UNSIGNED NOT NULL AUTO_INCREMENT, - \`user_id\` int UNSIGNED DEFAULT 0, - \`request\` varbinary(2048) NOT NULL, + \`userId\` int UNSIGNED DEFAULT 0, \`created\` datetime NOT NULL, - \`finished\` datetime DEFAULT '2000-01-01 000000', - \`result_json\` text DEFAULT NULL, - \`param_json\` text DEFAULT NULL, - \`task_type_id\` int UNSIGNED NOT NULL, - \`child_pending_task_id\` int UNSIGNED DEFAULT 0, - \`parent_pending_task_id\` int UNSIGNED DEFAULT 0, + \`date\` datetime NOT NULL, + \`note\` text DEFAULT NULL, + \`amount\` bigint(20) NOT NULL, + \`moderator\` int UNSIGNED DEFAULT 0, PRIMARY KEY (\`id\`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4; `) From b939feb0e14bb99ef50aa54c77e0513199ff2a68 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 09:41:59 +0100 Subject: [PATCH 016/165] Folder change added --- database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts | 2 +- database/entity/LoginPendingTasksAdmin.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts index e76d31fd6..afd09ad68 100644 --- a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts +++ b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts @@ -1,4 +1,4 @@ -import { BaseEntity, Entity } from "typeorm"; +import { BaseEntity, Entity } from 'typeorm' @Entity('login_pending_tasks_admin') export class LoginPendingTasksAdmin extends BaseEntity {} diff --git a/database/entity/LoginPendingTasksAdmin.ts b/database/entity/LoginPendingTasksAdmin.ts index b8580a638..f766b74dd 100644 --- a/database/entity/LoginPendingTasksAdmin.ts +++ b/database/entity/LoginPendingTasksAdmin.ts @@ -1 +1 @@ -export { LoginPendingTasksAdmin } from './0004-admin_tables/LoginPendingTasksAdmin' +export { LoginPendingTasksAdmin } from './0005-admin_tables/LoginPendingTasksAdmin' From 6b3d28d1ff0fc5ab11549dab080c7aff93e3d886 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 10:01:13 +0100 Subject: [PATCH 017/165] Definition of the entity based on the database table. --- .../LoginPendingTasksAdmin.ts | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts index afd09ad68..8e5d57d3a 100644 --- a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts +++ b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts @@ -1,4 +1,25 @@ -import { BaseEntity, Entity } from 'typeorm' +import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm' @Entity('login_pending_tasks_admin') -export class LoginPendingTasksAdmin extends BaseEntity {} +export class LoginPendingTasksAdmin extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ unsigned: true, nullable: false }) + userId: number + + @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' }) + created: Date + + @Column({ type: 'datetime', nullable: false }) + date: Date + + @Column({ length: 256, nullable: true, default: null }) + note: string + + @Column({ type: 'bigint', nullable: false }) + amount: BigInt + + @Column() + moderator: number +} From 4b80507c9b885552119abcdfb7d73766cd69d6ae Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Nov 2021 10:12:57 +0100 Subject: [PATCH 018/165] Change the database version in backend. --- backend/src/server/createServer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4350483ff..d5fbc20ee 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -25,7 +25,7 @@ import schema from '../graphql/schema' // TODO implement // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity"; -const DB_VERSION = '0004-login_server_data' +const DB_VERSION = '0005-admin_tables' const createServer = async (context: any = serverContext): Promise => { // open mysql connection From c2c03d103297ed2a348f8ec9db58dcce5343d420 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:40:49 +0100 Subject: [PATCH 019/165] implementation of createPendingCreation search for the state_user. --- backend/src/graphql/resolver/AdminResolver.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9af50faad..65419523f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,7 +1,8 @@ -import { Resolver, Query, Arg } from 'type-graphql' +import { Resolver, Query, Arg, Args } from 'type-graphql' import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { UserRepository } from '../../typeorm/repository/User' @Resolver() export class AdminResolver { @@ -23,4 +24,14 @@ export class AdminResolver { }) return users } + + @Query(() => Boolean) + async createPendingCreation( + @Args() { email, amount, note, creationDate }: CreatePendingCreationArgs, + ): Promise { + // TODO: Check user validity + const userRepository = getCustomRepository(UserRepository) + const user = await userRepository.findByEmail(email) + return true + } } From f3cd722e9fdc070dff7d35d4063c57f6b70238a2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:41:34 +0100 Subject: [PATCH 020/165] User creations logic in comments. --- backend/src/graphql/resolver/AdminResolver.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 65419523f..69a0e7c83 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -32,6 +32,13 @@ export class AdminResolver { // TODO: Check user validity const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) + // TODO: Check user open creation state (Open creation) + // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = loginUser.id + // COUNT amount from 2 tables + // if amount < 3000 => Store in pending_creations + const creations = getUserCreations(user.id) + // UserAdmin.creations() return true } } From 5f8235c7af3053a24ca0de4f4329439b20b4a1b2 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:42:05 +0100 Subject: [PATCH 021/165] Added last todo before sending success. --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 69a0e7c83..c595692c0 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -39,6 +39,7 @@ export class AdminResolver { // if amount < 3000 => Store in pending_creations const creations = getUserCreations(user.id) // UserAdmin.creations() + // TODO: Write pending creation to DB return true } } From cd12d621fe14a57f51601eb414292850df6fcafb Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 10:51:40 +0100 Subject: [PATCH 022/165] Methode to get user creations. --- backend/src/graphql/resolver/AdminResolver.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index c595692c0..7a0872258 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -33,13 +33,17 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) - // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat - // SELECT * FROM pending_creations WHERE userId = loginUser.id - // COUNT amount from 2 tables - // if amount < 3000 => Store in pending_creations const creations = getUserCreations(user.id) // UserAdmin.creations() // TODO: Write pending creation to DB return true } } + +function getUserCreations(id: number): Promise { + // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = loginUser.id + // COUNT amount from 2 tables + // if amount < 3000 => Store in pending_creations + throw new Error('Function not implemented.') +} From e011d0a803c8af44dfd9aa06694862cf6e44d478 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:09:13 +0100 Subject: [PATCH 023/165] Implemented the arguments for graphql. --- .../src/graphql/arg/CreatePendingCreationArgs.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 backend/src/graphql/arg/CreatePendingCreationArgs.ts diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts new file mode 100644 index 000000000..89b1e8c26 --- /dev/null +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -0,0 +1,16 @@ +import { ArgsType, Field } from 'type-graphql' + +@ArgsType() +export default class CreatePendingCreationArgs { + @Field(() => String) + email: string + + @Field(() => Number) + amount: number + + @Field(() => String) + note: string + + @Field(() => Date) + creationDate: Date +} From 048d75f167c7be34ddf773ac375cfb007c755e30 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:09:53 +0100 Subject: [PATCH 024/165] Added a default random value for the last three creations. --- backend/src/graphql/resolver/AdminResolver.ts | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 7a0872258..e63cc6efe 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,6 +3,7 @@ import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { UserRepository } from '../../typeorm/repository/User' +import { CreatePendingCreationArgs } from '../arg/CreatePendingCreationArgs' @Resolver() export class AdminResolver { @@ -15,11 +16,7 @@ export class AdminResolver { user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = [ - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, - ] + user.creation = getUserCreations(loginUser.id) return user }) return users @@ -33,17 +30,27 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) - const creations = getUserCreations(user.id) - // UserAdmin.creations() - // TODO: Write pending creation to DB - return true + const creations = await getUserCreations(user.id) + if (isCreationValid(creations, amount, creationDate)) { + // UserAdmin.creations() + // TODO: Write pending creation to DB + } + return false } } function getUserCreations(id: number): Promise { - // SELECT * FROM transaction_creations WHERE state_user_id = loginUser.id AND target_date > Date - 2 Monat - // SELECT * FROM pending_creations WHERE userId = loginUser.id + // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monat + // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations - throw new Error('Function not implemented.') + return [ + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + (Math.floor(Math.random() * 50) + 1) * 20, + ] +} + +function isCreationValid(creations: number[], amount: any, creationDate: any) { + return true } From 0dcceb682edd7860fea49f1d54e6e9d0e5b1e238 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:11:48 +0100 Subject: [PATCH 025/165] add function getUserCreations --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index e63cc6efe..7fd6266e1 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -40,7 +40,7 @@ export class AdminResolver { } function getUserCreations(id: number): Promise { - // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monat + // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations From 4544d701fb71b93b992eee63ab49462f810ff492 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:23:21 +0100 Subject: [PATCH 026/165] Withdrew Promise --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 7fd6266e1..3536538cb 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,7 +3,7 @@ import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { UserRepository } from '../../typeorm/repository/User' -import { CreatePendingCreationArgs } from '../arg/CreatePendingCreationArgs' +import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @Resolver() export class AdminResolver { @@ -39,7 +39,7 @@ export class AdminResolver { } } -function getUserCreations(id: number): Promise { +function getUserCreations(id: number): number[] { // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables From c68386be85194ac9aff73470b61426bb80b9e0ab Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:27:22 +0100 Subject: [PATCH 027/165] Test log. --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3536538cb..c3a311f65 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -31,6 +31,7 @@ export class AdminResolver { const user = await userRepository.findByEmail(email) // TODO: Check user open creation state (Open creation) const creations = await getUserCreations(user.id) + console.log('creations', creations) if (isCreationValid(creations, amount, creationDate)) { // UserAdmin.creations() // TODO: Write pending creation to DB From ed5baeccc0cfa9c8a51fa3473a78a4169385182e Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 11:46:12 +0100 Subject: [PATCH 028/165] Implementation of the TransactionCreationRepository. --- backend/src/graphql/resolver/AdminResolver.ts | 6 +++++- backend/src/typeorm/repository/TransactionCreation.ts | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 backend/src/typeorm/repository/TransactionCreation.ts diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index c3a311f65..2d8934ffe 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -2,6 +2,7 @@ import { Resolver, Query, Arg, Args } from 'type-graphql' import { getCustomRepository } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' +import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @@ -41,7 +42,10 @@ export class AdminResolver { } function getUserCreations(id: number): number[] { - // SELECT * FROM transaction_creations WHERE state_user_id = id AND target_date > Date - 2 Monate + // SELECT count(amount) FROM transaction_creations WHERE state_user_id = id AND target_date > (NOW()-ActualDays - 2 Monate) + const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ + currentDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), + }) // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations diff --git a/backend/src/typeorm/repository/TransactionCreation.ts b/backend/src/typeorm/repository/TransactionCreation.ts new file mode 100644 index 000000000..89266838a --- /dev/null +++ b/backend/src/typeorm/repository/TransactionCreation.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { TransactionCreation } from '@entity/TransactionCreation' + +@EntityRepository(TransactionCreation) +export class TransactionCreationRepository extends Repository {} From 367122fb1b59d18d5003d5ae11eeaa82494d3d49 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 12:08:38 +0100 Subject: [PATCH 029/165] Search db for transactions. --- backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2d8934ffe..f28fb13ab 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,5 +1,5 @@ import { Resolver, Query, Arg, Args } from 'type-graphql' -import { getCustomRepository } from 'typeorm' +import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' @@ -17,7 +17,7 @@ export class AdminResolver { user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = getUserCreations(loginUser.id) + user.creation = [] // await getUserCreations(loginUser.id) return user }) return users @@ -41,11 +41,13 @@ export class AdminResolver { } } -function getUserCreations(id: number): number[] { +async function getUserCreations(id: number): Promise { // SELECT count(amount) FROM transaction_creations WHERE state_user_id = id AND target_date > (NOW()-ActualDays - 2 Monate) const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ - currentDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), + userId: id, + targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), }) + console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations From b5baa9d8830bf1d3306ceaeaf09ddf0b1b084d5b Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 12:29:49 +0100 Subject: [PATCH 030/165] Added PendingCreationRepository and added find all pending creations. --- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++++++--- backend/src/typeorm/repository/PendingCreation.ts | 5 +++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 backend/src/typeorm/repository/PendingCreation.ts diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f28fb13ab..8cdd78535 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,6 +3,7 @@ import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' +import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @@ -12,7 +13,7 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = loginUsers.map((loginUser) => { + const users = gloginUsers.map((loginUser) => { const user = new UserAdmin() user.firstName = loginUser.firstName user.lastName = loginUser.lastName @@ -42,13 +43,18 @@ export class AdminResolver { } async function getUserCreations(id: number): Promise { - // SELECT count(amount) FROM transaction_creations WHERE state_user_id = id AND target_date > (NOW()-ActualDays - 2 Monate) + // TODO: NOW()-ActualDays - 2 Monate const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ userId: id, - targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), + targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), }) console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id + const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ + userId: id, + date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), + }) + console.log('pendingCreations', pendingCreations^) // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations return [ diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts new file mode 100644 index 000000000..dbe589e37 --- /dev/null +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { PendingCreation } from '@entity/PendingCreation' + +@EntityRepository(LoginUserBackup) +export class PendingCreationRepository extends Repository {} From 725ab91c4901b045226e5479103a4a1f5e89060b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 12:37:28 +0100 Subject: [PATCH 031/165] Test other author. --- backend/src/typeorm/repository/PendingCreation.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts index dbe589e37..95470a4fe 100644 --- a/backend/src/typeorm/repository/PendingCreation.ts +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -2,4 +2,6 @@ import { EntityRepository, Repository } from 'typeorm' import { PendingCreation } from '@entity/PendingCreation' @EntityRepository(LoginUserBackup) -export class PendingCreationRepository extends Repository {} +export class PendingCreationRepository extends Repository { + // TODO: git commit --author="Hannes Heine " +} \ No newline at end of file From bb5e2361d458dfab791cd29b23ecbac0fe7e3718 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:06:38 +0100 Subject: [PATCH 032/165] Withdrew test commit. --- backend/src/typeorm/repository/PendingCreation.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts index 95470a4fe..dbe589e37 100644 --- a/backend/src/typeorm/repository/PendingCreation.ts +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -2,6 +2,4 @@ import { EntityRepository, Repository } from 'typeorm' import { PendingCreation } from '@entity/PendingCreation' @EntityRepository(LoginUserBackup) -export class PendingCreationRepository extends Repository { - // TODO: git commit --author="Hannes Heine " -} \ No newline at end of file +export class PendingCreationRepository extends Repository {} From 1a0c0907c467869ae6faf4393f3f8c85146870fe Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:09:30 +0100 Subject: [PATCH 033/165] Corrected. --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8cdd78535..36e31c21e 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -13,7 +13,7 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = gloginUsers.map((loginUser) => { + const users = loginUsers.map((loginUser) => { const user = new UserAdmin() user.firstName = loginUser.firstName user.lastName = loginUser.lastName @@ -54,7 +54,7 @@ async function getUserCreations(id: number): Promise { userId: id, date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), }) - console.log('pendingCreations', pendingCreations^) + console.log('pendingCreations', pendingCreations) // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations return [ From 92b2dcf6b60ec446f50f60c08666dcd8149a7ace Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:10:34 +0100 Subject: [PATCH 034/165] Corrected PendingCreationRepository. --- backend/src/typeorm/repository/PendingCreation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts index dbe589e37..6985a0526 100644 --- a/backend/src/typeorm/repository/PendingCreation.ts +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -1,5 +1,5 @@ import { EntityRepository, Repository } from 'typeorm' import { PendingCreation } from '@entity/PendingCreation' -@EntityRepository(LoginUserBackup) +@EntityRepository(PendingCreation) export class PendingCreationRepository extends Repository {} From 13b533b1e264600aee36006c4e1604f74789c005 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:11:49 +0100 Subject: [PATCH 035/165] Corrected PendingCreationRepository. --- backend/src/typeorm/repository/PendingCreation.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts index 6985a0526..8b49e7ecc 100644 --- a/backend/src/typeorm/repository/PendingCreation.ts +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -1,5 +1,5 @@ import { EntityRepository, Repository } from 'typeorm' -import { PendingCreation } from '@entity/PendingCreation' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' -@EntityRepository(PendingCreation) -export class PendingCreationRepository extends Repository {} +@EntityRepository(LoginPendingTasksAdmin) +export class PendingCreationRepository extends Repository {} From 6a152a8791612a2c08ea16325f75819b2f388df0 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:31:27 +0100 Subject: [PATCH 036/165] Change query to query builder. --- backend/src/graphql/resolver/AdminResolver.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 36e31c21e..089ce870d 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -44,10 +44,14 @@ export class AdminResolver { async function getUserCreations(id: number): Promise { // TODO: NOW()-ActualDays - 2 Monate - const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ - userId: id, - targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - }) + // const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ + // userId: id, + // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), + // }) + const transactionCreations = await getCustomRepository(TransactionCreationRepository) + .createQueryBuilder() + .select(['SUM(login_pending_tasks_admin.amount)']) + .where('login_pending_tasks_admin.userId = :id', { id }) console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ @@ -55,6 +59,12 @@ async function getUserCreations(id: number): Promise { date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), }) console.log('pendingCreations', pendingCreations) + // const createdAmountBeforeLastMonth = transactionCreations.forEach(element => { + // element.targetDate + // }) + // const createdAmountLastMonth = ... + // const createdAmountCurrentMonth = ... + // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations return [ From 76b372fb645dbbd1fd4ecaeae778c0351a1c5472 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:34:08 +0100 Subject: [PATCH 037/165] Change query to query builder. to get many --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 089ce870d..48c6af226 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -52,6 +52,7 @@ async function getUserCreations(id: number): Promise { .createQueryBuilder() .select(['SUM(login_pending_tasks_admin.amount)']) .where('login_pending_tasks_admin.userId = :id', { id }) + .getMany() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ From 7a27bf52bf7343c9395c111f97cf23707b8ba4f2 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:35:31 +0100 Subject: [PATCH 038/165] Change query to query builder withdrew table name. --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 48c6af226..9e296d92f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -50,8 +50,8 @@ async function getUserCreations(id: number): Promise { // }) const transactionCreations = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder() - .select(['SUM(login_pending_tasks_admin.amount)']) - .where('login_pending_tasks_admin.userId = :id', { id }) + .select(['SUM(amount)']) + .where('userId = :id', { id }) .getMany() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id From db609d1d7833bca80877373d2294e0d1f7eae5d9 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:36:42 +0100 Subject: [PATCH 039/165] Change query to query bui. --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9e296d92f..1cc034366 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -51,7 +51,7 @@ async function getUserCreations(id: number): Promise { const transactionCreations = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder() .select(['SUM(amount)']) - .where('userId = :id', { id }) + .where('login_pending_tasks_admin.userId = :id', { id }) .getMany() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id From cadec27c9a201137c5e8de3d2314e4811fb20719 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:38:30 +0100 Subject: [PATCH 040/165] Reintroduced table name --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 1cc034366..84d5ef7c8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -49,8 +49,8 @@ async function getUserCreations(id: number): Promise { // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) const transactionCreations = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder() - .select(['SUM(amount)']) + .createQueryBuilder('login_pending_tasks_admin') + .select(['SUM(login_pending_tasks_admin.amount)']) .where('login_pending_tasks_admin.userId = :id', { id }) .getMany() console.log('transactionCreations', transactionCreations) From 00abbb4413b834fa3394c4624abe1decac5ce80f Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:43:01 +0100 Subject: [PATCH 041/165] Add console log of query and id --- backend/src/graphql/resolver/AdminResolver.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 84d5ef7c8..78a684000 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -48,11 +48,12 @@ async function getUserCreations(id: number): Promise { // userId: id, // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) - const transactionCreations = await getCustomRepository(TransactionCreationRepository) + const transactionCreationsQuery = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('login_pending_tasks_admin') - .select(['SUM(login_pending_tasks_admin.amount)']) + .select(['SUM(login_pending_tasks_admin.amount) as summe']) .where('login_pending_tasks_admin.userId = :id', { id }) - .getMany() + console.log('transactionCreationsQuery', transactionCreationsQuery, id) + const transactionCreations = transactionCreationsQuery.getMany() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ From 1112b538ea4d085c5dad73ce5696768b5599c05d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:45:07 +0100 Subject: [PATCH 042/165] Addawait to get the datas --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 78a684000..da4d9b4fb 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -53,7 +53,7 @@ async function getUserCreations(id: number): Promise { .select(['SUM(login_pending_tasks_admin.amount) as summe']) .where('login_pending_tasks_admin.userId = :id', { id }) console.log('transactionCreationsQuery', transactionCreationsQuery, id) - const transactionCreations = transactionCreationsQuery.getMany() + const transactionCreations = await transactionCreationsQuery.getMany() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ From 16aef73adc9278184db7f4e2319a300acbb0936b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:49:35 +0100 Subject: [PATCH 043/165] Addawait --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index da4d9b4fb..382f179c0 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -50,10 +50,10 @@ async function getUserCreations(id: number): Promise { // }) const transactionCreationsQuery = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('login_pending_tasks_admin') - .select(['SUM(login_pending_tasks_admin.amount) as summe']) + .select(['SUM(login_pending_tasks_admin.amount)', 'sum']) .where('login_pending_tasks_admin.userId = :id', { id }) console.log('transactionCreationsQuery', transactionCreationsQuery, id) - const transactionCreations = await transactionCreationsQuery.getMany() + const transactionCreations = await transactionCreationsQuery.getRawOne() console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ From 53adaf49ee6e5020eeb9ce25c45fcd2ae3871b9d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:51:45 +0100 Subject: [PATCH 044/165] Change Query select --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 382f179c0..09b89d6cf 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -50,7 +50,7 @@ async function getUserCreations(id: number): Promise { // }) const transactionCreationsQuery = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('login_pending_tasks_admin') - .select(['SUM(login_pending_tasks_admin.amount)', 'sum']) + .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) console.log('transactionCreationsQuery', transactionCreationsQuery, id) const transactionCreations = await transactionCreationsQuery.getRawOne() From 7abf1e4c4400452cc3a445c491dea16897b50076 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 13:54:37 +0100 Subject: [PATCH 045/165] Add where date > 2 month --- backend/src/graphql/resolver/AdminResolver.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 09b89d6cf..5c8f60a34 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -52,6 +52,9 @@ async function getUserCreations(id: number): Promise { .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) console.log('transactionCreationsQuery', transactionCreationsQuery, id) const transactionCreations = await transactionCreationsQuery.getRawOne() console.log('transactionCreations', transactionCreations) From e825184b4d8d3b772cdcbdb83499790e4131ff53 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:09:59 +0100 Subject: [PATCH 046/165] Divide the call to get the last --- backend/src/graphql/resolver/AdminResolver.ts | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 5c8f60a34..48c87e14f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -48,25 +48,36 @@ async function getUserCreations(id: number): Promise { // userId: id, // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) - const transactionCreationsQuery = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('login_pending_tasks_admin') - .select('SUM(login_pending_tasks_admin.amount)', 'sum') - .where('login_pending_tasks_admin.userId = :id', { id }) - .andWhere({ - targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + const findAllUserTransactionCreations = await getCustomRepository(TransactionCreationRepository) + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + const transactionCreationsBeforeLastMonthQuery = findAllUserTransactionCreations.andWhere({ + targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - console.log('transactionCreationsQuery', transactionCreationsQuery, id) - const transactionCreations = await transactionCreationsQuery.getRawOne() - console.log('transactionCreations', transactionCreations) + const createdAmountBeforeLastMonth = await transactionCreationsBeforeLastMonthQuery.getRawOne() + console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) + + const transactionCreationsLastMonthQuery = await findAllUserTransactionCreations.andWhere({ + targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + const createdAmountLastMonth = await transactionCreationsLastMonthQuery.getRawOne() + console.log('createdAmountLastMonth', createdAmountLastMonth) + + const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ + targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + const createdAmountMonth = await transactionCreationsMonthQuery.getRawOne() + console.log('createdAmountMonth', createdAmountMonth) + // const transactionCreationsLastThreeMonth = await transactionCreationsQuery.getRawOne() + // console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ userId: id, date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), }) console.log('pendingCreations', pendingCreations) - // const createdAmountBeforeLastMonth = transactionCreations.forEach(element => { - // element.targetDate - // }) + // const createdAmountLastMonth = ... // const createdAmountCurrentMonth = ... From 735a47779f513582a12613cba7aa3abe07a02950 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:13:22 +0100 Subject: [PATCH 047/165] Prepare complete query --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 48c87e14f..d36816215 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -52,10 +52,10 @@ async function getUserCreations(id: number): Promise { .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) - const transactionCreationsBeforeLastMonthQuery = findAllUserTransactionCreations.andWhere({ + .andWhere({ targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - const createdAmountBeforeLastMonth = await transactionCreationsBeforeLastMonthQuery.getRawOne() + const createdAmountBeforeLastMonth = await findAllUserTransactionCreations.getRawOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) const transactionCreationsLastMonthQuery = await findAllUserTransactionCreations.andWhere({ From 9193eeb6a8a46cefe335e1aa68da26e1602d27dd Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:23:32 +0100 Subject: [PATCH 048/165] Change calls to have query for last three months. --- backend/src/graphql/resolver/AdminResolver.ts | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index d36816215..9944e726c 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -48,27 +48,41 @@ async function getUserCreations(id: number): Promise { // userId: id, // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) - const findAllUserTransactionCreations = await getCustomRepository(TransactionCreationRepository) + const createdAmountBeforeLastMonth = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - const createdAmountBeforeLastMonth = await findAllUserTransactionCreations.getRawOne() + .getRawOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) - - const transactionCreationsLastMonthQuery = await findAllUserTransactionCreations.andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - }) - const createdAmountLastMonth = await transactionCreationsLastMonthQuery.getRawOne() + + const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() console.log('createdAmountLastMonth', createdAmountLastMonth) - const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ + const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - const createdAmountMonth = await transactionCreationsMonthQuery.getRawOne() + .getRawOne() console.log('createdAmountMonth', createdAmountMonth) + + // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ + // targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + // }) + // const createdAmountMonth = await transactionCreationsMonthQuery.getRawOne() + // console.log('createdAmountMonth', createdAmountMonth) // const transactionCreationsLastThreeMonth = await transactionCreationsQuery.getRawOne() // console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id From 3ec79608650f8fd532c6364a80630309627854b4 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:29:07 +0100 Subject: [PATCH 049/165] Withdrew table name from query builder. --- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9944e726c..2e867369f 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -49,7 +49,7 @@ async function getUserCreations(id: number): Promise { // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) const createdAmountBeforeLastMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('transaction_creations') + .createQueryBuilder() .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ @@ -57,7 +57,7 @@ async function getUserCreations(id: number): Promise { }) .getRawOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) - + const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') From 6a2a4ee64922ab0545529c9df2359f0eec608d8d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:37:42 +0100 Subject: [PATCH 050/165] Change where to >= --- backend/src/graphql/resolver/AdminResolver.ts | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2e867369f..9b49029e4 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -49,33 +49,33 @@ async function getUserCreations(id: number): Promise { // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) const createdAmountBeforeLastMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder() + .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) .getRawOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) - + const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('transaction_creations') - .select('SUM(transaction_creations.amount)', 'sum') - .where('transaction_creations.state_user_id = :id', { id }) - .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - }) - .getRawOne() + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() console.log('createdAmountLastMonth', createdAmountLastMonth) const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('transaction_creations') - .select('SUM(transaction_creations.amount)', 'sum') - .where('transaction_creations.state_user_id = :id', { id }) - .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - }) - .getRawOne() + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() console.log('createdAmountMonth', createdAmountMonth) // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ From 3cd5ab27db6685d37ad4df98f3cefe71db0258c8 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:40:22 +0100 Subject: [PATCH 051/165] Change getRawOne to getOne. --- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9b49029e4..8e0d2b3b4 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -55,7 +55,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getRawOne() + .getOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) @@ -65,7 +65,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getRawOne() + .getOne() console.log('createdAmountLastMonth', createdAmountLastMonth) const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) @@ -75,7 +75,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getRawOne() + .getOne() console.log('createdAmountMonth', createdAmountMonth) // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ From 91089c66682c867afe928d0913b5a2c67beff0b6 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:46:56 +0100 Subject: [PATCH 052/165] Change the result value to the sum value. --- backend/src/graphql/resolver/AdminResolver.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8e0d2b3b4..377a1c8a6 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -55,8 +55,8 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getOne() - console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) + .getRawOne() + console.log('createdAmountBeforeLastMonth.sum', createdAmountBeforeLastMonth.sum) const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('transaction_creations') @@ -65,8 +65,8 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getOne() - console.log('createdAmountLastMonth', createdAmountLastMonth) + .getRawOne() + console.log('createdAmountLastMonth.sum', createdAmountLastMonth.sum) const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) .createQueryBuilder('transaction_creations') @@ -75,8 +75,8 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) - .getOne() - console.log('createdAmountMonth', createdAmountMonth) + .getRawOne() + console.log('createdAmountMonth.sum', createdAmountMonth.sum) // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ // targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) From 7c0f1cfc0fb6c6e6177e2381bd0ede19b8ca8a61 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 16:04:40 +0100 Subject: [PATCH 053/165] Query Builder to get the pending creation amount of this, last and beforeLast Month --- backend/src/graphql/resolver/AdminResolver.ts | 61 ++++++++++++++----- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 377a1c8a6..92dc46ef8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -18,7 +18,7 @@ export class AdminResolver { user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = [] // await getUserCreations(loginUser.id) + user.creation = [10000000, 10000000, 10000000] // await getUserCreations(loginUser.id) return user }) return users @@ -48,7 +48,8 @@ async function getUserCreations(id: number): Promise { // userId: id, // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) - const createdAmountBeforeLastMonth = await getCustomRepository(TransactionCreationRepository) + const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) + const createdAmountBeforeLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) @@ -56,9 +57,9 @@ async function getUserCreations(id: number): Promise { targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) .getRawOne() - console.log('createdAmountBeforeLastMonth.sum', createdAmountBeforeLastMonth.sum) + console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) - const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) + const createdAmountLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) @@ -66,9 +67,9 @@ async function getUserCreations(id: number): Promise { targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) .getRawOne() - console.log('createdAmountLastMonth.sum', createdAmountLastMonth.sum) + console.log('createdAmountLastMonth.sum', Number(createdAmountLastMonth.sum)) - const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) + const createdAmountMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) @@ -76,7 +77,7 @@ async function getUserCreations(id: number): Promise { targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) .getRawOne() - console.log('createdAmountMonth.sum', createdAmountMonth.sum) + console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ // targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) @@ -86,21 +87,51 @@ async function getUserCreations(id: number): Promise { // const transactionCreationsLastThreeMonth = await transactionCreationsQuery.getRawOne() // console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id - const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ - userId: id, - date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - }) - console.log('pendingCreations', pendingCreations) + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const pendingAmountMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + .select('SUM(login_pending_tasks_admin.amount)', 'sum') + .where('login_pending_tasks_admin.userId = :id', { id }) + .andWhere({ + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() + console.log('pendingAmountMounth', Number(pendingAmountMounth.sum)) + + const pendingAmountLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + .select('SUM(login_pending_tasks_admin.amount)', 'sum') + .where('login_pending_tasks_admin.userId = :id', { id }) + .andWhere({ + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() + console.log('pendingAmountLastMounth', Number(pendingAmountLastMounth.sum)) + + const pendingAmountBeforeLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + .select('SUM(login_pending_tasks_admin.amount)', 'sum') + .where('login_pending_tasks_admin.userId = :id', { id }) + .andWhere({ + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() + console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) + // const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ + // userId: id, + // date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), + // }) + // const createdAmountLastMonth = ... // const createdAmountCurrentMonth = ... // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations + const usedCreationBeforeLastMonth = Number(createdAmountBeforeLastMonth.sum) + Number() + const usedCreationLastMonth = Number(createdAmountLastMonth.sum) + Number() + const usedCreationMonth = Number(createdAmountMonth.sum) + Number() return [ - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, - (Math.floor(Math.random() * 50) + 1) * 20, + 10000000 - usedCreationBeforeLastMonth, + 10000000 - usedCreationLastMonth, + 10000000 - usedCreationMonth, ] } From e67b724058f0e29b64a06285e1348801e15374bf Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 16:08:01 +0100 Subject: [PATCH 054/165] Calculate the usedAmount with the pending amounts. --- backend/src/graphql/resolver/AdminResolver.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 92dc46ef8..08b0f2b48 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -125,13 +125,13 @@ async function getUserCreations(id: number): Promise { // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations - const usedCreationBeforeLastMonth = Number(createdAmountBeforeLastMonth.sum) + Number() - const usedCreationLastMonth = Number(createdAmountLastMonth.sum) + Number() - const usedCreationMonth = Number(createdAmountMonth.sum) + Number() + const usedCreationBeforeLastMonth = Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum) + const usedCreationLastMonth = Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum) + const usedCreationMonth = Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum) return [ - 10000000 - usedCreationBeforeLastMonth, - 10000000 - usedCreationLastMonth, - 10000000 - usedCreationMonth, + ( 10000000 - usedCreationBeforeLastMonth ) / 1000, + ( 10000000 - usedCreationLastMonth ) / 1000, + ( 10000000 - usedCreationMonth ) / 1000, ] } From 1d612c034eeb923ec3a35bc322509d0497b49cb1 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:07:48 +0100 Subject: [PATCH 055/165] add users Promis all --- backend/src/graphql/resolver/AdminResolver.ts | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 08b0f2b48..3dcb2a639 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -13,14 +13,14 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = loginUsers.map((loginUser) => { + const users = await Promise.all(loginUsers.map(async (loginUser) => { const user = new UserAdmin() user.firstName = loginUser.firstName user.lastName = loginUser.lastName user.email = loginUser.email - user.creation = [10000000, 10000000, 10000000] // await getUserCreations(loginUser.id) + user.creation = await getUserCreations(loginUser.id) return user - }) + })) return users } @@ -44,10 +44,6 @@ export class AdminResolver { async function getUserCreations(id: number): Promise { // TODO: NOW()-ActualDays - 2 Monate - // const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ - // userId: id, - // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - // }) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') @@ -58,7 +54,7 @@ async function getUserCreations(id: number): Promise { }) .getRawOne() console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) - + const createdAmountLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') @@ -79,14 +75,6 @@ async function getUserCreations(id: number): Promise { .getRawOne() console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) - // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({ - // targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - // }) - // const createdAmountMonth = await transactionCreationsMonthQuery.getRawOne() - // console.log('createdAmountMonth', createdAmountMonth) - // const transactionCreationsLastThreeMonth = await transactionCreationsQuery.getRawOne() - // console.log('transactionCreations', transactionCreations) - // SELECT * FROM pending_creations WHERE userId = id const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingAmountMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') @@ -114,27 +102,18 @@ async function getUserCreations(id: number): Promise { }) .getRawOne() console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) - // const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ - // userId: id, - // date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), - // }) - - - // const createdAmountLastMonth = ... - // const createdAmountCurrentMonth = ... // COUNT amount from 2 tables - // if amount < 3000 => Store in pending_creations - const usedCreationBeforeLastMonth = Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum) - const usedCreationLastMonth = Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum) - const usedCreationMonth = Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum) + const usedCreationBeforeLastMonth = (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 + const usedCreationLastMonth = (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 + const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 return [ - ( 10000000 - usedCreationBeforeLastMonth ) / 1000, - ( 10000000 - usedCreationLastMonth ) / 1000, - ( 10000000 - usedCreationMonth ) / 1000, + 1000 - usedCreationBeforeLastMonth, + 1000 - usedCreationLastMonth, + 1000 - usedCreationMonth, ] } -function isCreationValid(creations: number[], amount: any, creationDate: any) { +function isCreationValid(creations: number[], amount: number, creationDate: any) { return true } From e399ce6e2721ff9a3b1cbda1922801f41da6e037 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:55:49 +0100 Subject: [PATCH 056/165] Adding moment package to backend. --- backend/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/package.json b/backend/package.json index 375046363..e573a2704 100644 --- a/backend/package.json +++ b/backend/package.json @@ -29,6 +29,7 @@ "jest": "^27.2.4", "jsonwebtoken": "^8.5.1", "module-alias": "^2.2.2", + "moment": "^2.29.1", "mysql2": "^2.3.0", "nodemailer": "^6.6.5", "random-bigint": "^0.0.1", From c801d7c07c880120a4f14aa8bf90dd77421aa034 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:56:21 +0100 Subject: [PATCH 057/165] Adding moment package to backend in yarn lock. --- backend/yarn.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/yarn.lock b/backend/yarn.lock index 5b74ba7c3..b46bc183d 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -4139,6 +4139,11 @@ module-alias@^2.2.2: resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== +moment@^2.29.1: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" From 72f06ede08dea47c945c9da20ad08d32f7e6879f Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 08:57:40 +0100 Subject: [PATCH 058/165] Change the date calculation so we get the three last month and next month as string and search with this values. --- admin/src/components/CreationFormular.vue | 6 +- backend/src/graphql/resolver/AdminResolver.ts | 77 ++++++++++++++----- 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index d6b637152..09c42378c 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -163,15 +163,15 @@ export default { rangeMax: 1000, currentMonth: { short: this.$moment().format('MMMM'), - long: this.$moment().format('DD/MM/YYYY'), + long: this.$moment().format('YYYY-MM-DD'), }, lastMonth: { short: this.$moment().subtract(1, 'month').format('MMMM'), - long: this.$moment().subtract(1, 'month').format('DD/MM/YYYY'), + long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01', }, beforeLastMonth: { short: this.$moment().subtract(2, 'month').format('MMMM'), - long: this.$moment().subtract(2, 'month').format('DD/MM/YYYY'), + long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01', }, submitObj: null, isdisabled: true, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3dcb2a639..2864c06fd 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -6,6 +6,7 @@ import { TransactionCreationRepository } from '../../typeorm/repository/Transact import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' +import moment from 'moment' @Resolver() export class AdminResolver { @@ -13,14 +14,16 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = await Promise.all(loginUsers.map(async (loginUser) => { - const user = new UserAdmin() - user.firstName = loginUser.firstName - user.lastName = loginUser.lastName - user.email = loginUser.email - user.creation = await getUserCreations(loginUser.id) - return user - })) + const users = await Promise.all( + loginUsers.map(async (loginUser) => { + const user = new UserAdmin() + user.firstName = loginUser.firstName + user.lastName = loginUser.lastName + user.email = loginUser.email + user.creation = await getUserCreations(loginUser.id) + return user + }), + ) return users } @@ -44,13 +47,24 @@ export class AdminResolver { async function getUserCreations(id: number): Promise { // TODO: NOW()-ActualDays - 2 Monate + // const actualDate = new Date() + const dateNextMonth = moment().add(1, 'month').format('YYYY-MM') + '-01' + const dateMonth = moment().format('YYYY-MM') + '-01' + const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' + const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' + + console.log('Searching creation amount for: ', dateNextMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) + const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateBeforeLastMonth, // DATE + enddate: dateLastMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) @@ -60,7 +74,10 @@ async function getUserCreations(id: number): Promise { .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateLastMonth, + enddate: dateMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountLastMonth.sum', Number(createdAmountLastMonth.sum)) @@ -70,43 +87,61 @@ async function getUserCreations(id: number): Promise { .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: dateMonth, + enddate: dateNextMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) const pendingCreationRepository = getCustomRepository(PendingCreationRepository) - const pendingAmountMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-11-01', + enddate: '2021-12-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('pendingAmountMounth', Number(pendingAmountMounth.sum)) - const pendingAmountLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountLastMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-10-01', + enddate: '2021-11-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() console.log('pendingAmountLastMounth', Number(pendingAmountLastMounth.sum)) - const pendingAmountBeforeLastMounth = await pendingCreationRepository.createQueryBuilder('login_pending_tasks_admin') + const pendingAmountBeforeLastMounth = await pendingCreationRepository + .createQueryBuilder('login_pending_tasks_admin') .select('SUM(login_pending_tasks_admin.amount)', 'sum') .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ - date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { + date: '2021-09-01', + enddate: '2021-10-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + }), }) .getRawOne() - console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) + console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) // COUNT amount from 2 tables - const usedCreationBeforeLastMonth = (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 - const usedCreationLastMonth = (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 - const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 + const usedCreationBeforeLastMonth = + (Number(createdAmountBeforeLastMonth.sum) + Number(pendingAmountBeforeLastMounth.sum)) / 10000 + const usedCreationLastMonth = + (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 + const usedCreationMonth = + (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 return [ 1000 - usedCreationBeforeLastMonth, 1000 - usedCreationLastMonth, From 1c96161401c7f0153f3d03b9571ca342ad9b14e7 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 09:22:49 +0100 Subject: [PATCH 059/165] Replaced fix dates from pending queries to the calculated dates, withdrew comments. --- backend/src/graphql/resolver/AdminResolver.ts | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2864c06fd..6a18661d8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -46,13 +46,10 @@ export class AdminResolver { } async function getUserCreations(id: number): Promise { - // TODO: NOW()-ActualDays - 2 Monate - // const actualDate = new Date() const dateNextMonth = moment().add(1, 'month').format('YYYY-MM') + '-01' const dateMonth = moment().format('YYYY-MM') + '-01' const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' - console.log('Searching creation amount for: ', dateNextMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) @@ -62,8 +59,8 @@ async function getUserCreations(id: number): Promise { .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: dateBeforeLastMonth, // DATE - enddate: dateLastMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateBeforeLastMonth, + enddate: dateLastMonth, }), }) .getRawOne() @@ -76,7 +73,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: dateLastMonth, - enddate: dateMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + enddate: dateMonth, }), }) .getRawOne() @@ -89,7 +86,7 @@ async function getUserCreations(id: number): Promise { .andWhere({ targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: dateMonth, - enddate: dateNextMonth /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + enddate: dateNextMonth, }), }) .getRawOne() @@ -102,8 +99,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-11-01', - enddate: '2021-12-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateMonth, + enddate: dateNextMonth, }), }) .getRawOne() @@ -115,8 +112,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-10-01', - enddate: '2021-11-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateLastMonth, + enddate: dateMonth, }), }) .getRawOne() @@ -128,8 +125,8 @@ async function getUserCreations(id: number): Promise { .where('login_pending_tasks_admin.userId = :id', { id }) .andWhere({ date: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { - date: '2021-09-01', - enddate: '2021-10-01' /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */, + date: dateBeforeLastMonth, + enddate: dateLastMonth, }), }) .getRawOne() From 13a21b5a29e178ecb5b21d0d5c7dd37cf42db97e Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 25 Nov 2021 09:25:20 +0100 Subject: [PATCH 060/165] add disabled radio button when creation 0 --- admin/src/components/CreationFormular.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 09c42378c..a3dc9b58f 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -24,6 +24,7 @@ @@ -34,6 +35,7 @@ @@ -44,6 +46,7 @@ From ead93b98fdfdd7b36d89750b074acfde8205c900 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 09:54:22 +0100 Subject: [PATCH 061/165] Implemented check if creation is allowed. --- backend/src/graphql/resolver/AdminResolver.ts | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 6a18661d8..b9fc5d8f4 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -40,6 +40,7 @@ export class AdminResolver { if (isCreationValid(creations, amount, creationDate)) { // UserAdmin.creations() // TODO: Write pending creation to DB + } else { } return false } @@ -50,7 +51,13 @@ async function getUserCreations(id: number): Promise { const dateMonth = moment().format('YYYY-MM') + '-01' const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' - console.log('Searching creation amount for: ', dateNextMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) + console.log( + 'Searching creation amount for: ', + dateNextMonth, + dateMonth, + dateLastMonth, + dateBeforeLastMonth, + ) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository @@ -139,6 +146,9 @@ async function getUserCreations(id: number): Promise { (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 + console.log('1000 - usedCreationBeforeLastMonth', 1000 - usedCreationBeforeLastMonth) + console.log('1000 - usedCreationLastMonth', 1000 - usedCreationLastMonth) + console.log('1000 - usedCreationMonth', 1000 - usedCreationMonth) return [ 1000 - usedCreationBeforeLastMonth, 1000 - usedCreationLastMonth, @@ -147,5 +157,29 @@ async function getUserCreations(id: number): Promise { } function isCreationValid(creations: number[], amount: number, creationDate: any) { + const dateMonth = moment().format('YYYY-MM') + const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + // moment() + const creationDateMonth = moment(creationDate).format('YYYY-MM') + console.log('CHECK: ', creationDateMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) + let openCreation + switch (creationDateMonth) { + case dateMonth: + openCreation = creations[2] + break + case dateLastMonth: + openCreation = creations[1] + break + case dateBeforeLastMonth: + openCreation = creations[0] + break + default: + throw new Error('CreationDate is not in last three months') + } + console.log('creation >= amount', openCreation >= amount, openCreation, amount) + if (openCreation < amount) { + throw new Error(`Open creation (${openCreation}) is less than amount (${amount})`) + } return true } From 03cb7fa5588e254e8afd44fdb990b932487f6fb8 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 10:15:34 +0100 Subject: [PATCH 062/165] Create entry in LoginPendingTaskAdmin table. Save creation in database. --- .../src/graphql/arg/CreatePendingCreationArgs.ts | 3 +++ backend/src/graphql/resolver/AdminResolver.ts | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts index 89b1e8c26..a263c9b07 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -13,4 +13,7 @@ export default class CreatePendingCreationArgs { @Field(() => Date) creationDate: Date + + @Field(() => Number) + moderator: number } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index b9fc5d8f4..ad8bd813e 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -29,7 +29,7 @@ export class AdminResolver { @Query(() => Boolean) async createPendingCreation( - @Args() { email, amount, note, creationDate }: CreatePendingCreationArgs, + @Args() { email, amount, note, creationDate, moderator }: CreatePendingCreationArgs, ): Promise { // TODO: Check user validity const userRepository = getCustomRepository(UserRepository) @@ -40,7 +40,16 @@ export class AdminResolver { if (isCreationValid(creations, amount, creationDate)) { // UserAdmin.creations() // TODO: Write pending creation to DB - } else { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const loginPendingTaskAdmin = pendingCreationRepository.create() + loginPendingTaskAdmin.userId = user.id + loginPendingTaskAdmin.amount = BigInt(amount * 10000) + loginPendingTaskAdmin.created = new Date() + loginPendingTaskAdmin.date = new Date(creationDate) + loginPendingTaskAdmin.note = note + loginPendingTaskAdmin.moderator = moderator + + pendingCreationRepository.save(loginPendingTaskAdmin) } return false } From b8e3c9a3764ba5dd3c0c1a7e1405515572c3ee4f Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 10:18:41 +0100 Subject: [PATCH 063/165] change formular store moderation information, change SubmitObject --- admin/src/components/CreationFormular.vue | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index a3dc9b58f..babff9609 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -233,10 +233,12 @@ export default { this.submitObj = [ { item: this.itemsMassCreation, - datum: this.radioSelected, + email: this.item.email, + creationDate: this.radioSelected.long, amount: this.value, - text: this.text, - moderator: this.$store.state.moderator, + note: this.text, + moderator: this.$store.state.moderator.id, + }, ] alert('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder') @@ -252,15 +254,13 @@ export default { // hinweis das eine einzelne schöpfung ausgeführt wird an (Vorname) alert('SUBMIT CREATION => ' + this.type + ' >> für ' + this.item.firstName + '') // erstellen eines Arrays (submitObj) mit allen Daten - this.submitObj = [ - { - item: this.item, - datum: this.radioSelected.long, - amount: this.value, - text: this.text, - moderator: this.$store.state.moderator, - }, - ] + this.submitObj = { + email: this.item.email, + creationDate: this.radioSelected.long, + amount: this.value, + note: this.text, + moderator: this.$store.state.moderator.id, + } if (this.pagetype === 'PageCreationConfirm') { // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email) From 45b61547cc4e50506087d3a69c61ba75c4d613ed Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 10:21:30 +0100 Subject: [PATCH 064/165] change store moderation information --- admin/src/store/store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 754c559c8..c2ed1ca83 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -35,7 +35,7 @@ const store = new Vuex.Store({ ], state: { token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null, - moderator: 'Dertest Moderator', + moderator: { name: 'Dertest Moderator', id: -1 }, openCreations: 0, }, // Syncronous mutation of the state From 4f61af06aa52e6666fec8bb28fafaadde2e9832e Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 10:22:42 +0100 Subject: [PATCH 065/165] Withdrew console.logs and changed creationDate type from any to Date. --- backend/src/graphql/resolver/AdminResolver.ts | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ad8bd813e..9358dd0d2 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -31,15 +31,12 @@ export class AdminResolver { async createPendingCreation( @Args() { email, amount, note, creationDate, moderator }: CreatePendingCreationArgs, ): Promise { - // TODO: Check user validity const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - // TODO: Check user open creation state (Open creation) + const creations = await getUserCreations(user.id) - console.log('creations', creations) + if (isCreationValid(creations, amount, creationDate)) { - // UserAdmin.creations() - // TODO: Write pending creation to DB const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const loginPendingTaskAdmin = pendingCreationRepository.create() loginPendingTaskAdmin.userId = user.id @@ -60,13 +57,6 @@ async function getUserCreations(id: number): Promise { const dateMonth = moment().format('YYYY-MM') + '-01' const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') + '-01' const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') + '-01' - console.log( - 'Searching creation amount for: ', - dateNextMonth, - dateMonth, - dateLastMonth, - dateBeforeLastMonth, - ) const transactionCreationRepository = getCustomRepository(TransactionCreationRepository) const createdAmountBeforeLastMonth = await transactionCreationRepository @@ -80,7 +70,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('createdAmountBeforeLastMonth.sum', Number(createdAmountBeforeLastMonth.sum)) const createdAmountLastMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') @@ -93,7 +82,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('createdAmountLastMonth.sum', Number(createdAmountLastMonth.sum)) const createdAmountMonth = await transactionCreationRepository .createQueryBuilder('transaction_creations') @@ -106,7 +94,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('createdAmountMonth.sum', Number(createdAmountMonth.sum)) const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingAmountMounth = await pendingCreationRepository @@ -120,7 +107,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('pendingAmountMounth', Number(pendingAmountMounth.sum)) const pendingAmountLastMounth = await pendingCreationRepository .createQueryBuilder('login_pending_tasks_admin') @@ -133,7 +119,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('pendingAmountLastMounth', Number(pendingAmountLastMounth.sum)) const pendingAmountBeforeLastMounth = await pendingCreationRepository .createQueryBuilder('login_pending_tasks_admin') @@ -146,7 +131,6 @@ async function getUserCreations(id: number): Promise { }), }) .getRawOne() - console.log('pendingAmountBeforeLastMounth', Number(pendingAmountBeforeLastMounth.sum)) // COUNT amount from 2 tables const usedCreationBeforeLastMonth = @@ -155,9 +139,6 @@ async function getUserCreations(id: number): Promise { (Number(createdAmountLastMonth.sum) + Number(pendingAmountLastMounth.sum)) / 10000 const usedCreationMonth = (Number(createdAmountMonth.sum) + Number(pendingAmountMounth.sum)) / 10000 - console.log('1000 - usedCreationBeforeLastMonth', 1000 - usedCreationBeforeLastMonth) - console.log('1000 - usedCreationLastMonth', 1000 - usedCreationLastMonth) - console.log('1000 - usedCreationMonth', 1000 - usedCreationMonth) return [ 1000 - usedCreationBeforeLastMonth, 1000 - usedCreationLastMonth, @@ -165,13 +146,12 @@ async function getUserCreations(id: number): Promise { ] } -function isCreationValid(creations: number[], amount: number, creationDate: any) { +function isCreationValid(creations: number[], amount: number, creationDate: Date) { const dateMonth = moment().format('YYYY-MM') const dateLastMonth = moment().subtract(1, 'month').format('YYYY-MM') const dateBeforeLastMonth = moment().subtract(2, 'month').format('YYYY-MM') - // moment() const creationDateMonth = moment(creationDate).format('YYYY-MM') - console.log('CHECK: ', creationDateMonth, dateMonth, dateLastMonth, dateBeforeLastMonth) + let openCreation switch (creationDateMonth) { case dateMonth: @@ -186,7 +166,7 @@ function isCreationValid(creations: number[], amount: number, creationDate: any) default: throw new Error('CreationDate is not in last three months') } - console.log('creation >= amount', openCreation >= amount, openCreation, amount) + if (openCreation < amount) { throw new Error(`Open creation (${openCreation}) is less than amount (${amount})`) } From ade3719c33282874f3f3b0ad0ce4dca981c53a51 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 10:55:12 +0100 Subject: [PATCH 066/165] Changed the response to array of openCreations. --- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 9358dd0d2..a380390c8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -27,10 +27,10 @@ export class AdminResolver { return users } - @Query(() => Boolean) + @Query(() => [Number]) async createPendingCreation( @Args() { email, amount, note, creationDate, moderator }: CreatePendingCreationArgs, - ): Promise { + ): Promise { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) @@ -48,7 +48,7 @@ export class AdminResolver { pendingCreationRepository.save(loginPendingTaskAdmin) } - return false + return await getUserCreations(user.id) } } From d04fcc928024cd5274843c26f2be1ff81e4de436 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 10:57:46 +0100 Subject: [PATCH 067/165] Document release --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index ead54701c..a5060ffef 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,21 @@ We are currently restructuring the service to reduce dependencies and unify busi Once you have `docker-compose` up and running, you can open [http://localhost/vue](http://localhost/vue) and create yourself a new wallet account. +## How to release + +A release is tagged on Github by its version number and published as github release. This is done automatically when a new version is defined in the [package.json](./package.json) and merged into master - furthermore we set all our sub-package-versions to the same version as the main package.json version to make version management as simple as possible. +Each release is accompanied with release notes automatically generated from the git log which is available as [CHANGELOG.md](./CHANGELOG.md). + +To generate the Changelog and set a new Version you should use the following commands in the main folder +```bash +git fetch --all +yarn release +``` + +The first command `git fetch --all` will make sure you have all tags previously defined which is required to generate a correct changelog. The second command `yarn release` will execute the changelog tool and set version numbers in the main package and sub-packages. It is required to do `yarn install` before you can use this command. +After generating a new version you should commit the changes. This will be the CHANGELOG.md and several package.json files. This commit will be omitted in the changelog. + +Note: The Changelog will be regenerated with all tags on release on the external builder tool, but will not be checked in there. The Changelog on the github release will therefore always be correct, on the repo it might be incorrect due to missing tags when executing the `yarn release` command. ## Troubleshooting | Problem | Issue | Solution | Description | From 995abc53be46aaaa8e281a213d69090a0cbbe0f3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 11:00:03 +0100 Subject: [PATCH 068/165] missing newline --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a5060ffef..ce8e84df0 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ The first command `git fetch --all` will make sure you have all tags previously After generating a new version you should commit the changes. This will be the CHANGELOG.md and several package.json files. This commit will be omitted in the changelog. Note: The Changelog will be regenerated with all tags on release on the external builder tool, but will not be checked in there. The Changelog on the github release will therefore always be correct, on the repo it might be incorrect due to missing tags when executing the `yarn release` command. + ## Troubleshooting | Problem | Issue | Solution | Description | From 030c94acedd9db1054d534b646ce3d3cff9f5ac3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 25 Nov 2021 11:03:25 +0100 Subject: [PATCH 069/165] add admin to the release script --- scripts/release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/release.sh b/scripts/release.sh index d18c4948c..0b70e76ad 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -6,6 +6,7 @@ PROJECT_DIR="${SCRIPT_DIR}/../" FRONTEND_DIR="${PROJECT_DIR}/frontend/" BACKEND_DIR="${PROJECT_DIR}/backend/" DATABASE_DIR="${PROJECT_DIR}/database/" +ADMIN_DIR="${PROJECT_DIR}/admin/" # navigate to project directory cd ${PROJECT_DIR} @@ -23,6 +24,8 @@ cd ${BACKEND_DIR} yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION} cd ${DATABASE_DIR} yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION} +cd ${ADMIN_DIR} +yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version ${VERSION} # generate changelog cd ${PROJECT_DIR} From 4d57487f8f1b666c41fa61f80bbe9a658b48bb84 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 25 Nov 2021 11:56:15 +0100 Subject: [PATCH 070/165] get things working again --- backend/src/graphql/directive/isAuthorized.ts | 3 --- backend/src/graphql/model/User.ts | 20 ++++++++++--------- .../LoginUserBackup.ts | 3 +++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index d72f19456..079e8e88c 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -2,9 +2,6 @@ import { AuthChecker } from 'type-graphql' -import CONFIG from '../../config' -import { apiGet } from '../../apis/HttpRequest' - import decode from '../../jwt/decode' import encode from '../../jwt/encode' diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index 08651ae17..5b7682e01 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -10,15 +10,17 @@ export class User { @PrimaryGeneratedColumn() id: number */ - constructor(json: any) { - this.email = json.email - this.firstName = json.first_name - this.lastName = json.last_name - this.username = json.username - this.description = json.description - this.pubkey = json.public_hex - this.language = json.language - this.publisherId = json.publisher_id + constructor(json?: any) { + if (json) { + this.email = json.email + this.firstName = json.first_name + this.lastName = json.last_name + this.username = json.username + this.description = json.description + this.pubkey = json.public_hex + this.language = json.language + this.publisherId = json.publisher_id + } } @Field(() => String) diff --git a/database/entity/0003-login_server_tables/LoginUserBackup.ts b/database/entity/0003-login_server_tables/LoginUserBackup.ts index 0f8cf78a9..548a46408 100644 --- a/database/entity/0003-login_server_tables/LoginUserBackup.ts +++ b/database/entity/0003-login_server_tables/LoginUserBackup.ts @@ -9,6 +9,9 @@ export class LoginUserBackup extends BaseEntity { @Column({ type: 'text', name: 'passphrase', nullable: false }) passphrase: string + @Column({ name: 'user_id', nullable: false }) + userId: number + @Column({ name: 'mnemonic_type', default: -1 }) mnemonicType: number From 33c50560d681271fa03f396dc6647751a5ce3c71 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 12:06:14 +0100 Subject: [PATCH 071/165] creationDate to string and changed the other parameters to int --- backend/src/graphql/arg/CreatePendingCreationArgs.ts | 10 +++++----- backend/src/graphql/resolver/AdminResolver.ts | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts index a263c9b07..ed24ed963 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -1,19 +1,19 @@ -import { ArgsType, Field } from 'type-graphql' +import { ArgsType, Field, Int } from 'type-graphql' @ArgsType() export default class CreatePendingCreationArgs { @Field(() => String) email: string - @Field(() => Number) + @Field(() => Int) amount: number @Field(() => String) note: string - @Field(() => Date) - creationDate: Date + @Field(() => String) + creationDate: string - @Field(() => Number) + @Field(() => Int) moderator: number } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a380390c8..d36806027 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -35,14 +35,14 @@ export class AdminResolver { const user = await userRepository.findByEmail(email) const creations = await getUserCreations(user.id) - - if (isCreationValid(creations, amount, creationDate)) { + const creationDateObj = new Date(creationDate) + if (isCreationValid(creations, amount, creationDateObj)) { const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const loginPendingTaskAdmin = pendingCreationRepository.create() loginPendingTaskAdmin.userId = user.id loginPendingTaskAdmin.amount = BigInt(amount * 10000) loginPendingTaskAdmin.created = new Date() - loginPendingTaskAdmin.date = new Date(creationDate) + loginPendingTaskAdmin.date = creationDateObj loginPendingTaskAdmin.note = note loginPendingTaskAdmin.moderator = moderator From 9d168f07e7d9a88988182eff83d434484289c6f3 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 13:32:33 +0100 Subject: [PATCH 072/165] Change default id of moderator --- admin/src/store/store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/store/store.js b/admin/src/store/store.js index c2ed1ca83..140a92391 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -35,7 +35,7 @@ const store = new Vuex.Store({ ], state: { token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null, - moderator: { name: 'Dertest Moderator', id: -1 }, + moderator: { name: 'Dertest Moderator', id: 0 }, openCreations: 0, }, // Syncronous mutation of the state From 90494271036e9464a00d68ff862081db6122b880 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 13:33:22 +0100 Subject: [PATCH 073/165] Added method to update user row creation --- admin/src/components/UserTable.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 265c2d12e..f8718f92c 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -68,6 +68,7 @@ :item="row.item" :creationUserData="creationData" @update-creation-data="updateCreationData" + @update-user-data="updateUserData" /> @@ -232,6 +233,9 @@ export default { ...data, } }, + updateUserData(rowItem, newCreation) { + rowItem.creation = newCreation + }, }, } From c43b3491f0645e31992faed4ba72b99ef3832d74 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 13:34:13 +0100 Subject: [PATCH 074/165] Created new query for createPendingCreations --- admin/src/graphql/createPendingCreation.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 admin/src/graphql/createPendingCreation.js diff --git a/admin/src/graphql/createPendingCreation.js b/admin/src/graphql/createPendingCreation.js new file mode 100644 index 000000000..a6618e356 --- /dev/null +++ b/admin/src/graphql/createPendingCreation.js @@ -0,0 +1,13 @@ +import gql from 'graphql-tag' + +export const createPendingCreation = gql` + query ($email: String!, $amount: Int!, $note: String!, $creationDate: String!, $moderator: Int!) { + createPendingCreation( + email: $email + amount: $amount + note: $note + creationDate: $creationDate + moderator: $moderator + ) + } +` From 95bdbfefbe738cce7d8bf72a3b2973bfcf04ee93 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Thu, 25 Nov 2021 13:35:12 +0100 Subject: [PATCH 075/165] Implemented the apollo createPendingCreation and update rowItem.creations --- admin/src/components/CreationFormular.vue | 27 ++++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index babff9609..0cfcee217 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -128,6 +128,7 @@ + From 56e95718e19211607d491a6d32346c724a12fbaa Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 09:47:13 +0100 Subject: [PATCH 088/165] seed peter lustig as admin --- database/entity/0001-init_db/ServerUser.ts | 8 +++--- .../LoginUserRoles.ts | 13 ++++++++++ database/entity/LoginUserRoles.ts | 1 + database/entity/index.ts | 2 ++ .../factories/login-user-backup.factory.ts | 2 +- .../src/factories/login-user-roles.factory.ts | 20 ++++++++++++++ database/src/factories/server-user.factory.ts | 4 +-- .../seeds/users/peter-lustig.admin.seed.ts | 26 ++++++++++++++++--- 8 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 database/entity/0003-login_server_tables/LoginUserRoles.ts create mode 100644 database/entity/LoginUserRoles.ts create mode 100644 database/src/factories/login-user-roles.factory.ts diff --git a/database/entity/0001-init_db/ServerUser.ts b/database/entity/0001-init_db/ServerUser.ts index e776093ac..42b5816ae 100644 --- a/database/entity/0001-init_db/ServerUser.ts +++ b/database/entity/0001-init_db/ServerUser.ts @@ -8,8 +8,8 @@ export class ServerUser extends BaseEntity { @Column({ length: 50 }) username: string - @Column({ type: 'bigint', unsigned: true }) - password: BigInt + @Column({ length: 255 }) + password: string @Column({ length: 50, unique: true }) email: string @@ -23,9 +23,9 @@ export class ServerUser extends BaseEntity { @Column({ name: 'last_login', default: null, nullable: true }) lastLogin: Date - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ default: () => 'CURRENT_TIMESTAMP' }) created: Date - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ default: () => 'CURRENT_TIMESTAMP' }) modified: Date } diff --git a/database/entity/0003-login_server_tables/LoginUserRoles.ts b/database/entity/0003-login_server_tables/LoginUserRoles.ts new file mode 100644 index 000000000..33553fea4 --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginUserRoles.ts @@ -0,0 +1,13 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +@Entity('login_user_roles') +export class LoginUserRoles extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ name: 'user_id' }) + userId: number + + @Column({ name: 'role_id' }) + roleId: number +} diff --git a/database/entity/LoginUserRoles.ts b/database/entity/LoginUserRoles.ts new file mode 100644 index 000000000..1efa81caf --- /dev/null +++ b/database/entity/LoginUserRoles.ts @@ -0,0 +1 @@ +export { LoginUserRoles } from './0003-login_server_tables/LoginUserRoles' diff --git a/database/entity/index.ts b/database/entity/index.ts index 53a6a14bf..901b4ab0d 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -2,6 +2,7 @@ import { Balance } from './Balance' import { LoginElopageBuys } from './LoginElopageBuys' import { LoginEmailOptIn } from './LoginEmailOptIn' import { LoginUser } from './LoginUser' +import { LoginUserRoles } from './LoginUserRoles' import { LoginUserBackup } from './LoginUserBackup' import { Migration } from './Migration' import { ServerUser } from './ServerUser' @@ -17,6 +18,7 @@ export const entities = [ LoginElopageBuys, LoginEmailOptIn, LoginUser, + LoginUserRoles, LoginUserBackup, Migration, ServerUser, diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts index c8f047681..054e1bca8 100644 --- a/database/src/factories/login-user-backup.factory.ts +++ b/database/src/factories/login-user-backup.factory.ts @@ -10,7 +10,7 @@ interface LoginUserBackupContext { define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { if (!context) context = {} - if (!context.userId) throw new Error('LoginUserBackup: No iserId present!') + if (!context.userId) throw new Error('LoginUserBackup: No userId present!') const userBackup = new LoginUserBackup() // TODO: Get the real passphrase diff --git a/database/src/factories/login-user-roles.factory.ts b/database/src/factories/login-user-roles.factory.ts new file mode 100644 index 000000000..2d73564f1 --- /dev/null +++ b/database/src/factories/login-user-roles.factory.ts @@ -0,0 +1,20 @@ +import Faker from 'faker' +import { define } from 'typeorm-seeding' +import { LoginUserRoles } from '../../entity/LoginUserRoles' + +interface LoginUserRolesContext { + userId?: number + roleId?: number +} + +define(LoginUserRoles, (faker: typeof Faker, context?: LoginUserRolesContext) => { + if (!context) context = {} + if (!context.userId) throw new Error('LoginUserRoles: No userId present!') + if (!context.roleId) throw new Error('LoginUserRoles: No roleId present!') + + const userRoles = new LoginUserRoles() + userRoles.userId = context.userId + userRoles.roleId = context.roleId + + return userRoles +}) diff --git a/database/src/factories/server-user.factory.ts b/database/src/factories/server-user.factory.ts index ab3dca811..5db99f374 100644 --- a/database/src/factories/server-user.factory.ts +++ b/database/src/factories/server-user.factory.ts @@ -4,7 +4,7 @@ import { ServerUser } from '../../entity/ServerUser' interface ServerUserContext { username?: string - password?: BigInt + password?: string email?: string role?: string activated?: number @@ -18,7 +18,7 @@ define(ServerUser, (faker: typeof Faker, context?: ServerUserContext) => { const user = new ServerUser() user.username = context.username ? context.username : faker.internet.userName() - user.password = context.password ? context.password : BigInt(0) + user.password = context.password ? context.password : faker.internet.password() user.email = context.email ? context.email : faker.internet.email() user.role = context.role ? context.role : 'admin' user.activated = context.activated ? context.activated : 0 diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 85c7f09e8..53c7be395 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -2,7 +2,8 @@ import { Factory, Seeder } from 'typeorm-seeding' import { User } from '../../../entity/User' import { LoginUser } from '../../../entity/LoginUser' import { LoginUserBackup } from '../../../entity/LoginUserBackup' -// import { ServerUser } from '../../../entity/ServerUser' +import { ServerUser } from '../../../entity/ServerUser' +import { LoginUserRoles } from '../../../entity/LoginUserRoles' const peterLustig = { email: 'peter@lustig.de', @@ -17,7 +18,7 @@ const peterLustig = { 'hex', ), emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), - createdAt: new Date('2021-11-25T10:48:43'), + createdAt: new Date('2020-11-25T10:48:43'), emailChecked: true, passphraseShown: false, language: 'de', @@ -28,9 +29,10 @@ const peterLustig = { 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', mnemonicType: 2, role: 'admin', - activated: 0, + serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', + activated: 1, lastLogin: new Date('2021-10-27T12:25:57'), - modified: new Date('2021-10-27T12:25:57'), + modified: new Date('2021-09-27T12:25:57'), isAdmin: true, } @@ -69,5 +71,21 @@ export class CreatePeterLustigSeed implements Seeder { mnemonicType: peterLustig.mnemonicType, userId: loginUser.id, }).create() + + await factory(ServerUser)({ + role: peterLustig.role, + username: peterLustig.username, + password: peterLustig.serverUserPassword, + email: peterLustig.email, + activated: peterLustig.activated, + created: peterLustig.createdAt, + lastLogin: peterLustig.lastLogin, + modified: peterLustig.modified, + }).create() + + await factory(LoginUserRoles)({ + userId: loginUser.id, + roleId: 1, + }).create() } } From b639da68e77371bb9ad9b7c01f017ea4d8c4bffb Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 10:07:16 +0100 Subject: [PATCH 089/165] Add CSS Logo img height: 2rem --- admin/src/components/NavBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index 2a58b6f75..ba6bb60ca 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -66,6 +66,6 @@ export default { From 9e45a2168773b1ede494ac99ceb6a7a99af72e26 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 10:59:32 +0100 Subject: [PATCH 090/165] Call Apollo query to get the pendingCreations. --- admin/src/graphql/getPendingCreations.js | 7 +++++++ admin/src/pages/CreationConfirm.vue | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 admin/src/graphql/getPendingCreations.js diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js new file mode 100644 index 000000000..322d46269 --- /dev/null +++ b/admin/src/graphql/getPendingCreations.js @@ -0,0 +1,7 @@ +import gql from 'graphql-tag' + +export const getPendingCreations = gql` + query { + getPendingCreations + } +` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 0d68635e0..d035e1b74 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -15,6 +15,7 @@ diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 140a92391..9559e3d58 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -18,6 +18,9 @@ export const mutations = { token: (state, token) => { state.token = token }, + setOpenCreations: (state, openCreations) => { + state.openCreations = openCreations + }, } export const actions = { From 99749eebb2a6459a59844dd4d060aa3b6297054b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 11:28:14 +0100 Subject: [PATCH 092/165] Apollo first steps getPendingCreations. --- admin/src/pages/CreationConfirm.vue | 1 + backend/src/graphql/resolver/AdminResolver.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index d035e1b74..5e5078283 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -153,6 +153,7 @@ export default { }, }, created() { + this.getPendingCreations() this.$store.commit('resetOpenCreations') this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f08b1a4dc..6b81ce220 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,5 +1,5 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw } from 'typeorm' +import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' @@ -7,6 +7,7 @@ import { TransactionCreationRepository } from '../../typeorm/repository/Transact import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() @@ -52,6 +53,14 @@ export class AdminResolver { } return await getUserCreations(user.id) } + + @Query(() => String) + async getPendingCreations(): Promise { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const pendingCreations = await pendingCreationRepository.find() + console.log('pendingCreations', pendingCreations) + return pendingCreations.toString() + } } async function getUserCreations(id: number): Promise { From 6a404841ed9a991f0ee48e89ddf19c07c318b2e4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 26 Nov 2021 11:48:10 +0100 Subject: [PATCH 093/165] renew token --- admin/src/main.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/admin/src/main.js b/admin/src/main.js index 3be3ae0bf..0f230e0a4 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -32,18 +32,17 @@ const authLink = new ApolloLink((operation, forward) => { Authorization: token && token.length > 0 ? `Bearer ${token}` : '', }, }) - return forward(operation) - /* .map((response) => { + return forward(operation).map((response) => { if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') { response.errors[0].message = i18n.t('error.session-expired') store.dispatch('logout', null) - if (router.currentRoute.path !== '/login') router.push('/login') + if (router.currentRoute.path !== '/not-found') router.push('/not-found') return response } const newToken = operation.getContext().response.headers.get('token') if (newToken) store.commit('token', newToken) return response - }) */ + }) }) const apolloClient = new ApolloClient({ From e2f8de0acb559ba963098790d9c722750b8db1e3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:08:18 +0100 Subject: [PATCH 094/165] refactor seed function --- .../factories/login-user-backup.factory.ts | 7 +- .../src/factories/login-user-roles.factory.ts | 6 +- database/src/factories/login-user.factory.ts | 20 +--- database/src/factories/server-user.factory.ts | 12 +-- database/src/factories/user.factory.ts | 10 +- database/src/interface/UserContext.ts | 32 +++++-- database/src/interface/UserInterface.ts | 30 ++++++ database/src/seeds/helpers/user-helpers.ts | 72 ++++++++++++++ .../seeds/users/peter-lustig.admin.seed.ts | 95 ++++--------------- database/src/seeds/users/peter-lustig.ts | 30 ++++++ 10 files changed, 181 insertions(+), 133 deletions(-) create mode 100644 database/src/interface/UserInterface.ts create mode 100644 database/src/seeds/helpers/user-helpers.ts create mode 100644 database/src/seeds/users/peter-lustig.ts diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts index 054e1bca8..40b82de9b 100644 --- a/database/src/factories/login-user-backup.factory.ts +++ b/database/src/factories/login-user-backup.factory.ts @@ -1,12 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUserBackup } from '../../entity/LoginUserBackup' - -interface LoginUserBackupContext { - userId?: number - passphrase?: string - mnemonicType?: number -} +import { LoginUserBackupContext } from '../interface/UserContext' define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { if (!context) context = {} diff --git a/database/src/factories/login-user-roles.factory.ts b/database/src/factories/login-user-roles.factory.ts index 2d73564f1..5b7ba9c9d 100644 --- a/database/src/factories/login-user-roles.factory.ts +++ b/database/src/factories/login-user-roles.factory.ts @@ -1,11 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUserRoles } from '../../entity/LoginUserRoles' - -interface LoginUserRolesContext { - userId?: number - roleId?: number -} +import { LoginUserRolesContext } from '../interface/UserContext' define(LoginUserRoles, (faker: typeof Faker, context?: LoginUserRolesContext) => { if (!context) context = {} diff --git a/database/src/factories/login-user.factory.ts b/database/src/factories/login-user.factory.ts index 00a0a0ee0..a5a28943e 100644 --- a/database/src/factories/login-user.factory.ts +++ b/database/src/factories/login-user.factory.ts @@ -2,25 +2,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { LoginUser } from '../../entity/LoginUser' import { randomBytes } from 'crypto' - -interface LoginUserContext { - email?: string - firstName?: string - lastName?: string - username?: string - description?: string - password?: BigInt - pubKey?: Buffer - privKey?: Buffer - emailHash?: Buffer - createdAt?: Date - emailChecked?: boolean - passphraseShown?: boolean - language?: string - disabled?: boolean - groupId?: number - publisherId?: number -} +import { LoginUserContext } from '../interface/UserContext' define(LoginUser, (faker: typeof Faker, context?: LoginUserContext) => { if (!context) context = {} diff --git a/database/src/factories/server-user.factory.ts b/database/src/factories/server-user.factory.ts index 5db99f374..06ff17c35 100644 --- a/database/src/factories/server-user.factory.ts +++ b/database/src/factories/server-user.factory.ts @@ -1,17 +1,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { ServerUser } from '../../entity/ServerUser' - -interface ServerUserContext { - username?: string - password?: string - email?: string - role?: string - activated?: number - lastLogin?: Date - created?: Date - modified?: Date -} +import { ServerUserContext } from '../interface/UserContext' define(ServerUser, (faker: typeof Faker, context?: ServerUserContext) => { if (!context) context = {} diff --git a/database/src/factories/user.factory.ts b/database/src/factories/user.factory.ts index ffa32e815..1f684f23f 100644 --- a/database/src/factories/user.factory.ts +++ b/database/src/factories/user.factory.ts @@ -2,15 +2,7 @@ import Faker from 'faker' import { define } from 'typeorm-seeding' import { User } from '../../entity/User' import { randomBytes } from 'crypto' - -interface UserContext { - pubkey?: Buffer - email?: string - firstName?: string - lastName?: string - username?: string - disabled?: boolean -} +import { UserContext } from '../interface/UserContext' define(User, (faker: typeof Faker, context?: UserContext) => { if (!context) context = {} diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts index 201a2c944..4e188904c 100644 --- a/database/src/interface/UserContext.ts +++ b/database/src/interface/UserContext.ts @@ -1,5 +1,13 @@ export interface UserContext { - // from login user (contains state user) + pubkey?: Buffer + email?: string + firstName?: string + lastName?: string + username?: string + disabled?: boolean +} + +export interface LoginUserContext { email?: string firstName?: string lastName?: string @@ -15,15 +23,27 @@ export interface UserContext { language?: string disabled?: boolean groupId?: number - publisherId?: number - // from login user backup + publisherId?: number | null +} + +export interface LoginUserBackupContext { + userId?: number passphrase?: string mnemonicType?: number - // from server user +} + +export interface ServerUserContext { + username?: string + password?: string + email?: string role?: string activated?: number lastLogin?: Date + created?: Date modified?: Date - // flag for admin - isAdmin?: boolean +} + +export interface LoginUserRolesContext { + userId?: number + roleId?: number } diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts new file mode 100644 index 000000000..942158593 --- /dev/null +++ b/database/src/interface/UserInterface.ts @@ -0,0 +1,30 @@ +export interface UserInterface { + // from login user (contains state user) + email?: string + firstName?: string + lastName?: string + username?: string + description?: string + password?: BigInt + pubKey?: Buffer + privKey?: Buffer + emailHash?: Buffer + createdAt?: Date + emailChecked?: boolean + passphraseShown?: boolean + language?: string + disabled?: boolean + groupId?: number + publisherId?: number | null + // from login user backup + passphrase?: string + mnemonicType?: number + // from server user + serverUserPassword?: string + role?: string + activated?: number + lastLogin?: Date + modified?: Date + // flag for admin + isAdmin?: boolean +} diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts new file mode 100644 index 000000000..2474b1241 --- /dev/null +++ b/database/src/seeds/helpers/user-helpers.ts @@ -0,0 +1,72 @@ +import { + UserContext, + LoginUserContext, + LoginUserBackupContext, + ServerUserContext, + LoginUserRolesContext, +} from '../../interface/UserContext' +import { UserInterface } from '../../interface/UserInterface' +import { LoginUser } from '../../../entity/LoginUser' + +export const createUserContext = (context: UserInterface): UserContext => { + return { + pubkey: context.pubKey, + email: context.email, + firstName: context.firstName, + lastName: context.lastName, + username: context.username, + disabled: context.disabled, + } +} + +export const createLoginUserContext = (context: UserInterface): LoginUserContext => { + return { + email: context.email, + firstName: context.firstName, + lastName: context.lastName, + username: context.username, + description: context.description, + password: context.password, + pubKey: context.pubKey, + privKey: context.privKey, + emailHash: context.emailHash, + createdAt: context.createdAt, + emailChecked: context.emailChecked, + passphraseShown: context.passphraseShown, + language: context.language, + disabled: context.disabled, + groupId: context.groupId, + publisherId: context.publisherId, + } +} + +export const createLoginUserBackupContext = ( + context: UserInterface, + loginUser: LoginUser, +): LoginUserBackupContext => { + return { + passphrase: context.passphrase, + mnemonicType: context.mnemonicType, + userId: loginUser.id, + } +} + +export const createServerUserContext = (context: UserInterface): ServerUserContext => { + return { + role: context.role, + username: context.username, + password: context.serverUserPassword, + email: context.email, + activated: context.activated, + created: context.createdAt, + lastLogin: context.lastLogin, + modified: context.modified, + } +} + +export const createLoginUserRolesContext = (loginUser: LoginUser): LoginUserRolesContext => { + return { + userId: loginUser.id, + roleId: 1, + } +} diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 53c7be395..a8d17a6e4 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -4,88 +4,29 @@ import { LoginUser } from '../../../entity/LoginUser' import { LoginUserBackup } from '../../../entity/LoginUserBackup' import { ServerUser } from '../../../entity/ServerUser' import { LoginUserRoles } from '../../../entity/LoginUserRoles' +import { + createUserContext, + createLoginUserContext, + createLoginUserBackupContext, + createServerUserContext, + createLoginUserRolesContext, +} from '../helpers/user-helpers' +import { peterLustig } from './peter-lustig' -const peterLustig = { - email: 'peter@lustig.de', - firstName: 'Peter', - lastName: 'Lustig', - username: 'peter', - description: 'Latzhose und Nickelbrille', - password: BigInt('3917921995996627700'), - pubKey: Buffer.from('7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770', 'hex'), - privKey: Buffer.from( - '3c7c0253033212ed983f6bb10ce73362a99f0bd01d4d1b21ca702d532ca32710ba36abf72a22a963b9026e764e954f441f4905b87a66861bd6b9d9689b7f8aefea66cc493e21da4244e85be81660b9c4', - 'hex', - ), - emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), - createdAt: new Date('2020-11-25T10:48:43'), - emailChecked: true, - passphraseShown: false, - language: 'de', - disabled: false, - groupId: 1, - publisherId: null, - passphrase: - 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', - mnemonicType: 2, - role: 'admin', - serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', - activated: 1, - lastLogin: new Date('2021-10-27T12:25:57'), - modified: new Date('2021-09-27T12:25:57'), - isAdmin: true, -} +const userData = peterLustig export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)({ - pubkey: peterLustig.pubKey, - email: peterLustig.email, - firstName: peterLustig.firstName, - lastName: peterLustig.lastName, - username: peterLustig.username, - disabled: peterLustig.disabled, - }).create() + await factory(User)(createUserContext(userData)).create() + const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() + await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() - const loginUser = await factory(LoginUser)({ - email: peterLustig.email, - firstName: peterLustig.firstName, - lastName: peterLustig.lastName, - username: peterLustig.username, - description: peterLustig.description, - password: peterLustig.password, - pubKey: peterLustig.pubKey, - privKey: peterLustig.privKey, - emailHash: peterLustig.emailHash, - createdAt: peterLustig.createdAt, - emailChecked: peterLustig.emailChecked, - passphraseShown: peterLustig.passphraseShown, - language: peterLustig.language, - disabled: peterLustig.disabled, - groupId: peterLustig.groupId, - publisherId: peterLustig.publisherId, - }).create() + if (userData.isAdmin) { + await factory(ServerUser)(createServerUserContext(userData)).create() - await factory(LoginUserBackup)({ - passphrase: peterLustig.passphrase, - mnemonicType: peterLustig.mnemonicType, - userId: loginUser.id, - }).create() - - await factory(ServerUser)({ - role: peterLustig.role, - username: peterLustig.username, - password: peterLustig.serverUserPassword, - email: peterLustig.email, - activated: peterLustig.activated, - created: peterLustig.createdAt, - lastLogin: peterLustig.lastLogin, - modified: peterLustig.modified, - }).create() - - await factory(LoginUserRoles)({ - userId: loginUser.id, - roleId: 1, - }).create() + // This is crazy: we just need the relation to roleId but no role at all + // It works with LoginRoles empty!! + await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() + } } } diff --git a/database/src/seeds/users/peter-lustig.ts b/database/src/seeds/users/peter-lustig.ts new file mode 100644 index 000000000..63caf55f6 --- /dev/null +++ b/database/src/seeds/users/peter-lustig.ts @@ -0,0 +1,30 @@ +export const peterLustig = { + email: 'peter@lustig.de', + firstName: 'Peter', + lastName: 'Lustig', + username: 'peter', + description: 'Latzhose und Nickelbrille', + password: BigInt('3917921995996627700'), + pubKey: Buffer.from('7281e0ee3258b08801f3ec73e431b4519677f65c03b0382c63a913b5784ee770', 'hex'), + privKey: Buffer.from( + '3c7c0253033212ed983f6bb10ce73362a99f0bd01d4d1b21ca702d532ca32710ba36abf72a22a963b9026e764e954f441f4905b87a66861bd6b9d9689b7f8aefea66cc493e21da4244e85be81660b9c4', + 'hex', + ), + emailHash: Buffer.from('9f700e6f6ec351a140b674c0edd4479509697b023bd8bee8826915ef6c2af036', 'hex'), + createdAt: new Date('2020-11-25T10:48:43'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ', + mnemonicType: 2, + role: 'admin', + serverUserPassword: '$2y$10$TzIWLeZoKs251gwrhSQmHeKhKI/EQ4EV5ClfAT8Ufnb4lcUXPa5X.', + activated: 1, + lastLogin: new Date('2021-10-27T12:25:57'), + modified: new Date('2021-09-27T12:25:57'), + isAdmin: true, +} From 62c4552535f5555999f8e2f0f146894bff937323 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:24 +0100 Subject: [PATCH 095/165] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 5f64c34bc..069c9038f 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -6,7 +6,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From 8ad35aa5f364d74ea9569c454e480b2aef2553f1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:35 +0100 Subject: [PATCH 096/165] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 069c9038f..7280dca40 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -9,7 +9,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' }) From aacfaa67c4e457ba753de8f231b993a0a31ef501 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:51 +0100 Subject: [PATCH 097/165] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index 8ec279fdb..f3533fd86 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -7,7 +7,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From c8720673fd0f3323a547959c55b514197f3a810c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:23:00 +0100 Subject: [PATCH 098/165] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index f3533fd86..6f3067c79 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -10,7 +10,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' }) From ae8fc914fb1d53f2293fff347a63464f47669a25 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:24:56 +0100 Subject: [PATCH 099/165] further refactoring --- database/package.json | 1 - database/src/index.ts | 2 ++ database/src/seeds/helpers/user-helpers.ts | 19 ++++++++++++++ .../seeds/users/peter-lustig.admin.seed.ts | 26 +------------------ 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/database/package.json b/database/package.json index a84026e6a..bc9fbe961 100644 --- a/database/package.json +++ b/database/package.json @@ -12,7 +12,6 @@ "clean": "tsc --build --clean", "up": "cd build && node src/index.js up", "down": "cd build && node src/index.js down", - "reset": "cd build && node src/index.js reset", "dev_up": "nodemon -w ./ --ext ts --exec ts-node src/index.ts up", "dev_down": "nodemon -w ./ --ext ts --exec ts-node src/index.ts down", "dev_reset": "nodemon -w ./ --ext ts --exec ts-node src/index.ts reset", diff --git a/database/src/index.ts b/database/src/index.ts index f781b09db..f6ca719cc 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -47,9 +47,11 @@ const run = async (command: string) => { await migration.down() // use for downgrade script break case 'reset': + // TODO protect from production await migration.reset() // use for resetting database break case 'seed': + // TODO protect from production await useSeeding({ root: process.cwd(), configName: 'ormconfig.js', diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts index 2474b1241..805104519 100644 --- a/database/src/seeds/helpers/user-helpers.ts +++ b/database/src/seeds/helpers/user-helpers.ts @@ -6,7 +6,26 @@ import { LoginUserRolesContext, } from '../../interface/UserContext' import { UserInterface } from '../../interface/UserInterface' +import { User } from '../../../entity/User' import { LoginUser } from '../../../entity/LoginUser' +import { LoginUserBackup } from '../../../entity/LoginUserBackup' +import { ServerUser } from '../../../entity/ServerUser' +import { LoginUserRoles } from '../../../entity/LoginUserRoles' +import { Factory } from 'typeorm-seeding' + +export const userSeeder = async (factory: Factory, userData: UserInterface): Promise => { + await factory(User)(createUserContext(userData)).create() + const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() + await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() + + if (userData.isAdmin) { + await factory(ServerUser)(createServerUserContext(userData)).create() + + // This is crazy: we just need the relation to roleId but no role at all + // It works with LoginRoles empty!! + await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() + } +} export const createUserContext = (context: UserInterface): UserContext => { return { diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index a8d17a6e4..49cbab072 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -1,32 +1,8 @@ import { Factory, Seeder } from 'typeorm-seeding' -import { User } from '../../../entity/User' -import { LoginUser } from '../../../entity/LoginUser' -import { LoginUserBackup } from '../../../entity/LoginUserBackup' -import { ServerUser } from '../../../entity/ServerUser' -import { LoginUserRoles } from '../../../entity/LoginUserRoles' -import { - createUserContext, - createLoginUserContext, - createLoginUserBackupContext, - createServerUserContext, - createLoginUserRolesContext, -} from '../helpers/user-helpers' import { peterLustig } from './peter-lustig' -const userData = peterLustig - export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { - await factory(User)(createUserContext(userData)).create() - const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create() - await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create() - - if (userData.isAdmin) { - await factory(ServerUser)(createServerUserContext(userData)).create() - - // This is crazy: we just need the relation to roleId but no role at all - // It works with LoginRoles empty!! - await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() - } + await userSeeder(factory, peterLustig) } } From 3824920c47d34a4f4e4cd0e3dc3fb489aa56e757 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:31:02 +0100 Subject: [PATCH 100/165] get things working --- database/src/seeds/users/peter-lustig.admin.seed.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/database/src/seeds/users/peter-lustig.admin.seed.ts b/database/src/seeds/users/peter-lustig.admin.seed.ts index 49cbab072..9dd3fd4c7 100644 --- a/database/src/seeds/users/peter-lustig.admin.seed.ts +++ b/database/src/seeds/users/peter-lustig.admin.seed.ts @@ -1,5 +1,6 @@ import { Factory, Seeder } from 'typeorm-seeding' import { peterLustig } from './peter-lustig' +import { userSeeder } from '../helpers/user-helpers' export class CreatePeterLustigSeed implements Seeder { public async run(factory: Factory): Promise { From 602dfd64f1edb5ac5ada8ce34c3859ced92c6922 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 12:36:01 +0100 Subject: [PATCH 101/165] Corected return type for getPendingCreations and corected query. --- admin/src/graphql/getPendingCreations.js | 10 +++++- backend/src/graphql/model/PendingCreation.ts | 31 +++++++++++++++++++ backend/src/graphql/resolver/AdminResolver.ts | 25 ++++++++++++--- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 backend/src/graphql/model/PendingCreation.ts diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index 322d46269..c387c368e 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -2,6 +2,14 @@ import gql from 'graphql-tag' export const getPendingCreations = gql` query { - getPendingCreations + getPendingCreations { + firstName + lastName + email + amount + note + date + moderator + } } ` diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts new file mode 100644 index 000000000..56bbe6d27 --- /dev/null +++ b/backend/src/graphql/model/PendingCreation.ts @@ -0,0 +1,31 @@ +import { ObjectType, Field, Int } from 'type-graphql' + +@ObjectType() +export class PendingCreation { + @Field(() => String) + firstName: string + + @Field(() => Int) + id?: number + + @Field(() => String) + lastName: string + + @Field(() => Number) + userId: number + + @Field(() => String) + email: string + + @Field(() => Date) + date: Date + + @Field(() => String) + note: string + + @Field(() => Number) + amount: BigInt + + @Field(() => Number) + moderator: number +} diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 6b81ce220..8dd0293ce 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,6 +1,7 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' +import { PendingCreation } from '../model/PendingCreation' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' @@ -54,12 +55,28 @@ export class AdminResolver { return await getUserCreations(user.id) } - @Query(() => String) - async getPendingCreations(): Promise { + @Query(() => [PendingCreation]) + async getPendingCreations(): Promise { const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingCreations = await pendingCreationRepository.find() - console.log('pendingCreations', pendingCreations) - return pendingCreations.toString() + + const pendingCreationsPromise = await Promise.all( + pendingCreations.map(async (pendingCreation) => { + const userRepository = getCustomRepository(UserRepository) + const user = await userRepository.findOneOrFail({ id: pendingCreation.userId }) + + const newPendingCreation = { + ...pendingCreation, + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + } + + return newPendingCreation + }), + ) + console.log('pendingCreations', pendingCreationsPromise) + return pendingCreationsPromise } } From 2fe18e851c702adfb314b1498ecb0aca339ca9b1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:48:33 +0100 Subject: [PATCH 102/165] seed Bibi Bloxberg --- database/src/index.ts | 2 ++ .../src/seeds/users/bibi-bloxberg.seed.ts | 9 +++++++ database/src/seeds/users/bibi-bloxberg.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/bibi-bloxberg.seed.ts create mode 100644 database/src/seeds/users/bibi-bloxberg.ts diff --git a/database/src/index.ts b/database/src/index.ts index f6ca719cc..622f8bbec 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -6,6 +6,7 @@ import prepare from './prepare' import connection from './typeorm/connection' import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' +import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -57,6 +58,7 @@ const run = async (command: string) => { configName: 'ormconfig.js', }) await runSeeder(CreatePeterLustigSeed) + await runSeeder(CreateBibiBloxbergSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/bibi-bloxberg.seed.ts b/database/src/seeds/users/bibi-bloxberg.seed.ts new file mode 100644 index 000000000..4899f3809 --- /dev/null +++ b/database/src/seeds/users/bibi-bloxberg.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { bibiBloxberg } from './bibi-bloxberg' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateBibiBloxbergSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, bibiBloxberg) + } +} diff --git a/database/src/seeds/users/bibi-bloxberg.ts b/database/src/seeds/users/bibi-bloxberg.ts new file mode 100644 index 000000000..d87e3eb4a --- /dev/null +++ b/database/src/seeds/users/bibi-bloxberg.ts @@ -0,0 +1,25 @@ +export const bibiBloxberg = { + email: 'bibi@bloxberg.de', + firstName: 'Bibi', + lastName: 'Bloxberg', + username: 'bibi', + description: 'Hex Hex', + password: BigInt('12825419584724616625'), + pubKey: Buffer.from('42de7e4754625b730018c3b4ea745a4d043d9d867af352d0f08871793dfa6743', 'hex'), + privKey: Buffer.from( + '60681365b6ad6fd500eae09ac8df0de6beb7554226e0ca1049e957cc6f202205b86e258bbbe98561a86bd9b986ea8b2a6c60abdff8a745f73c8932d4b6545a8da09bbcd6e18ec61a2ef30bac85f83c5d', + 'hex', + ), + emailHash: Buffer.from('38a0d8c8658a5681cc1180c5d9e2b2a18e4f611db8ab3ca61de4aa91ae94219b', 'hex'), + createdAt: new Date('2021-11-26T11:32:16'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'knife normal level all hurdle crucial color avoid warrior stadium road bachelor affair topple hawk pottery right afford immune two ceiling budget glance hour ', + mnemonicType: 2, + isAdmin: false, +} From a6f36cd3058f539bb56189e979ce64a41e8f13b5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:56:48 +0100 Subject: [PATCH 103/165] =?UTF-8?q?seed=20R=C3=A4uber=20Hotzenplotz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/src/index.ts | 2 ++ .../seeds/users/raeuber-hotzenplotz.seed.ts | 9 +++++++ .../src/seeds/users/raeuber-hotzenplotz.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/raeuber-hotzenplotz.seed.ts create mode 100644 database/src/seeds/users/raeuber-hotzenplotz.ts diff --git a/database/src/index.ts b/database/src/index.ts index 622f8bbec..9df88616c 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -7,6 +7,7 @@ import connection from './typeorm/connection' import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' +import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -59,6 +60,7 @@ const run = async (command: string) => { }) await runSeeder(CreatePeterLustigSeed) await runSeeder(CreateBibiBloxbergSeed) + await runSeeder(CreateRaeuberHotzenplotzSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/raeuber-hotzenplotz.seed.ts b/database/src/seeds/users/raeuber-hotzenplotz.seed.ts new file mode 100644 index 000000000..2399136d2 --- /dev/null +++ b/database/src/seeds/users/raeuber-hotzenplotz.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { raeuberHotzenplotz } from './raeuber-hotzenplotz' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateRaeuberHotzenplotzSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, raeuberHotzenplotz) + } +} diff --git a/database/src/seeds/users/raeuber-hotzenplotz.ts b/database/src/seeds/users/raeuber-hotzenplotz.ts new file mode 100644 index 000000000..10fcf8af1 --- /dev/null +++ b/database/src/seeds/users/raeuber-hotzenplotz.ts @@ -0,0 +1,25 @@ +export const raeuberHotzenplotz = { + email: 'raeuber@hotzenplotz.de', + firstName: 'Räuber', + lastName: 'Hotzenplotz', + username: 'räuber', + description: 'Pfefferpistole', + password: BigInt('12123692783243004812'), + pubKey: Buffer.from('d7c70f94234dff071d982aa8f41583876c356599773b5911b39080da2b8c2d2b', 'hex'), + privKey: Buffer.from( + 'c4ede7e7e65acd4cc0a2d91136ee8f753c6903b3594798afde341092b21a4c1589f296d43c6e7adcd7602fcc2a2bcbf74c9f42453ad49cc5186eadf654bbd2c5fa9aa027f152592819246da896ebfcd2', + 'hex', + ), + emailHash: Buffer.from('ec8d34112adb40ff2f6538b05660b03440372690f034cd7d6322d17020233c77', 'hex'), + createdAt: new Date('2021-11-26T11:32:16'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'gospel trip tenant mouse spider skill auto curious man video chief response same little over expire drum display fancy clinic keen throw urge basket ', + mnemonicType: 2, + isAdmin: false, +} From ac0c0c8449a1dfd364b96cc2c7f55be6623941e5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 13:09:00 +0100 Subject: [PATCH 104/165] seed Bob der Baumeister --- database/src/index.ts | 2 ++ .../src/seeds/users/bob-baumeister.seed.ts | 9 +++++++ database/src/seeds/users/bob-baumeister.ts | 25 +++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 database/src/seeds/users/bob-baumeister.seed.ts create mode 100644 database/src/seeds/users/bob-baumeister.ts diff --git a/database/src/index.ts b/database/src/index.ts index 9df88616c..ec5328a9a 100644 --- a/database/src/index.ts +++ b/database/src/index.ts @@ -8,6 +8,7 @@ import { useSeeding, runSeeder } from 'typeorm-seeding' import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed' import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed' import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed' +import { CreateBobBaumeisterSeed } from './seeds/users/bob-baumeister.seed' const run = async (command: string) => { // Database actions not supported by our migration library @@ -61,6 +62,7 @@ const run = async (command: string) => { await runSeeder(CreatePeterLustigSeed) await runSeeder(CreateBibiBloxbergSeed) await runSeeder(CreateRaeuberHotzenplotzSeed) + await runSeeder(CreateBobBaumeisterSeed) break default: throw new Error(`Unsupported command ${command}`) diff --git a/database/src/seeds/users/bob-baumeister.seed.ts b/database/src/seeds/users/bob-baumeister.seed.ts new file mode 100644 index 000000000..22ff30824 --- /dev/null +++ b/database/src/seeds/users/bob-baumeister.seed.ts @@ -0,0 +1,9 @@ +import { Factory, Seeder } from 'typeorm-seeding' +import { bobBaumeister } from './bob-baumeister' +import { userSeeder } from '../helpers/user-helpers' + +export class CreateBobBaumeisterSeed implements Seeder { + public async run(factory: Factory): Promise { + await userSeeder(factory, bobBaumeister) + } +} diff --git a/database/src/seeds/users/bob-baumeister.ts b/database/src/seeds/users/bob-baumeister.ts new file mode 100644 index 000000000..33ce35656 --- /dev/null +++ b/database/src/seeds/users/bob-baumeister.ts @@ -0,0 +1,25 @@ +export const bobBaumeister = { + email: 'bob@baumeister.de', + firstName: 'Bob', + lastName: 'der Baumeister', + username: 'bob', + description: 'Können wir das schaffen? Ja, wir schaffen das!', + password: BigInt('3296644341468822636'), + pubKey: Buffer.from('a509d9a146374fc975e3677db801ae8a4a83bff9dea96da64053ff6de6b2dd7e', 'hex'), + privKey: Buffer.from( + 'd30606ac59c29058896180bebd6dcd1714dbdd697cc14b65eb4de9ef5241a5d5fc789eaab48957a887c45b7e71ab75c47fd132c14b99007891b5bdfb1026575009f0802b0126930803c113ab3f44e1be', + 'hex', + ), + emailHash: Buffer.from('4b8ce4e175587aaf33da19e272719da1a547daff557820191fab0c65c5a3b7f1', 'hex'), + createdAt: new Date('2021-11-26T11:36:31'), + emailChecked: true, + passphraseShown: false, + language: 'de', + disabled: false, + groupId: 1, + publisherId: null, + passphrase: + 'detail master source effort unable waste tilt flush domain orchard art truck hint barrel response gate impose peanut secret merry three uncle wink resource ', + mnemonicType: 2, + isAdmin: false, +} From 0909a3a99a038a9fe422db4cc01dba68677f1f74 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 13:15:58 +0100 Subject: [PATCH 105/165] add README --- database/README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 database/README.md diff --git a/database/README.md b/database/README.md new file mode 100644 index 000000000..f78eca113 --- /dev/null +++ b/database/README.md @@ -0,0 +1,46 @@ +# database + +## Project setup +``` +yarn install +``` + +## Upgrade migrations production +``` +yarn up +``` + +## Upgrade migrations development +``` +yarn dev_up +``` + +## Downgrade migrations production +``` +yarn down +``` + +## Downgrade migrations development +``` +yarn dev_down +``` + + +## Reset DB +``` +yarn dev_reset +``` + +## Seed DB +``` +yarn seed +``` + +## Seeded Users + +| email | password | admin | +| peter@lustig.de | `Aa12345_` | `true` | +| bibi@bloxberg.de | `Aa12345_` | `false` | +| raeuber@hotzenplotz.de | `Aa12345_` | `false` | +| bob@baumeister.de | `Aa12345_` | `false` | + From 48c0b687d6be249025dc512c12038b7c5fca33a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:05:49 +0100 Subject: [PATCH 106/165] Query changed to Type PendingCreation, changed the login user search to state user search, adding parameters to PendingCreation object, changed frontend to map the query informations. --- admin/src/graphql/getPendingCreations.js | 1 + admin/src/pages/CreationConfirm.vue | 98 +++---------------- backend/src/graphql/model/PendingCreation.ts | 3 + backend/src/graphql/resolver/AdminResolver.ts | 24 ++--- backend/src/typeorm/repository/User.ts | 13 +++ 5 files changed, 43 insertions(+), 96 deletions(-) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index c387c368e..f359c79db 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -10,6 +10,7 @@ export const getPendingCreations = gql` note date moderator + creation } } ` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 5e5078283..660436d6c 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -31,98 +31,25 @@ export default { { key: 'firstName', label: 'Vorname' }, { key: 'lastName', label: 'Nachname' }, { - key: 'creation_gdd', + key: 'amount', label: 'Schöpfung', formatter: (value) => { return value + ' GDD' }, }, - { key: 'text', label: 'Text' }, + { key: 'note', label: 'Text' }, { - key: 'creation_date', + key: 'date', label: 'Datum', formatter: (value) => { - return value.long + return this.$moment(value).format('ll') }, }, - { key: 'creation_moderator', label: 'Moderator' }, + { key: 'moderator', label: 'Moderator' }, { key: 'edit_creation', label: 'ändern' }, { key: 'confirm', label: 'speichern' }, ], - confirmResult: [ - { - id: 1, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[450,200,700]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '22/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 2, - email: 'larsen@woob.de', - firstName: 'Larsen', - lastName: 'Shaw', - creation: '[300,200,1000]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '03/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 3, - email: 'geneva@tete.de', - firstName: 'Geneva', - lastName: 'Wilson', - creation: '[350,200,900]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam', - creation_date: { - short: 'September', - long: '27/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 4, - email: 'viewrter@asdfvb.com', - firstName: 'Soledare', - lastName: 'Takker', - creation: '[100,400,800]', - creation_gdd: '500', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo ', - creation_date: { - short: 'Oktober', - long: '12/10/2021', - }, - creation_moderator: 'Evelyn Roller', - }, - { - id: 5, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[100,400,800]', - creation_gdd: '200', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At', - creation_date: { - short: 'September', - long: '05/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - ], + confirmResult: [], } }, @@ -141,20 +68,21 @@ export default { this.$store.commit('openCreationsMinus', 1) } }, - getPendingCreations() { + async getPendingCreations() { this.$apollo .query({ query: getPendingCreations, }) .then((result) => { - console.log('getPendingCreations.Result', result) + this.confirmResult = result.data.getPendingCreations + }) + .catch((error) => { + this.$toasted.error(error.message) }) - .catch() }, }, - created() { - this.getPendingCreations() - this.$store.commit('resetOpenCreations') + async created() { + await this.getPendingCreations() this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts index 56bbe6d27..aa12bd94b 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingCreation.ts @@ -28,4 +28,7 @@ export class PendingCreation { @Field(() => Number) moderator: number + + @Field(() => [Number]) + creation: number[] } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8dd0293ce..3c960b0fa 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -16,19 +16,19 @@ export class AdminResolver { @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => [UserAdmin]) async searchUsers(@Arg('searchText') searchText: string): Promise { - const loginUserRepository = getCustomRepository(LoginUserRepository) - const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = await Promise.all( - loginUsers.map(async (loginUser) => { - const user = new UserAdmin() - user.firstName = loginUser.firstName - user.lastName = loginUser.lastName - user.email = loginUser.email - user.creation = await getUserCreations(loginUser.id) - return user + const userRepository = getCustomRepository(UserRepository) + const users = await userRepository.findBySearchCriteria(searchText) + const adminUsers = await Promise.all( + users.map(async (user) => { + const adminUser = new UserAdmin() + adminUser.firstName = user.firstName + adminUser.lastName = user.lastName + adminUser.email = user.email + adminUser.creation = await getUserCreations(user.id) + return adminUser }), ) - return users + return adminUsers } @Query(() => [Number]) @@ -38,6 +38,7 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) + console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -70,6 +71,7 @@ export class AdminResolver { firstName: user.firstName, lastName: user.lastName, email: user.email, + creation: await getUserCreations(user.id), } return newPendingCreation diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index e127c179c..cf67c837b 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -30,4 +30,17 @@ export class UserRepository extends Repository { }) return usersIndiced } + + async findBySearchCriteria(searchCriteria: string): Promise { + return await this.createQueryBuilder('user') + .where( + 'user.firstName like :name or user.lastName like :lastName or user.email like :email', + { + name: `%${searchCriteria}%`, + lastName: `%${searchCriteria}%`, + email: `%${searchCriteria}%`, + }, + ) + .getMany() + } } From 18a530b1b129cb270b85ac651a24bcfdb9b17c32 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:03 +0100 Subject: [PATCH 107/165] Withdrew console.logs. --- backend/src/graphql/resolver/AdminResolver.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3c960b0fa..ca903f49b 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -38,7 +38,6 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -77,7 +76,6 @@ export class AdminResolver { return newPendingCreation }), ) - console.log('pendingCreations', pendingCreationsPromise) return pendingCreationsPromise } } From e0ad9ab40a609728127c26ca0597a9f196033c8c Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:46 +0100 Subject: [PATCH 108/165] Removed unused imports. --- backend/src/graphql/resolver/AdminResolver.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ca903f49b..a93696814 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,14 +1,12 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw, Any } from 'typeorm' +import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { PendingCreation } from '../model/PendingCreation' -import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' -import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() From 0f22a2fe1c2f6ea1e3ea33f17d27807990013ddb Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 19:29:17 +0100 Subject: [PATCH 109/165] remove run reset on production --- database/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/Dockerfile b/database/Dockerfile index fe3d5ab9f..b546dff32 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -118,10 +118,10 @@ CMD /bin/sh -c "yarn run up" ################################################################################## # PRODUCTION RESET ############################################################### ################################################################################## -FROM production as production_reset +# FROM production as production_reset # Run command -CMD /bin/sh -c "yarn run reset" +# CMD /bin/sh -c "yarn run reset" ################################################################################## # PRODUCTION DOWN ################################################################ From ff704bd9f400e54050d4817e4c74599dcffb0838 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 19:31:16 +0100 Subject: [PATCH 110/165] Update database/src/factories/login-user-backup.factory.ts Co-authored-by: Ulf Gebhardt --- database/src/factories/login-user-backup.factory.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/database/src/factories/login-user-backup.factory.ts b/database/src/factories/login-user-backup.factory.ts index 40b82de9b..c4ae18a77 100644 --- a/database/src/factories/login-user-backup.factory.ts +++ b/database/src/factories/login-user-backup.factory.ts @@ -4,8 +4,9 @@ import { LoginUserBackup } from '../../entity/LoginUserBackup' import { LoginUserBackupContext } from '../interface/UserContext' define(LoginUserBackup, (faker: typeof Faker, context?: LoginUserBackupContext) => { - if (!context) context = {} - if (!context.userId) throw new Error('LoginUserBackup: No userId present!') + if (!context || !context.userId) { + throw new Error('LoginUserBackup: No userId present!') + } const userBackup = new LoginUserBackup() // TODO: Get the real passphrase From 556debe984c3c5d8bedf071f2b21bf3d0ca5622c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 20:08:44 +0100 Subject: [PATCH 111/165] change yarn reset to yarn dev_reset in database up --- .github/workflows/test.yml | 2 +- community_server/src/Controller/ServerUsersController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d58752e7..04a8024a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -657,4 +657,4 @@ jobs: - name: database | up run: docker-compose -f docker-compose.yml run -T database yarn up - name: database | reset - run: docker-compose -f docker-compose.yml run -T database yarn reset \ No newline at end of file + run: docker-compose -f docker-compose.yml run -T database yarn dev_reset \ No newline at end of file diff --git a/community_server/src/Controller/ServerUsersController.php b/community_server/src/Controller/ServerUsersController.php index c07808641..fa80c7eec 100644 --- a/community_server/src/Controller/ServerUsersController.php +++ b/community_server/src/Controller/ServerUsersController.php @@ -16,7 +16,7 @@ class ServerUsersController extends AppController { parent::initialize(); // uncomment in devmode to add new community server admin user, but don't!!! commit it - //$this->Auth->allow(['add', 'edit']); + $this->Auth->allow(['add', 'edit']); $this->Auth->deny('index'); } From 1b8e132190acbd79ac130615f85d046ef4bec0fd Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 29 Nov 2021 14:40:56 +0100 Subject: [PATCH 112/165] redirect to logout, since we have that page actually --- admin/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main.js b/admin/src/main.js index 0f230e0a4..2a2f2d7a1 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -36,7 +36,7 @@ const authLink = new ApolloLink((operation, forward) => { if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') { response.errors[0].message = i18n.t('error.session-expired') store.dispatch('logout', null) - if (router.currentRoute.path !== '/not-found') router.push('/not-found') + if (router.currentRoute.path !== '/logout') router.push('/logout') return response } const newToken = operation.getContext().response.headers.get('token') From fa14d165e9e6399102c525a95bb273d5c7fe21b8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 29 Nov 2021 16:28:41 +0100 Subject: [PATCH 113/165] reduced coverage - this functionality is too existential not to merge and too complex to test at the given moment --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d58752e7..a64dc057e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 51 + min_coverage: 49 token: ${{ github.token }} ############################################################################## From dbdd25293ba8f45d8573bdae2e1b9e98b65bfbd4 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 29 Nov 2021 21:47:49 +0100 Subject: [PATCH 114/165] test new navbar elements, raise coverage to 52% --- .github/workflows/test.yml | 2 +- admin/src/components/NavBar.spec.js | 38 +++++++++++++++++++++++++++++ frontend/src/i18n.test.js | 12 +++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 frontend/src/i18n.test.js diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d58752e7..766f9ba3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 51 + min_coverage: 52 token: ${{ github.token }} ############################################################################## diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js index 1d68b16ad..ad3ed54fd 100644 --- a/admin/src/components/NavBar.spec.js +++ b/admin/src/components/NavBar.spec.js @@ -3,11 +3,19 @@ import NavBar from './NavBar.vue' const localVue = global.localVue +const storeDispatchMock = jest.fn() +const routerPushMock = jest.fn() + const mocks = { $store: { state: { openCreations: 1, + token: 'valid-token', }, + dispatch: storeDispatchMock, + }, + $router: { + push: routerPushMock, }, } @@ -27,4 +35,34 @@ describe('NavBar', () => { expect(wrapper.find('.component-nabvar').exists()).toBeTruthy() }) }) + + describe('wallet', () => { + const assignLocationSpy = jest.fn() + beforeEach(async () => { + await wrapper.findAll('a').at(5).trigger('click') + }) + + it.skip('changes widnow location to wallet', () => { + expect(assignLocationSpy).toBeCalledWith('valid-token') + }) + + it('dispatches logout to store', () => { + expect(storeDispatchMock).toBeCalledWith('logout') + }) + }) + + describe('logout', () => { + // const assignLocationSpy = jest.fn() + beforeEach(async () => { + await wrapper.findAll('a').at(6).trigger('click') + }) + + it('redirects to /logout', () => { + expect(routerPushMock).toBeCalledWith('/logout') + }) + + it('dispatches logout to store', () => { + expect(storeDispatchMock).toBeCalledWith('logout') + }) + }) }) diff --git a/frontend/src/i18n.test.js b/frontend/src/i18n.test.js new file mode 100644 index 000000000..7ef417cbd --- /dev/null +++ b/frontend/src/i18n.test.js @@ -0,0 +1,12 @@ +import i18n from './i18n' +import VueI18n from 'vue-i18n' + +jest.mock('vue-i18n') + +console.log(require) + +describe('i18n', () => { + it('does something', () => { + expect(true).toBeTruthy() + }) +}) From 0c74fa2970a8cbf5ba51110d353080ea015b2dd5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 29 Nov 2021 21:57:10 +0100 Subject: [PATCH 115/165] remove broken test --- frontend/src/i18n.test.js | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 frontend/src/i18n.test.js diff --git a/frontend/src/i18n.test.js b/frontend/src/i18n.test.js deleted file mode 100644 index 7ef417cbd..000000000 --- a/frontend/src/i18n.test.js +++ /dev/null @@ -1,12 +0,0 @@ -import i18n from './i18n' -import VueI18n from 'vue-i18n' - -jest.mock('vue-i18n') - -console.log(require) - -describe('i18n', () => { - it('does something', () => { - expect(true).toBeTruthy() - }) -}) From 50e98bdc46a08d9f0dabf83fbee091c7f1804e32 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 30 Nov 2021 08:51:40 +0100 Subject: [PATCH 116/165] disbale create admin user --- community_server/src/Controller/ServerUsersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community_server/src/Controller/ServerUsersController.php b/community_server/src/Controller/ServerUsersController.php index fa80c7eec..7255eee0f 100644 --- a/community_server/src/Controller/ServerUsersController.php +++ b/community_server/src/Controller/ServerUsersController.php @@ -16,7 +16,7 @@ class ServerUsersController extends AppController { parent::initialize(); // uncomment in devmode to add new community server admin user, but don't!!! commit it - $this->Auth->allow(['add', 'edit']); + // $this->Auth->allow(['add', 'edit']); $this->Auth->deny('index'); } From 1b485899330b8acfa2523b4c8784167a935280f2 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 08:51:47 +0100 Subject: [PATCH 117/165] Change backend coverage to 39. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 766f9ba3b..66fc1c9f5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -491,7 +491,7 @@ jobs: report_name: Coverage Backend type: lcov result_path: ./backend/coverage/lcov.info - min_coverage: 37 + min_coverage: 39 token: ${{ github.token }} ############################################################################## From 6eedde23af4f2367510fb8ad69bdfd729b672db5 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 30 Nov 2021 09:18:57 +0100 Subject: [PATCH 118/165] recover reset to get CI running again --- .github/workflows/test.yml | 2 +- database/Dockerfile | 2 +- database/package.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3198e0873..a64dc057e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -657,4 +657,4 @@ jobs: - name: database | up run: docker-compose -f docker-compose.yml run -T database yarn up - name: database | reset - run: docker-compose -f docker-compose.yml run -T database yarn dev_reset \ No newline at end of file + run: docker-compose -f docker-compose.yml run -T database yarn reset \ No newline at end of file diff --git a/database/Dockerfile b/database/Dockerfile index b546dff32..f2048284b 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -121,7 +121,7 @@ CMD /bin/sh -c "yarn run up" # FROM production as production_reset # Run command -# CMD /bin/sh -c "yarn run reset" +CMD /bin/sh -c "yarn run reset" ################################################################################## # PRODUCTION DOWN ################################################################ diff --git a/database/package.json b/database/package.json index bc9fbe961..a84026e6a 100644 --- a/database/package.json +++ b/database/package.json @@ -12,6 +12,7 @@ "clean": "tsc --build --clean", "up": "cd build && node src/index.js up", "down": "cd build && node src/index.js down", + "reset": "cd build && node src/index.js reset", "dev_up": "nodemon -w ./ --ext ts --exec ts-node src/index.ts up", "dev_down": "nodemon -w ./ --ext ts --exec ts-node src/index.ts down", "dev_reset": "nodemon -w ./ --ext ts --exec ts-node src/index.ts reset", From da649868cc7288220e1e6474e0b89bbe1bb95ac1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:28:59 +0100 Subject: [PATCH 119/165] Removed the remove test that removes all creations, Test that the server sends error. --- admin/src/pages/CreationConfirm.spec.js | 49 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index caf94cd37..365ccd809 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -4,11 +4,42 @@ import CreationConfirm from './CreationConfirm.vue' const localVue = global.localVue const storeCommitMock = jest.fn() +const toastedErrorMock = jest.fn() +const apolloQueryMock = jest.fn().mockResolvedValue({ + data: { + getPendingCreations: [ + { + firstName: 'Bibi', + lastName: 'Bloxberg', + email: 'bibi@bloxberg.de', + amount: 500, + note: 'Danke für alles', + date: new Date(), + moderator: 0, + }, + { + firstName: 'Räuber', + lastName: 'Hotzenplotz', + email: 'raeuber@hotzenplotz.de', + amount: 1000000, + note: 'Gut Ergatert', + date: new Date(), + moderator: 0, + }, + ], + }, +}) const mocks = { $store: { commit: storeCommitMock, }, + $apollo: { + query: apolloQueryMock, + }, + $toasted: { + error: toastedErrorMock, + }, } describe('CreationConfirm', () => { @@ -29,12 +60,22 @@ describe('CreationConfirm', () => { }) describe('store', () => { - it('commits resetOpenCreations to store', () => { - expect(storeCommitMock).toBeCalledWith('resetOpenCreations') + it('commits openCreationsPlus to store', () => { + expect(storeCommitMock).toBeCalledWith('openCreationsPlus', 2) + }) + }) + + describe('server response is error', () => { + beforeEach(() => { + jest.clearAllMocks() + apolloQueryMock.mockRejectedValue({ + message: 'Ouch!', + }) + wrapper = Wrapper() }) - it('commits openCreationsPlus to store', () => { - expect(storeCommitMock).toBeCalledWith('openCreationsPlus', 5) + it('toast an error message', () => { + expect(toastedErrorMock).toBeCalledWith('Ouch!') }) }) From bd5aebbfd539b2f8609a2ff9d13c1a1d185f6038 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:30:37 +0100 Subject: [PATCH 120/165] Coverage upgraded to 53% in admin. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66fc1c9f5..a28680279 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 52 + min_coverage: 53 token: ${{ github.token }} ############################################################################## From 84be6ae3692818e6edd1af8a1c4b75c1e0569ecc Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:35:33 +0100 Subject: [PATCH 121/165] Remove empty and unused file. --- admin/src/graphql/getUsersQuery.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 admin/src/graphql/getUsersQuery.ts diff --git a/admin/src/graphql/getUsersQuery.ts b/admin/src/graphql/getUsersQuery.ts deleted file mode 100644 index e69de29bb..000000000 From bdad4197a3a7babcf985f7a08597f1b30941bd14 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 30 Nov 2021 09:41:44 +0100 Subject: [PATCH 122/165] fix logo import Co-authored-by: Moriz Wahl --- admin/src/components/NavBar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index ba6bb60ca..a5ee41697 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -2,7 +2,7 @@
- ... + ... From 718763a884d671bf73ebfecf1551adeea5b17141 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Tue, 30 Nov 2021 09:42:09 +0100 Subject: [PATCH 123/165] Update admin/src/components/CreationFormular.vue Co-authored-by: Moriz Wahl --- admin/src/components/CreationFormular.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 49e10e7bb..2a31afc6e 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -54,7 +54,7 @@ - +
From fd54f34855e3a2732eda81ae6a42c8a440cf19e3 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:55:27 +0100 Subject: [PATCH 124/165] Remove comment in logout. --- admin/src/components/NavBar.vue | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index a5ee41697..208a6fa70 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -32,28 +32,8 @@ import CONFIG from '../config' export default { name: 'navbar', - data() { - return { - logo: 'img/brand/green.png', - } - }, methods: { logout() { - // TODO - // this.$emit('logout') - /* this.$apollo - .query({ - query: logout, - }) - .then(() => { - this.$store.dispatch('logout') - this.$router.push('/logout') - }) - .catch(() => { - this.$store.dispatch('logout') - if (this.$router.currentRoute.path !== '/logout') this.$router.push('/logout') - }) - */ this.$store.dispatch('logout') this.$router.push('/logout') }, From e2743b979ef1dd0500284c492e4997a053c0bcec Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 10:08:12 +0100 Subject: [PATCH 125/165] Change note to memo. --- admin/src/components/CreationFormular.vue | 4 ++-- backend/src/graphql/arg/CreatePendingCreationArgs.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- database/migrations/0005-admin_tables.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 2a31afc6e..2f7d68c4c 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -237,7 +237,7 @@ export default { email: this.item.email, creationDate: this.radioSelected.long, amount: this.value, - note: this.text, + memo: this.text, moderator: this.$store.state.moderator.id, }, ] @@ -255,7 +255,7 @@ export default { email: this.item.email, creationDate: this.radioSelected.long, amount: Number(this.value), - note: this.text, + memo: this.text, moderator: Number(this.$store.state.moderator.id), } diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts index ed24ed963..d2c17abf1 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts @@ -9,7 +9,7 @@ export default class CreatePendingCreationArgs { amount: number @Field(() => String) - note: string + memo: string @Field(() => String) creationDate: string diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f08b1a4dc..4c9cb33f8 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -31,7 +31,7 @@ export class AdminResolver { @Query(() => [Number]) async createPendingCreation( - @Args() { email, amount, note, creationDate, moderator }: CreatePendingCreationArgs, + @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs, ): Promise { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) @@ -45,7 +45,7 @@ export class AdminResolver { loginPendingTaskAdmin.amount = BigInt(amount * 10000) loginPendingTaskAdmin.created = new Date() loginPendingTaskAdmin.date = creationDateObj - loginPendingTaskAdmin.note = note + loginPendingTaskAdmin.memo = memo loginPendingTaskAdmin.moderator = moderator pendingCreationRepository.save(loginPendingTaskAdmin) diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts index 8e1219715..6398b22fc 100644 --- a/database/migrations/0005-admin_tables.ts +++ b/database/migrations/0005-admin_tables.ts @@ -16,7 +16,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis \`userId\` int UNSIGNED DEFAULT 0, \`created\` datetime NOT NULL, \`date\` datetime NOT NULL, - \`note\` text DEFAULT NULL, + \`memo\` text DEFAULT NULL, \`amount\` bigint(20) NOT NULL, \`moderator\` int UNSIGNED DEFAULT 0, PRIMARY KEY (\`id\`) From 3a5999ffe5486f4b89015769785383aca22f55ef Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 10:11:28 +0100 Subject: [PATCH 126/165] Change note to memo. --- backend/src/graphql/model/PendingCreation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts index aa12bd94b..f1087ea0b 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingCreation.ts @@ -21,7 +21,7 @@ export class PendingCreation { date: Date @Field(() => String) - note: string + memo: string @Field(() => Number) amount: BigInt From e47a95cd4bd8b652e053125a15b512ca0598fe00 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 10:31:43 +0100 Subject: [PATCH 127/165] Change note to memo in database. --- database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts index 8e5d57d3a..26b92f43b 100644 --- a/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts +++ b/database/entity/0005-admin_tables/LoginPendingTasksAdmin.ts @@ -15,7 +15,7 @@ export class LoginPendingTasksAdmin extends BaseEntity { date: Date @Column({ length: 256, nullable: true, default: null }) - note: string + memo: string @Column({ type: 'bigint', nullable: false }) amount: BigInt From 5206e27a7a52625b8bc6b9a3d358a4cb65fc2b46 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:44:42 +0100 Subject: [PATCH 128/165] Add PublisherID input box per collaps --- frontend/src/views/Pages/Register.vue | 31 ++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index ea4000cff..551b2927b 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -121,8 +121,37 @@ {{ messageError }} + + PublisherId + + + + + + + + + + + + + +
+ Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte + lehr lassen. + Dies ist für die Registrieung nicht nötig! +
+ +
+
+ + + -
+
From 57e8be75a6291906abf90931cf6dca2b3dce3fa1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:52:57 +0100 Subject: [PATCH 129/165] Add PublisherID locales in DOM and german --- frontend/src/locales/de.json | 5 +++++ frontend/src/views/Pages/Register.vue | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index b0dfe36d4..3494d5c52 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -169,6 +169,11 @@ "my-profil": "Mein Profil", "support": "Support" }, + "publisher": { + "publisherId": "Herausgeber ID", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" + }, "signup": { "agree": "Ich stimme der Datenschutzerklärung zu.", "dont_match": "Die Passwörter stimmen nicht überein.", diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 551b2927b..569d00bb9 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,7 @@ - PublisherId + {{ $t('publisher.publisherId') }} @@ -140,9 +140,8 @@ v-b-toggle:my-collapse class="text-center mt-1 shadow-lg p-3 mb-5 rounded" > - Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte - lehr lassen. - Dies ist für die Registrieung nicht nötig! + {{ $t('publisher.infoText') }} + {{ $t('publisher.infoNoRegister') }}
From 75ec2a6e8cc4bce2341a9f08abd28dc1d00d054f Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:54:33 +0100 Subject: [PATCH 130/165] Add PublisherID locales in DOM and english --- frontend/src/locales/en.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 135729ffa..595d97c0c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -169,6 +169,11 @@ "my-profil": "My profile", "support": "Support" }, + "publisher": { + "publisherId": "PublisherID", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "infoNoRegister": "This is not necessary for registration!" + }, "signup": { "agree": "I agree to the privacy policy.", "dont_match": "Passwords don't match.", From a1018b526d8cd48cd55d40a5a6889144168d589b Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:56:22 +0100 Subject: [PATCH 131/165] Add locales for PublisherID --- frontend/src/locales/de.json | 10 +++++----- frontend/src/locales/en.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3494d5c52..eccb7b7fb 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -150,6 +150,11 @@ } }, "signup": "Registrieren", + "publisher": { + "publisherId": "Herausgeber ID", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" + }, "site": { "404": { "back": "Zurück zur Übersicht!", @@ -169,11 +174,6 @@ "my-profil": "Mein Profil", "support": "Support" }, - "publisher": { - "publisherId": "Herausgeber ID", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", - "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" - }, "signup": { "agree": "Ich stimme der Datenschutzerklärung zu.", "dont_match": "Die Passwörter stimmen nicht überein.", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 595d97c0c..bcf4d7c11 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -150,6 +150,11 @@ } }, "signup": "Sign up", + "publisher": { + "publisherId": "PublisherID", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "infoNoRegister": "This is not necessary for registration!" + }, "site": { "404": { "back": "Back to dashboard!", @@ -169,11 +174,6 @@ "my-profil": "My profile", "support": "Support" }, - "publisher": { - "publisherId": "PublisherID", - "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", - "infoNoRegister": "This is not necessary for registration!" - }, "signup": { "agree": "I agree to the privacy policy.", "dont_match": "Passwords don't match.", From 2de8684ca3391a5aa89cca8523d396db0f7e7699 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:57:40 +0100 Subject: [PATCH 132/165] Add edit locales for german PublisherID for Herausgeber ID --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index eccb7b7fb..e68caaa59 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -151,7 +151,7 @@ }, "signup": "Registrieren", "publisher": { - "publisherId": "Herausgeber ID", + "publisherId": "PublisherID", "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" }, From eece84d007672d056d5ce1287d2dc503d0696abe Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 13:58:34 +0100 Subject: [PATCH 133/165] yarn locales --fix --- frontend/src/locales/de.json | 10 +++++----- frontend/src/locales/en.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index e68caaa59..3e104541d 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -114,6 +114,11 @@ "message": "hallo gradido !!", "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", + "publisher": { + "infoNoRegister": "Dies ist für die Registrieung nicht nötig!", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "publisherId": "PublisherID" + }, "send": "Senden", "settings": { "coinanimation": { @@ -150,11 +155,6 @@ } }, "signup": "Registrieren", - "publisher": { - "publisherId": "PublisherID", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", - "infoNoRegister": "Dies ist für die Registrieung nicht nötig!" - }, "site": { "404": { "back": "Zurück zur Übersicht!", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index bcf4d7c11..f473ff798 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -114,6 +114,11 @@ "message": "hello gradido !!", "overview": "Overview", "privacy_policy": "Privacy policy", + "publisher": { + "infoNoRegister": "This is not necessary for registration!", + "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", + "publisherId": "PublisherID" + }, "send": "Send", "settings": { "coinanimation": { @@ -150,11 +155,6 @@ } }, "signup": "Sign up", - "publisher": { - "publisherId": "PublisherID", - "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.", - "infoNoRegister": "This is not necessary for registration!" - }, "site": { "404": { "back": "Back to dashboard!", From bc21f76848e56050b38cb13b0ba88eb0932b1c62 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 30 Nov 2021 14:57:04 +0100 Subject: [PATCH 134/165] Insert publishID from Store when set --- frontend/src/views/Pages/Register.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 569d00bb9..517085a36 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,7 @@ - {{ $t('publisher.publisherId') }} + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} @@ -134,7 +134,7 @@ - +
Date: Tue, 30 Nov 2021 14:57:38 +0100 Subject: [PATCH 135/165] yarn lint --fix --- frontend/src/views/Pages/Register.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 517085a36..43334eaf7 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -122,7 +122,9 @@ - {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} + + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} + @@ -134,7 +136,11 @@ - +
Date: Tue, 30 Nov 2021 14:58:47 +0100 Subject: [PATCH 136/165] Change create method from query to mutation. --- admin/src/components/CreationFormular.vue | 4 ++-- admin/src/graphql/createPendingCreation.js | 10 ++++++++-- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 2f7d68c4c..5d29c6fcb 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -270,8 +270,8 @@ export default { }) } else { this.$apollo - .query({ - query: createPendingCreation, + .mutate({ + mutation: createPendingCreation, variables: this.submitObj, }) .then((result) => { diff --git a/admin/src/graphql/createPendingCreation.js b/admin/src/graphql/createPendingCreation.js index a6618e356..72c3249de 100644 --- a/admin/src/graphql/createPendingCreation.js +++ b/admin/src/graphql/createPendingCreation.js @@ -1,11 +1,17 @@ import gql from 'graphql-tag' export const createPendingCreation = gql` - query ($email: String!, $amount: Int!, $note: String!, $creationDate: String!, $moderator: Int!) { + mutation ( + $email: String! + $amount: Int! + $memo: String! + $creationDate: String! + $moderator: Int! + ) { createPendingCreation( email: $email amount: $amount - note: $note + memo: $memo creationDate: $creationDate moderator: $moderator ) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 4c9cb33f8..f3c9d1516 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,4 +1,4 @@ -import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' +import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql' import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' @@ -29,7 +29,7 @@ export class AdminResolver { return users } - @Query(() => [Number]) + @Mutation(() => [Number]) async createPendingCreation( @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs, ): Promise { From 0e592fd353c435b5194857a0b02baae8258ebcc2 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 1 Dec 2021 09:22:08 +0100 Subject: [PATCH 137/165] Added some tests and reduce coverage since we removed comments. --- .github/workflows/test.yml | 2 +- admin/src/main.test.js | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66fc1c9f5..acff97d0e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 52 + min_coverage: 50 token: ${{ github.token }} ############################################################################## diff --git a/admin/src/main.test.js b/admin/src/main.test.js index c639593d6..bf3df3799 100644 --- a/admin/src/main.test.js +++ b/admin/src/main.test.js @@ -3,12 +3,14 @@ import './main' import CONFIG from './config' import Vue from 'vue' +import VueApollo from 'vue-apollo' import Vuex from 'vuex' import VueI18n from 'vue-i18n' import { BootstrapVue, IconsPlugin } from 'bootstrap-vue' import moment from 'vue-moment' jest.mock('vue') +jest.mock('vue-apollo') jest.mock('vuex') jest.mock('vue-i18n') jest.mock('vue-moment') @@ -55,6 +57,10 @@ describe('main', () => { expect(InMemoryCache).toBeCalled() }) + it('calls the VueApollo', () => { + expect(VueApollo).toBeCalled() + }) + it('calls Vue', () => { expect(Vue).toBeCalled() }) @@ -63,16 +69,16 @@ describe('main', () => { expect(VueI18n).toBeCalled() }) - it.skip('calls BootstrapVue', () => { - expect(BootstrapVue).toBeCalled() + it('calls BootstrapVue', () => { + expect(Vue.use).toBeCalledWith(BootstrapVue) }) - it.skip('calls IconsPlugin', () => { - expect(IconsPlugin).toBeCalled() + it('calls IconsPlugin', () => { + expect(Vue.use).toBeCalledWith(IconsPlugin) }) - it.skip('calls Moment', () => { - expect(moment).toBeCalled() + it('calls Moment', () => { + expect(Vue.use).toBeCalledWith(moment) }) it.skip('creates a store', () => { From 6a4379f9cdedd60870504bb4111e788907edacb1 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 1 Dec 2021 15:34:08 +0100 Subject: [PATCH 138/165] Update frontend/src/locales/de.json Co-authored-by: Moriz Wahl --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3e104541d..1e8bfb621 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -116,7 +116,7 @@ "privacy_policy": "Datenschutzerklärung", "publisher": { "infoNoRegister": "Dies ist für die Registrieung nicht nötig!", - "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte lehr lassen.", + "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte leer lassen.", "publisherId": "PublisherID" }, "send": "Senden", From 2bb11230f69cb293c1c49fe5b33f4525c6d67db7 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 1 Dec 2021 15:34:19 +0100 Subject: [PATCH 139/165] Update frontend/src/views/Pages/Register.vue Co-authored-by: Moriz Wahl --- frontend/src/views/Pages/Register.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 43334eaf7..2842ad853 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -138,7 +138,7 @@ From 09cdd00c82849fa84d8a6ae6a34e78462eed8d81 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Dec 2021 17:53:58 +0100 Subject: [PATCH 140/165] Add Methods commitStore() for publisherId --- frontend/src/views/Pages/Register.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 2842ad853..da97c7c07 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -139,7 +139,8 @@
Date: Wed, 1 Dec 2021 17:55:03 +0100 Subject: [PATCH 141/165] remove all console logs --- frontend/src/views/Pages/Register.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index da97c7c07..f80e37a22 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -234,7 +234,6 @@ export default { return dirty || validated ? valid : null }, commitStore(val) { - console.log('commitStore', val) this.$store.commit('publisherId', val) }, async onSubmit() { From 31adf5d6e26bf94642bbd6979bce8f41709eb85d Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 1 Dec 2021 18:39:25 +0100 Subject: [PATCH 142/165] jest test for input publisherId --- frontend/src/views/Pages/Register.spec.js | 6 ++++++ frontend/src/views/Pages/Register.vue | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index c63de66cf..4cc8d9030 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -170,6 +170,11 @@ describe('Register', () => { expect(wrapper.find('#registerCheckbox').exists()).toBeTruthy() }) + it('has PublisherId input fields', () => { + wrapper.find('.publisherCollaps').trigger('click') + expect(wrapper.find('#publisherid').exists()).toBe(true) + }) + it('has disabled submit button when not completely filled', () => { expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) @@ -221,6 +226,7 @@ describe('Register', () => { wrapper.find('input[name="form.password"]').setValue('Aa123456_') wrapper.find('input[name="form.passwordRepeat"]').setValue('Aa123456_') wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') }) it('has enabled submit button when completely filled', () => { diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index f80e37a22..8669781a4 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -121,7 +121,7 @@ {{ messageError }} - + {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }} @@ -137,6 +137,7 @@ Date: Wed, 1 Dec 2021 18:51:12 +0100 Subject: [PATCH 143/165] jest test for input publisherId commit to store --- frontend/src/views/Pages/Register.spec.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 4cc8d9030..ed4908d86 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,6 +229,10 @@ describe('Register', () => { wrapper.find('#publisherid').setValue('12345') }) + it('commits openCreationsMinus to store', () => { + expect(storeCommitMock).toBeCalledWith('publisherId', 12345) + }) + it('has enabled submit button when completely filled', () => { expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) From 1004718892cea46a415385971099d2924d164c38 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 2 Dec 2021 06:30:41 +0100 Subject: [PATCH 144/165] Added moderator query to the creationFormular so we can send the right moderator id. --- admin/src/components/CreationFormular.vue | 14 ++++++++++++++ admin/src/graphql/verifyLogin.js | 11 +++++++++++ admin/src/store/store.js | 3 +++ backend/src/graphql/model/User.ts | 4 ++++ backend/src/graphql/resolver/UserResolver.ts | 2 ++ 5 files changed, 34 insertions(+) create mode 100644 admin/src/graphql/verifyLogin.js diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 5d29c6fcb..b6a12433e 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -126,6 +126,7 @@
diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js new file mode 100644 index 000000000..59f5e7eb1 --- /dev/null +++ b/admin/src/graphql/verifyLogin.js @@ -0,0 +1,11 @@ +import gql from 'graphql-tag' + +export const verifyLogin = gql` + query { + verifyLogin { + firstName + lastName + id + } + } +` diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 140a92391..d67537499 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -18,6 +18,9 @@ export const mutations = { token: (state, token) => { state.token = token }, + moderator: (state, moderator) => { + state.moderator = moderator + }, } export const actions = { diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index cdb46c954..c7b5806ca 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -12,6 +12,7 @@ export class User { */ constructor(json?: any) { if (json) { + this.id = json.id this.email = json.email this.firstName = json.first_name this.lastName = json.last_name @@ -24,6 +25,9 @@ export class User { } } + @Field(() => Number) + id: number + @Field(() => String) email: string diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 7f5f7dc43..ce403ac0e 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -207,6 +207,7 @@ export class UserResolver { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUser = await loginUserRepository.findByEmail(userEntity.email) const user = new User() + user.id = userEntity.id user.email = userEntity.email user.firstName = userEntity.firstName user.lastName = userEntity.lastName @@ -276,6 +277,7 @@ export class UserResolver { } const user = new User() + user.id = userEntity.id user.email = email user.firstName = loginUser.firstName user.lastName = loginUser.lastName From 4e1baeae2e50f4d723854e4a87938aafaedf6812 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 2 Dec 2021 07:06:38 +0100 Subject: [PATCH 145/165] Test the apollo query for verifyLogin so we get the moderator before an creation. --- admin/src/components/CreationFormular.spec.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index fcdf97cfa..e1bbff1cc 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -3,6 +3,16 @@ import CreationFormular from './CreationFormular.vue' const localVue = global.localVue +const apolloMock = jest.fn().mockResolvedValue({ + data: { + verifyLogin: { + name: 'success', + id: 0, + }, + }, +}) +const stateCommitMock = jest.fn() + const mocks = { $moment: jest.fn(() => { return { @@ -14,6 +24,12 @@ const mocks = { }), } }), + $apollo: { + query: apolloMock, + }, + $store: { + commit: stateCommitMock, + }, } const propsData = { @@ -39,6 +55,23 @@ describe('CreationFormular', () => { expect(wrapper.find('.component-creation-formular').exists()).toBeTruthy() }) + describe('server sends back moderator data', () => { + it('called store commit with mocked data', () => { + expect(stateCommitMock).toBeCalledWith('moderator', { name: 'success', id: 0 }) + }) + }) + + describe('server throws error for moderator data call', () => { + beforeEach(() => { + jest.clearAllMocks() + apolloMock.mockRejectedValue({ message: 'Ouch!' }) + wrapper = Wrapper() + }) + it('has called store commit with fake data', () => { + expect(stateCommitMock).toBeCalledWith('moderator', { id: 0, name: 'Test Moderator' }) + }) + }) + describe('radio buttons to selcet month', () => { it('has three radio buttons', () => { expect(wrapper.findAll('input[type="radio"]').length).toBe(3) From fc799a78ebb25ad97d3b449aa49ac08f8bb3bf42 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 09:19:35 +0100 Subject: [PATCH 146/165] test von store commit publisherId, test store isAdmin --- frontend/src/store/store.test.js | 10 ++++++++++ frontend/src/views/Pages/Register.spec.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index 829678b44..051c16102 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -11,6 +11,7 @@ const { coinanimation, newsletterState, publisherId, + isAdmin, community, hasElopage, } = mutations @@ -104,6 +105,15 @@ describe('Vuex store', () => { }) }) + + describe('isAdmin', () => { + it('sets the state of isAdmin', () => { + const state = { isAdmin: null } + isAdmin(state, true) + expect(state.isAdmin).toEqual(true) + }) + }) + describe('community', () => { it('sets the state of community', () => { const state = {} diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index ed4908d86..d6814bd49 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,8 +229,8 @@ describe('Register', () => { wrapper.find('#publisherid').setValue('12345') }) - it('commits openCreationsMinus to store', () => { - expect(storeCommitMock).toBeCalledWith('publisherId', 12345) + it('commits publisherId to store', () => { + expect(mockStoreCommit).toBeCalledWith('publisherId', 12345) }) it('has enabled submit button when completely filled', () => { From 36d3850c3f95a837614f57d2a7914b35a6137152 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 09:20:38 +0100 Subject: [PATCH 147/165] yarn lint --fix --- frontend/src/store/store.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index 051c16102..4f25f5352 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -105,7 +105,6 @@ describe('Vuex store', () => { }) }) - describe('isAdmin', () => { it('sets the state of isAdmin', () => { const state = { isAdmin: null } From 997230b334b4fde176cb80f5985702bcc0fc3dce Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:26:00 +0100 Subject: [PATCH 148/165] text name changed from note to memo --- admin/src/graphql/getPendingCreations.js | 2 +- admin/src/pages/CreationConfirm.spec.js | 4 ++-- admin/src/pages/CreationConfirm.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index f359c79db..a94172d43 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -7,7 +7,7 @@ export const getPendingCreations = gql` lastName email amount - note + memo date moderator creation diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 365ccd809..6598738f1 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -13,7 +13,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Bloxberg', email: 'bibi@bloxberg.de', amount: 500, - note: 'Danke für alles', + memo: 'Danke für alles', date: new Date(), moderator: 0, }, @@ -22,7 +22,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Hotzenplotz', email: 'raeuber@hotzenplotz.de', amount: 1000000, - note: 'Gut Ergatert', + memo: 'Gut Ergatert', date: new Date(), moderator: 0, }, diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 660436d6c..368734b23 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -37,7 +37,7 @@ export default { return value + ' GDD' }, }, - { key: 'note', label: 'Text' }, + { key: 'memo', label: 'Text' }, { key: 'date', label: 'Datum', From 56fcd7d445490b934e5934bf1d3ed2ca69433178 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:51:06 +0100 Subject: [PATCH 149/165] change Overview.vue methods getPendingCreations and store set open pending creations --- admin/src/pages/CreationConfirm.vue | 3 ++- admin/src/pages/Overview.vue | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 368734b23..6b9166666 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -74,7 +74,9 @@ export default { query: getPendingCreations, }) .then((result) => { + this.$store.commit('resetOpenCreations') this.confirmResult = result.data.getPendingCreations + this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch((error) => { this.$toasted.error(error.message) @@ -83,7 +85,6 @@ export default { }, async created() { await this.getPendingCreations() - this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index d63c46199..6690678e3 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -76,24 +76,25 @@
From 297c892e5759d0a2efdd16e63e193489898e5540 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:52:36 +0100 Subject: [PATCH 150/165] remove console logs --- admin/src/pages/Overview.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index 6690678e3..1c58751bc 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -87,7 +87,6 @@ export default { query: getPendingCreations, }) .then((result) => { - console.log(result.data) this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch() From 257e2e4073d1525a816140de726ff3f6952bb28d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 2 Dec 2021 11:54:47 +0100 Subject: [PATCH 151/165] pass apollo client to nav guards --- admin/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main.js b/admin/src/main.js index e6f5a80e1..6a59f1cc7 100644 --- a/admin/src/main.js +++ b/admin/src/main.js @@ -75,7 +75,7 @@ Vue.use(Toasted, { }, }) -addNavigationGuards(router, store) +addNavigationGuards(router, store, apolloProvider.defaultClient) new Vue({ moment, From 812722c53cc7e7b250eb9c68b114d595e5deeecd Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 2 Dec 2021 12:00:08 +0100 Subject: [PATCH 152/165] handle moderator in store --- admin/src/store/store.js | 3 ++- admin/src/store/store.test.js | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/admin/src/store/store.js b/admin/src/store/store.js index d67537499..dc168c558 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -26,6 +26,7 @@ export const mutations = { export const actions = { logout: ({ commit, state }) => { commit('token', null) + commit('moderator', null) window.localStorage.clear() }, } @@ -38,7 +39,7 @@ const store = new Vuex.Store({ ], state: { token: CONFIG.DEBUG_DISABLE_AUTH ? 'validToken' : null, - moderator: { name: 'Dertest Moderator', id: 0 }, + moderator: null, openCreations: 0, }, // Syncronous mutation of the state diff --git a/admin/src/store/store.test.js b/admin/src/store/store.test.js index 4482a46bf..de8a55412 100644 --- a/admin/src/store/store.test.js +++ b/admin/src/store/store.test.js @@ -1,6 +1,6 @@ import store, { mutations, actions } from './store' -const { token, openCreationsPlus, openCreationsMinus, resetOpenCreations } = mutations +const { token, openCreationsPlus, openCreationsMinus, resetOpenCreations, moderator } = mutations const { logout } = actions const CONFIG = { @@ -40,6 +40,14 @@ describe('Vuex store', () => { expect(state.openCreations).toEqual(0) }) }) + + describe('moderator', () => { + it('sets the moderator object in state', () => { + const state = { moderator: null } + moderator(state, { id: 1 }) + expect(state.moderator).toEqual({ id: 1 }) + }) + }) }) describe('actions', () => { @@ -57,6 +65,11 @@ describe('Vuex store', () => { expect(commit).toBeCalledWith('token', null) }) + it('deletes the moderator in store', () => { + logout({ commit, state }) + expect(commit).toBeCalledWith('moderator', null) + }) + it.skip('clears the window local storage', () => { expect(windowStorageMock).toBeCalled() }) From c210c590f57c2dc70f074b22c8a4a85dcc9a0537 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 2 Dec 2021 12:00:37 +0100 Subject: [PATCH 153/165] get isAdmin for moderator --- admin/src/graphql/verifyLogin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js index 59f5e7eb1..553557f3c 100644 --- a/admin/src/graphql/verifyLogin.js +++ b/admin/src/graphql/verifyLogin.js @@ -5,6 +5,7 @@ export const verifyLogin = gql` verifyLogin { firstName lastName + isAdmin id } } From ab86e95d179f975fc191150f69f87d01d92cfbb6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 12:11:45 +0100 Subject: [PATCH 154/165] result array reverse, remove async from created und methods getPendingCreations --- admin/src/pages/CreationConfirm.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 6b9166666..7e3ca329f 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -68,14 +68,14 @@ export default { this.$store.commit('openCreationsMinus', 1) } }, - async getPendingCreations() { + getPendingCreations() { this.$apollo .query({ query: getPendingCreations, }) .then((result) => { this.$store.commit('resetOpenCreations') - this.confirmResult = result.data.getPendingCreations + this.confirmResult = result.data.getPendingCreations.reverse() this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch((error) => { @@ -83,8 +83,9 @@ export default { }) }, }, - async created() { - await this.getPendingCreations() + created() { + alert('neu laden') + this.getPendingCreations() }, } From 3c5778a81bca8ebb860c8ff6b845b55add6dc558 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 12:14:06 +0100 Subject: [PATCH 155/165] remove alerts, remove test info text --- admin/src/pages/CreationConfirm.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 7e3ca329f..654f1a74a 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,9 +1,5 @@