1
0
mirror of https://github.com/immich-app/immich.git synced 2024-11-24 08:52:28 +02:00

chore(deps): update server (#6930)

* chore(deps): update server

* chore: generate sql

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
This commit is contained in:
renovate[bot] 2024-02-06 22:06:02 +00:00 committed by GitHub
parent 8c60c21fe0
commit d88ca5fb2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 311 additions and 225 deletions

274
server/package-lock.json generated
View File

@ -68,7 +68,7 @@
"@types/express": "^4.17.17", "@types/express": "^4.17.17",
"@types/fluent-ffmpeg": "^2.1.21", "@types/fluent-ffmpeg": "^2.1.21",
"@types/imagemin": "^8.0.1", "@types/imagemin": "^8.0.1",
"@types/jest": "29.5.11", "@types/jest": "29.5.12",
"@types/jest-when": "^3.5.2", "@types/jest-when": "^3.5.2",
"@types/lodash": "^4.14.197", "@types/lodash": "^4.14.197",
"@types/mock-fs": "^4.13.1", "@types/mock-fs": "^4.13.1",
@ -2779,9 +2779,9 @@
} }
}, },
"node_modules/@sideway/address": { "node_modules/@sideway/address": {
"version": "4.1.4", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
"dependencies": { "dependencies": {
"@hapi/hoek": "^9.0.0" "@hapi/hoek": "^9.0.0"
} }
@ -3161,9 +3161,9 @@
} }
}, },
"node_modules/@types/jest": { "node_modules/@types/jest": {
"version": "29.5.11", "version": "29.5.12",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
"integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"expect": "^29.0.0", "expect": "^29.0.0",
@ -3227,9 +3227,9 @@
} }
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.11.6", "version": "20.11.16",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.6.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
"integrity": "sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==", "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
"dependencies": { "dependencies": {
"undici-types": "~5.26.4" "undici-types": "~5.26.4"
} }
@ -3446,16 +3446,16 @@
"dev": true "dev": true
}, },
"node_modules/@typescript-eslint/eslint-plugin": { "node_modules/@typescript-eslint/eslint-plugin": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz",
"integrity": "sha512-roQScUGFruWod9CEyoV5KlCYrubC/fvG8/1zXuT0WTcxX87GnMMmnksMwSg99lo1xiKrBzw2icsJPMAw1OtKxg==", "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/regexpp": "^4.5.1", "@eslint-community/regexpp": "^4.5.1",
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/type-utils": "6.19.1", "@typescript-eslint/type-utils": "6.20.0",
"@typescript-eslint/utils": "6.19.1", "@typescript-eslint/utils": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"graphemer": "^1.4.0", "graphemer": "^1.4.0",
"ignore": "^5.2.4", "ignore": "^5.2.4",
@ -3481,15 +3481,15 @@
} }
}, },
"node_modules/@typescript-eslint/parser": { "node_modules/@typescript-eslint/parser": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz",
"integrity": "sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==", "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@ -3509,13 +3509,13 @@
} }
}, },
"node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/scope-manager": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz",
"integrity": "sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==", "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1" "@typescript-eslint/visitor-keys": "6.20.0"
}, },
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@ -3526,13 +3526,13 @@
} }
}, },
"node_modules/@typescript-eslint/type-utils": { "node_modules/@typescript-eslint/type-utils": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz",
"integrity": "sha512-0vdyld3ecfxJuddDjACUvlAeYNrHP/pDeQk2pWBR2ESeEzQhg52DF53AbI9QCBkYE23lgkhLCZNkHn2hEXXYIg==", "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"@typescript-eslint/utils": "6.19.1", "@typescript-eslint/utils": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"ts-api-utils": "^1.0.1" "ts-api-utils": "^1.0.1"
}, },
@ -3553,9 +3553,9 @@
} }
}, },
"node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/types": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz",
"integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^16.0.0 || >=18.0.0" "node": "^16.0.0 || >=18.0.0"
@ -3566,13 +3566,13 @@
} }
}, },
"node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/typescript-estree": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz",
"integrity": "sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==", "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -3618,17 +3618,17 @@
} }
}, },
"node_modules/@typescript-eslint/utils": { "node_modules/@typescript-eslint/utils": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz",
"integrity": "sha512-JvjfEZuP5WoMqwh9SPAPDSHSg9FBHHGhjPugSRxu5jMfjvBpq5/sGTD+9M9aQ5sh6iJ8AY/Kk/oUYVEMAPwi7w==", "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint-community/eslint-utils": "^4.4.0", "@eslint-community/eslint-utils": "^4.4.0",
"@types/json-schema": "^7.0.12", "@types/json-schema": "^7.0.12",
"@types/semver": "^7.5.0", "@types/semver": "^7.5.0",
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"semver": "^7.5.4" "semver": "^7.5.4"
}, },
"engines": { "engines": {
@ -3643,12 +3643,12 @@
} }
}, },
"node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/visitor-keys": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz",
"integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"eslint-visitor-keys": "^3.4.1" "eslint-visitor-keys": "^3.4.1"
}, },
"engines": { "engines": {
@ -4174,9 +4174,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.6.6", "version": "1.6.7",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
"integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.4", "follow-redirects": "^1.15.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
@ -8163,13 +8163,13 @@
} }
}, },
"node_modules/joi": { "node_modules/joi": {
"version": "17.12.0", "version": "17.12.1",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.12.0.tgz", "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.1.tgz",
"integrity": "sha512-HSLsmSmXz+PV9PYoi3p7cgIbj06WnEBNT28n+bbBNcPZXZFqCzzvGqpTBPujx/Z0nh1+KNQPDrNgdmQ8dq0qYw==", "integrity": "sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ==",
"dependencies": { "dependencies": {
"@hapi/hoek": "^9.3.0", "@hapi/hoek": "^9.3.0",
"@hapi/topo": "^5.1.0", "@hapi/topo": "^5.1.0",
"@sideway/address": "^4.1.4", "@sideway/address": "^4.1.5",
"@sideway/formula": "^3.0.1", "@sideway/formula": "^3.0.1",
"@sideway/pinpoint": "^2.0.0" "@sideway/pinpoint": "^2.0.0"
} }
@ -10823,9 +10823,9 @@
"dev": true "dev": true
}, },
"node_modules/sql-formatter": { "node_modules/sql-formatter": {
"version": "15.1.2", "version": "15.2.0",
"resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.1.2.tgz", "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.2.0.tgz",
"integrity": "sha512-zBrLBclCNurCsQaO6yMvkXzHvv7eJPjiF8LIEQ5HdBV/x6UuWIZwqss3mlZ/6HLj+VYhFKeHpQnyLuZWG2agKQ==", "integrity": "sha512-k1gDOblvmtzmrBT687Y167ElwQI/8KrlhfKeIUXsi6jw7Rp5n3G8TkMFZF0Z9NG7rAzHKXUlJ8kfmcIfMf5lFg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"argparse": "^2.0.1", "argparse": "^2.0.1",
@ -11872,9 +11872,9 @@
"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
}, },
"node_modules/typeorm": { "node_modules/typeorm": {
"version": "0.3.19", "version": "0.3.20",
"resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.19.tgz", "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz",
"integrity": "sha512-OGelrY5qEoAU80mR1iyvmUHiKCPUydL6xp6bebXzS7jyv/X70Gp/jBWRAfF4qGOfy2A7orMiGRfwsBUNbEL65g==", "integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==",
"dependencies": { "dependencies": {
"@sqltools/formatter": "^1.2.5", "@sqltools/formatter": "^1.2.5",
"app-root-path": "^3.1.0", "app-root-path": "^3.1.0",
@ -11886,7 +11886,7 @@
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"glob": "^10.3.10", "glob": "^10.3.10",
"mkdirp": "^2.1.3", "mkdirp": "^2.1.3",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.2.1",
"sha.js": "^2.4.11", "sha.js": "^2.4.11",
"tslib": "^2.5.0", "tslib": "^2.5.0",
"uuid": "^9.0.0", "uuid": "^9.0.0",
@ -11898,7 +11898,7 @@
"typeorm-ts-node-esm": "cli-ts-node-esm.js" "typeorm-ts-node-esm": "cli-ts-node-esm.js"
}, },
"engines": { "engines": {
"node": ">= 12.9.0" "node": ">=16.13.0"
}, },
"funding": { "funding": {
"url": "https://opencollective.com/typeorm" "url": "https://opencollective.com/typeorm"
@ -12026,6 +12026,11 @@
"url": "https://github.com/sponsors/isaacs" "url": "https://github.com/sponsors/isaacs"
} }
}, },
"node_modules/typeorm/node_modules/reflect-metadata": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
"integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="
},
"node_modules/typeorm/node_modules/wrap-ansi": { "node_modules/typeorm/node_modules/wrap-ansi": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@ -14358,9 +14363,9 @@
"dev": true "dev": true
}, },
"@sideway/address": { "@sideway/address": {
"version": "4.1.4", "version": "4.1.5",
"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
"requires": { "requires": {
"@hapi/hoek": "^9.0.0" "@hapi/hoek": "^9.0.0"
} }
@ -14725,9 +14730,9 @@
} }
}, },
"@types/jest": { "@types/jest": {
"version": "29.5.11", "version": "29.5.12",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
"integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
"dev": true, "dev": true,
"requires": { "requires": {
"expect": "^29.0.0", "expect": "^29.0.0",
@ -14791,9 +14796,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "20.11.6", "version": "20.11.16",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.6.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz",
"integrity": "sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==", "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==",
"requires": { "requires": {
"undici-types": "~5.26.4" "undici-types": "~5.26.4"
} }
@ -14997,16 +15002,16 @@
"dev": true "dev": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz",
"integrity": "sha512-roQScUGFruWod9CEyoV5KlCYrubC/fvG8/1zXuT0WTcxX87GnMMmnksMwSg99lo1xiKrBzw2icsJPMAw1OtKxg==", "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint-community/regexpp": "^4.5.1", "@eslint-community/regexpp": "^4.5.1",
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/type-utils": "6.19.1", "@typescript-eslint/type-utils": "6.20.0",
"@typescript-eslint/utils": "6.19.1", "@typescript-eslint/utils": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"graphemer": "^1.4.0", "graphemer": "^1.4.0",
"ignore": "^5.2.4", "ignore": "^5.2.4",
@ -15016,54 +15021,54 @@
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz",
"integrity": "sha512-WEfX22ziAh6pRE9jnbkkLGp/4RhTpffr2ZK5bJ18M8mIfA8A+k97U9ZyaXCEJRlmMHh7R9MJZWXp/r73DzINVQ==", "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4" "debug": "^4.3.4"
} }
}, },
"@typescript-eslint/scope-manager": { "@typescript-eslint/scope-manager": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz",
"integrity": "sha512-4CdXYjKf6/6aKNMSly/BP4iCSOpvMmqtDzRtqFyyAae3z5kkqEjKndR5vDHL8rSuMIIWP8u4Mw4VxLyxZW6D5w==", "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1" "@typescript-eslint/visitor-keys": "6.20.0"
} }
}, },
"@typescript-eslint/type-utils": { "@typescript-eslint/type-utils": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz",
"integrity": "sha512-0vdyld3ecfxJuddDjACUvlAeYNrHP/pDeQk2pWBR2ESeEzQhg52DF53AbI9QCBkYE23lgkhLCZNkHn2hEXXYIg==", "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"@typescript-eslint/utils": "6.19.1", "@typescript-eslint/utils": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"ts-api-utils": "^1.0.1" "ts-api-utils": "^1.0.1"
} }
}, },
"@typescript-eslint/types": { "@typescript-eslint/types": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz",
"integrity": "sha512-6+bk6FEtBhvfYvpHsDgAL3uo4BfvnTnoge5LrrCj2eJN8g3IJdLTD4B/jK3Q6vo4Ql/Hoip9I8aB6fF+6RfDqg==", "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==",
"dev": true "dev": true
}, },
"@typescript-eslint/typescript-estree": { "@typescript-eslint/typescript-estree": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz",
"integrity": "sha512-aFdAxuhzBFRWhy+H20nYu19+Km+gFfwNO4TEqyszkMcgBDYQjmPJ61erHxuT2ESJXhlhrO7I5EFIlZ+qGR8oVA==", "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/visitor-keys": "6.19.1", "@typescript-eslint/visitor-keys": "6.20.0",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -15093,27 +15098,27 @@
} }
}, },
"@typescript-eslint/utils": { "@typescript-eslint/utils": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz",
"integrity": "sha512-JvjfEZuP5WoMqwh9SPAPDSHSg9FBHHGhjPugSRxu5jMfjvBpq5/sGTD+9M9aQ5sh6iJ8AY/Kk/oUYVEMAPwi7w==", "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint-community/eslint-utils": "^4.4.0", "@eslint-community/eslint-utils": "^4.4.0",
"@types/json-schema": "^7.0.12", "@types/json-schema": "^7.0.12",
"@types/semver": "^7.5.0", "@types/semver": "^7.5.0",
"@typescript-eslint/scope-manager": "6.19.1", "@typescript-eslint/scope-manager": "6.20.0",
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"@typescript-eslint/typescript-estree": "6.19.1", "@typescript-eslint/typescript-estree": "6.20.0",
"semver": "^7.5.4" "semver": "^7.5.4"
} }
}, },
"@typescript-eslint/visitor-keys": { "@typescript-eslint/visitor-keys": {
"version": "6.19.1", "version": "6.20.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.1.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz",
"integrity": "sha512-gkdtIO+xSO/SmI0W68DBg4u1KElmIUo3vXzgHyGPs6cxgB0sa3TlptRAAE0hUY1hM6FcDKEv7aIwiTGm76cXfQ==", "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "6.19.1", "@typescript-eslint/types": "6.20.0",
"eslint-visitor-keys": "^3.4.1" "eslint-visitor-keys": "^3.4.1"
} }
}, },
@ -15550,9 +15555,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"axios": { "axios": {
"version": "1.6.6", "version": "1.6.7",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.6.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
"integrity": "sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==", "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
"requires": { "requires": {
"follow-redirects": "^1.15.4", "follow-redirects": "^1.15.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
@ -18494,13 +18499,13 @@
} }
}, },
"joi": { "joi": {
"version": "17.12.0", "version": "17.12.1",
"resolved": "https://registry.npmjs.org/joi/-/joi-17.12.0.tgz", "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.1.tgz",
"integrity": "sha512-HSLsmSmXz+PV9PYoi3p7cgIbj06WnEBNT28n+bbBNcPZXZFqCzzvGqpTBPujx/Z0nh1+KNQPDrNgdmQ8dq0qYw==", "integrity": "sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ==",
"requires": { "requires": {
"@hapi/hoek": "^9.3.0", "@hapi/hoek": "^9.3.0",
"@hapi/topo": "^5.1.0", "@hapi/topo": "^5.1.0",
"@sideway/address": "^4.1.4", "@sideway/address": "^4.1.5",
"@sideway/formula": "^3.0.1", "@sideway/formula": "^3.0.1",
"@sideway/pinpoint": "^2.0.0" "@sideway/pinpoint": "^2.0.0"
} }
@ -20532,9 +20537,9 @@
"dev": true "dev": true
}, },
"sql-formatter": { "sql-formatter": {
"version": "15.1.2", "version": "15.2.0",
"resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.1.2.tgz", "resolved": "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.2.0.tgz",
"integrity": "sha512-zBrLBclCNurCsQaO6yMvkXzHvv7eJPjiF8LIEQ5HdBV/x6UuWIZwqss3mlZ/6HLj+VYhFKeHpQnyLuZWG2agKQ==", "integrity": "sha512-k1gDOblvmtzmrBT687Y167ElwQI/8KrlhfKeIUXsi6jw7Rp5n3G8TkMFZF0Z9NG7rAzHKXUlJ8kfmcIfMf5lFg==",
"dev": true, "dev": true,
"requires": { "requires": {
"argparse": "^2.0.1", "argparse": "^2.0.1",
@ -21320,9 +21325,9 @@
"integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
}, },
"typeorm": { "typeorm": {
"version": "0.3.19", "version": "0.3.20",
"resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.19.tgz", "resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.3.20.tgz",
"integrity": "sha512-OGelrY5qEoAU80mR1iyvmUHiKCPUydL6xp6bebXzS7jyv/X70Gp/jBWRAfF4qGOfy2A7orMiGRfwsBUNbEL65g==", "integrity": "sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==",
"requires": { "requires": {
"@sqltools/formatter": "^1.2.5", "@sqltools/formatter": "^1.2.5",
"app-root-path": "^3.1.0", "app-root-path": "^3.1.0",
@ -21334,7 +21339,7 @@
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"glob": "^10.3.10", "glob": "^10.3.10",
"mkdirp": "^2.1.3", "mkdirp": "^2.1.3",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.2.1",
"sha.js": "^2.4.11", "sha.js": "^2.4.11",
"tslib": "^2.5.0", "tslib": "^2.5.0",
"uuid": "^9.0.0", "uuid": "^9.0.0",
@ -21365,6 +21370,11 @@
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
"integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==" "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A=="
}, },
"reflect-metadata": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.1.tgz",
"integrity": "sha512-i5lLI6iw9AU3Uu4szRNPPEkomnkjRTaVt9hy/bn5g/oSzekBSMeLZblcjP74AW0vBabqERLLIrz+gR8QYR54Tw=="
},
"wrap-ansi": { "wrap-ansi": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",

View File

@ -93,7 +93,7 @@
"@types/express": "^4.17.17", "@types/express": "^4.17.17",
"@types/fluent-ffmpeg": "^2.1.21", "@types/fluent-ffmpeg": "^2.1.21",
"@types/imagemin": "^8.0.1", "@types/imagemin": "^8.0.1",
"@types/jest": "29.5.11", "@types/jest": "29.5.12",
"@types/jest-when": "^3.5.2", "@types/jest-when": "^3.5.2",
"@types/lodash": "^4.14.197", "@types/lodash": "^4.14.197",
"@types/mock-fs": "^4.13.1", "@types/mock-fs": "^4.13.1",

View File

@ -7,8 +7,8 @@ FROM
"activity" "ActivityEntity" "activity" "ActivityEntity"
WHERE WHERE
( (
"ActivityEntity"."id" IN ($1) ("ActivityEntity"."id" IN ($1))
AND "ActivityEntity"."userId" = $2 AND ("ActivityEntity"."userId" = $2)
) )
-- AccessRepository.activity.checkAlbumOwnerAccess -- AccessRepository.activity.checkAlbumOwnerAccess
@ -22,8 +22,14 @@ FROM
) )
WHERE WHERE
( (
"ActivityEntity"."id" IN ($1) ("ActivityEntity"."id" IN ($1))
AND "ActivityEntity__ActivityEntity_album"."ownerId" = $2 AND (
(
(
"ActivityEntity__ActivityEntity_album"."ownerId" = $2
)
)
)
) )
-- AccessRepository.activity.checkCreateAccess -- AccessRepository.activity.checkCreateAccess
@ -53,8 +59,8 @@ FROM
WHERE WHERE
( (
( (
"AlbumEntity"."id" IN ($1) ("AlbumEntity"."id" IN ($1))
AND "AlbumEntity"."ownerId" = $2 AND ("AlbumEntity"."ownerId" = $2)
) )
) )
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
@ -72,8 +78,12 @@ FROM
WHERE WHERE
( (
( (
"AlbumEntity"."id" IN ($1) ("AlbumEntity"."id" IN ($1))
AND "AlbumEntity__AlbumEntity_sharedUsers"."id" = $2 AND (
(
("AlbumEntity__AlbumEntity_sharedUsers"."id" = $2)
)
)
) )
) )
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
@ -86,8 +96,8 @@ FROM
"shared_links" "SharedLinkEntity" "shared_links" "SharedLinkEntity"
WHERE WHERE
( (
"SharedLinkEntity"."id" = $1 ("SharedLinkEntity"."id" = $1)
AND "SharedLinkEntity"."albumId" IN ($2) AND ("SharedLinkEntity"."albumId" IN ($2))
) )
-- AccessRepository.asset.checkAlbumAccess -- AccessRepository.asset.checkAlbumAccess
@ -119,8 +129,8 @@ FROM
"assets" "AssetEntity" "assets" "AssetEntity"
WHERE WHERE
( (
"AssetEntity"."id" IN ($1) ("AssetEntity"."id" IN ($1))
AND "AssetEntity"."ownerId" = $2 AND ("AssetEntity"."ownerId" = $2)
) )
-- AccessRepository.asset.checkPartnerAccess -- AccessRepository.asset.checkPartnerAccess
@ -168,8 +178,8 @@ FROM
"user_token" "UserTokenEntity" "user_token" "UserTokenEntity"
WHERE WHERE
( (
"UserTokenEntity"."userId" = $1 ("UserTokenEntity"."userId" = $1)
AND "UserTokenEntity"."id" IN ($2) AND ("UserTokenEntity"."id" IN ($2))
) )
-- AccessRepository.library.checkOwnerAccess -- AccessRepository.library.checkOwnerAccess
@ -180,8 +190,8 @@ FROM
WHERE WHERE
( (
( (
"LibraryEntity"."id" IN ($1) ("LibraryEntity"."id" IN ($1))
AND "LibraryEntity"."ownerId" = $2 AND ("LibraryEntity"."ownerId" = $2)
) )
) )
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
@ -203,8 +213,8 @@ FROM
"person" "PersonEntity" "person" "PersonEntity"
WHERE WHERE
( (
"PersonEntity"."id" IN ($1) ("PersonEntity"."id" IN ($1))
AND "PersonEntity"."ownerId" = $2 AND ("PersonEntity"."ownerId" = $2)
) )
-- AccessRepository.person.checkFaceOwnerAccess -- AccessRepository.person.checkFaceOwnerAccess
@ -218,8 +228,14 @@ FROM
) )
WHERE WHERE
( (
"AssetFaceEntity"."id" IN ($1) ("AssetFaceEntity"."id" IN ($1))
AND "AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2 AND (
(
(
"AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2
)
)
)
) )
-- AccessRepository.partner.checkUpdateAccess -- AccessRepository.partner.checkUpdateAccess

View File

@ -72,7 +72,7 @@ FROM
) )
LEFT JOIN "shared_links" "AlbumEntity__AlbumEntity_sharedLinks" ON "AlbumEntity__AlbumEntity_sharedLinks"."albumId" = "AlbumEntity"."id" LEFT JOIN "shared_links" "AlbumEntity__AlbumEntity_sharedLinks" ON "AlbumEntity__AlbumEntity_sharedLinks"."albumId" = "AlbumEntity"."id"
WHERE WHERE
(("AlbumEntity"."id" = $1)) ((("AlbumEntity"."id" = $1)))
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
@ -135,7 +135,7 @@ FROM
"AlbumEntity__AlbumEntity_sharedUsers"."deletedAt" IS NULL "AlbumEntity__AlbumEntity_sharedUsers"."deletedAt" IS NULL
) )
WHERE WHERE
(("AlbumEntity"."id" IN ($1))) ((("AlbumEntity"."id" IN ($1))))
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
-- AlbumRepository.getByAssetId -- AlbumRepository.getByAssetId
@ -201,12 +201,20 @@ WHERE
( (
( (
( (
"AlbumEntity"."ownerId" = $1 (
AND "AlbumEntity__AlbumEntity_assets"."id" = $2 ("AlbumEntity"."ownerId" = $1)
AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
)
) )
OR ( OR (
"AlbumEntity__AlbumEntity_sharedUsers"."id" = $3 (
AND "AlbumEntity__AlbumEntity_assets"."id" = $4 (
(
("AlbumEntity__AlbumEntity_sharedUsers"."id" = $3)
)
)
AND ((("AlbumEntity__AlbumEntity_assets"."id" = $4)))
)
) )
) )
) )
@ -328,7 +336,7 @@ FROM
"AlbumEntity__AlbumEntity_owner"."deletedAt" IS NULL "AlbumEntity__AlbumEntity_owner"."deletedAt" IS NULL
) )
WHERE WHERE
(("AlbumEntity"."ownerId" = $1)) ((("AlbumEntity"."ownerId" = $1)))
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
ORDER BY ORDER BY
"AlbumEntity"."createdAt" DESC "AlbumEntity"."createdAt" DESC
@ -403,14 +411,38 @@ FROM
WHERE WHERE
( (
( (
("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1) (
OR ( (
"AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2 (
(
("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1)
)
)
)
) )
OR ( OR (
"AlbumEntity"."ownerId" = $3 (
AND NOT ( (
"AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL (
(
"AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2
)
)
)
)
)
OR (
(
("AlbumEntity"."ownerId" = $3)
AND (
(
(
NOT (
"AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
)
)
)
)
) )
) )
) )
@ -489,9 +521,21 @@ FROM
WHERE WHERE
( (
( (
"AlbumEntity"."ownerId" = $1 ("AlbumEntity"."ownerId" = $1)
AND "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL AND (
AND "AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL (
(
"AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
)
)
)
AND (
(
(
"AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL
)
)
)
) )
) )
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)
@ -586,8 +630,8 @@ WHERE
WHERE WHERE
( (
( (
"AlbumEntity"."id" = $1 ("AlbumEntity"."id" = $1)
AND "AlbumEntity__AlbumEntity_assets"."id" = $2 AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
) )
) )
AND ("AlbumEntity"."deletedAt" IS NULL) AND ("AlbumEntity"."deletedAt" IS NULL)

View File

@ -32,7 +32,7 @@ FROM
"APIKeyEntity__APIKeyEntity_user"."deletedAt" IS NULL "APIKeyEntity__APIKeyEntity_user"."deletedAt" IS NULL
) )
WHERE WHERE
("APIKeyEntity"."key" = $1) (("APIKeyEntity"."key" = $1))
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"APIKeyEntity_id" ASC "APIKeyEntity_id" ASC
@ -50,8 +50,8 @@ FROM
"api_keys" "APIKeyEntity" "api_keys" "APIKeyEntity"
WHERE WHERE
( (
"APIKeyEntity"."userId" = $1 ("APIKeyEntity"."userId" = $1)
AND "APIKeyEntity"."id" = $2 AND ("APIKeyEntity"."id" = $2)
) )
LIMIT LIMIT
1 1
@ -66,6 +66,6 @@ SELECT
FROM FROM
"api_keys" "APIKeyEntity" "api_keys" "APIKeyEntity"
WHERE WHERE
("APIKeyEntity"."userId" = $1) (("APIKeyEntity"."userId" = $1))
ORDER BY ORDER BY
"APIKeyEntity"."createdAt" DESC "APIKeyEntity"."createdAt" DESC

View File

@ -65,11 +65,11 @@ FROM
WHERE WHERE
( (
( (
"AssetEntity"."ownerId" = $1 ("AssetEntity"."ownerId" = $1)
AND "AssetEntity"."isVisible" = $2 AND ("AssetEntity"."isVisible" = $2)
AND "AssetEntity"."isArchived" = $3 AND ("AssetEntity"."isArchived" = $3)
AND NOT ("AssetEntity"."resizePath" IS NULL) AND (NOT ("AssetEntity"."resizePath" IS NULL))
AND "AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5 AND ("AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5)
) )
) )
AND ("AssetEntity"."deletedAt" IS NULL) AND ("AssetEntity"."deletedAt" IS NULL)
@ -286,7 +286,7 @@ FROM
LEFT JOIN "asset_stack" "AssetEntity__AssetEntity_stack" ON "AssetEntity__AssetEntity_stack"."id" = "AssetEntity"."stackId" LEFT JOIN "asset_stack" "AssetEntity__AssetEntity_stack" ON "AssetEntity__AssetEntity_stack"."id" = "AssetEntity"."stackId"
LEFT JOIN "assets" "bd93d5747511a4dad4923546c51365bf1a803774" ON "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" = "AssetEntity__AssetEntity_stack"."id" LEFT JOIN "assets" "bd93d5747511a4dad4923546c51365bf1a803774" ON "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" = "AssetEntity__AssetEntity_stack"."id"
WHERE WHERE
("AssetEntity"."id" IN ($1)) (("AssetEntity"."id" IN ($1)))
-- AssetRepository.deleteAll -- AssetRepository.deleteAll
DELETE FROM "assets" DELETE FROM "assets"
@ -331,7 +331,13 @@ FROM
"AssetEntity__AssetEntity_library"."deletedAt" IS NULL "AssetEntity__AssetEntity_library"."deletedAt" IS NULL
) )
WHERE WHERE
(("AssetEntity__AssetEntity_library"."id" IN ($1))) (
(
(
(("AssetEntity__AssetEntity_library"."id" IN ($1)))
)
)
)
AND ("AssetEntity"."deletedAt" IS NULL) AND ("AssetEntity"."deletedAt" IS NULL)
-- AssetRepository.getByLibraryIdAndOriginalPath -- AssetRepository.getByLibraryIdAndOriginalPath
@ -378,8 +384,8 @@ FROM
WHERE WHERE
( (
( (
"AssetEntity__AssetEntity_library"."id" = $1 ((("AssetEntity__AssetEntity_library"."id" = $1)))
AND "AssetEntity"."originalPath" = $2 AND ("AssetEntity"."originalPath" = $2)
) )
) )
AND ("AssetEntity"."deletedAt" IS NULL) AND ("AssetEntity"."deletedAt" IS NULL)
@ -397,9 +403,9 @@ FROM
"assets" "AssetEntity" "assets" "AssetEntity"
WHERE WHERE
( (
"AssetEntity"."ownerId" = $1 ("AssetEntity"."ownerId" = $1)
AND "AssetEntity"."deviceId" = $2 AND ("AssetEntity"."deviceId" = $2)
AND "AssetEntity"."isVisible" = $3 AND ("AssetEntity"."isVisible" = $3)
) )
-- AssetRepository.getById -- AssetRepository.getById
@ -436,7 +442,7 @@ SELECT
FROM FROM
"assets" "AssetEntity" "assets" "AssetEntity"
WHERE WHERE
("AssetEntity"."id" = $1) (("AssetEntity"."id" = $1))
LIMIT LIMIT
1 1
@ -484,8 +490,8 @@ FROM
WHERE WHERE
( (
( (
"AssetEntity"."ownerId" = $1 ("AssetEntity"."ownerId" = $1)
AND "AssetEntity"."checksum" = $2 AND ("AssetEntity"."checksum" = $2)
) )
) )
AND ("AssetEntity"."deletedAt" IS NULL) AND ("AssetEntity"."deletedAt" IS NULL)
@ -529,12 +535,16 @@ WHERE
( (
( (
( (
"AssetEntity"."sidecarPath" IS NULL (
AND "AssetEntity"."isVisible" = $1 ("AssetEntity"."sidecarPath" IS NULL)
AND ("AssetEntity"."isVisible" = $1)
)
) )
OR ( OR (
"AssetEntity"."sidecarPath" = $2 (
AND "AssetEntity"."isVisible" = $3 ("AssetEntity"."sidecarPath" = $2)
AND ("AssetEntity"."isVisible" = $3)
)
) )
) )
) )

View File

@ -40,7 +40,7 @@ FROM
"LibraryEntity__LibraryEntity_owner"."deletedAt" IS NULL "LibraryEntity__LibraryEntity_owner"."deletedAt" IS NULL
) )
WHERE WHERE
(("LibraryEntity"."id" = $1)) ((("LibraryEntity"."id" = $1)))
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
@ -63,7 +63,7 @@ WHERE
FROM FROM
"libraries" "LibraryEntity" "libraries" "LibraryEntity"
WHERE WHERE
(("LibraryEntity"."name" = $1)) ((("LibraryEntity"."name" = $1)))
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
) )
LIMIT LIMIT
@ -75,7 +75,7 @@ SELECT
FROM FROM
"libraries" "LibraryEntity" "libraries" "LibraryEntity"
WHERE WHERE
(("LibraryEntity"."ownerId" = $1)) ((("LibraryEntity"."ownerId" = $1)))
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
-- LibraryRepository.getDefaultUploadLibrary -- LibraryRepository.getDefaultUploadLibrary
@ -96,8 +96,8 @@ FROM
WHERE WHERE
( (
( (
"LibraryEntity"."ownerId" = $1 ("LibraryEntity"."ownerId" = $1)
AND "LibraryEntity"."type" = $2 AND ("LibraryEntity"."type" = $2)
) )
) )
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
@ -114,8 +114,8 @@ FROM
WHERE WHERE
( (
( (
"LibraryEntity"."ownerId" = $1 ("LibraryEntity"."ownerId" = $1)
AND "LibraryEntity"."type" = $2 AND ("LibraryEntity"."type" = $2)
) )
) )
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
@ -158,8 +158,8 @@ FROM
WHERE WHERE
( (
( (
"LibraryEntity"."ownerId" = $1 ("LibraryEntity"."ownerId" = $1)
AND "LibraryEntity"."isVisible" = $2 AND ("LibraryEntity"."isVisible" = $2)
) )
) )
AND ("LibraryEntity"."deletedAt" IS NULL) AND ("LibraryEntity"."deletedAt" IS NULL)
@ -240,8 +240,8 @@ FROM
LEFT JOIN "users" "LibraryEntity__LibraryEntity_owner" ON "LibraryEntity__LibraryEntity_owner"."id" = "LibraryEntity"."ownerId" LEFT JOIN "users" "LibraryEntity__LibraryEntity_owner" ON "LibraryEntity__LibraryEntity_owner"."id" = "LibraryEntity"."ownerId"
WHERE WHERE
( (
"LibraryEntity"."isVisible" = $1 ("LibraryEntity"."isVisible" = $1)
AND NOT ("LibraryEntity"."deletedAt" IS NULL) AND (NOT ("LibraryEntity"."deletedAt" IS NULL))
) )
ORDER BY ORDER BY
"LibraryEntity"."createdAt" ASC "LibraryEntity"."createdAt" ASC

View File

@ -11,8 +11,8 @@ FROM
"move_history" "MoveEntity" "move_history" "MoveEntity"
WHERE WHERE
( (
"MoveEntity"."entityId" = $1 ("MoveEntity"."entityId" = $1)
AND "MoveEntity"."pathType" = $2 AND ("MoveEntity"."pathType" = $2)
) )
LIMIT LIMIT
1 1

View File

@ -83,7 +83,7 @@ FROM
"asset_faces" "AssetFaceEntity" "asset_faces" "AssetFaceEntity"
LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId" LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
WHERE WHERE
("AssetFaceEntity"."assetId" = $1) (("AssetFaceEntity"."assetId" = $1))
-- PersonRepository.getFaceById -- PersonRepository.getFaceById
SELECT DISTINCT SELECT DISTINCT
@ -113,7 +113,7 @@ FROM
"asset_faces" "AssetFaceEntity" "asset_faces" "AssetFaceEntity"
LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId" LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
WHERE WHERE
("AssetFaceEntity"."id" = $1) (("AssetFaceEntity"."id" = $1))
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"AssetFaceEntity_id" ASC "AssetFaceEntity_id" ASC
@ -181,7 +181,7 @@ FROM
"AssetFaceEntity__AssetFaceEntity_asset"."deletedAt" IS NULL "AssetFaceEntity__AssetFaceEntity_asset"."deletedAt" IS NULL
) )
WHERE WHERE
("AssetFaceEntity"."id" = $1) (("AssetFaceEntity"."id" = $1))
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"AssetFaceEntity_id" ASC "AssetFaceEntity_id" ASC
@ -325,9 +325,13 @@ FROM
WHERE WHERE
( (
( (
"AssetEntity__AssetEntity_faces"."personId" = $1 (
AND "AssetEntity"."isVisible" = $2 (
AND "AssetEntity"."isArchived" = $3 ("AssetEntity__AssetEntity_faces"."personId" = $1)
)
)
AND ("AssetEntity"."isVisible" = $2)
AND ("AssetEntity"."isArchived" = $3)
) )
) )
AND ("AssetEntity"."deletedAt" IS NULL) AND ("AssetEntity"."deletedAt" IS NULL)
@ -395,8 +399,10 @@ FROM
WHERE WHERE
( (
( (
"AssetFaceEntity"."assetId" = $1 (
AND "AssetFaceEntity"."personId" = $2 ("AssetFaceEntity"."assetId" = $1)
AND ("AssetFaceEntity"."personId" = $2)
)
) )
) )
@ -414,6 +420,6 @@ SELECT
FROM FROM
"asset_faces" "AssetFaceEntity" "asset_faces" "AssetFaceEntity"
WHERE WHERE
("AssetFaceEntity"."personId" = $1) (("AssetFaceEntity"."personId" = $1))
LIMIT LIMIT
1 1

View File

@ -184,8 +184,8 @@ FROM
) )
WHERE WHERE
( (
"SharedLinkEntity"."id" = $1 ("SharedLinkEntity"."id" = $1)
AND "SharedLinkEntity"."userId" = $2 AND ("SharedLinkEntity"."userId" = $2)
) )
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
@ -280,7 +280,7 @@ FROM
"6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."deletedAt" IS NULL "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."deletedAt" IS NULL
) )
WHERE WHERE
("SharedLinkEntity"."userId" = $1) (("SharedLinkEntity"."userId" = $1))
ORDER BY ORDER BY
"SharedLinkEntity"."createdAt" DESC "SharedLinkEntity"."createdAt" DESC
@ -325,7 +325,7 @@ FROM
"SharedLinkEntity__SharedLinkEntity_user"."deletedAt" IS NULL "SharedLinkEntity__SharedLinkEntity_user"."deletedAt" IS NULL
) )
WHERE WHERE
("SharedLinkEntity"."key" = $1) (("SharedLinkEntity"."key" = $1))
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"SharedLinkEntity_id" ASC "SharedLinkEntity_id" ASC

View File

@ -21,7 +21,7 @@ SELECT
FROM FROM
"users" "UserEntity" "users" "UserEntity"
WHERE WHERE
(("UserEntity"."isAdmin" = $1)) ((("UserEntity"."isAdmin" = $1)))
AND ("UserEntity"."deletedAt" IS NULL) AND ("UserEntity"."deletedAt" IS NULL)
LIMIT LIMIT
1 1
@ -41,7 +41,7 @@ WHERE
FROM FROM
"users" "UserEntity" "users" "UserEntity"
WHERE WHERE
(("UserEntity"."isAdmin" = $1)) ((("UserEntity"."isAdmin" = $1)))
AND ("UserEntity"."deletedAt" IS NULL) AND ("UserEntity"."deletedAt" IS NULL)
) )
LIMIT LIMIT
@ -92,7 +92,7 @@ SELECT
FROM FROM
"users" "UserEntity" "users" "UserEntity"
WHERE WHERE
(("UserEntity"."storageLabel" = $1)) ((("UserEntity"."storageLabel" = $1)))
AND ("UserEntity"."deletedAt" IS NULL) AND ("UserEntity"."deletedAt" IS NULL)
LIMIT LIMIT
1 1
@ -118,7 +118,7 @@ SELECT
FROM FROM
"users" "UserEntity" "users" "UserEntity"
WHERE WHERE
(("UserEntity"."oauthId" = $1)) ((("UserEntity"."oauthId" = $1)))
AND ("UserEntity"."deletedAt" IS NULL) AND ("UserEntity"."deletedAt" IS NULL)
LIMIT LIMIT
1 1

View File

@ -35,7 +35,7 @@ FROM
"UserTokenEntity__UserTokenEntity_user"."deletedAt" IS NULL "UserTokenEntity__UserTokenEntity_user"."deletedAt" IS NULL
) )
WHERE WHERE
("UserTokenEntity"."token" = $1) (("UserTokenEntity"."token" = $1))
) "distinctAlias" ) "distinctAlias"
ORDER BY ORDER BY
"UserTokenEntity_id" ASC "UserTokenEntity_id" ASC