merge: resolve asset.controller.js and asset.service.js conflicts with origin/fardeen-dev

2026-08-19 14:35:47 +05:30
parent dac030f4ef bb055fa794
commit 01e7ca58e8
19 changed files with 1079 additions and 39 deletions
@@ -21,6 +21,7 @@
    "db:seed:undo:test": "cross-env NODE_ENV=test sequelize-cli db:seed:undo:all --config src/shared/config/database.config.cjs --seeders-path src/seeders --models-path src/shared/database"
  },
  "dependencies": {
+    "@aws-sdk/client-s3": "^3.1111.0",
    "bcrypt": "^6.0.0",
    "cloudinary": "^2.10.0",
    "compression": "^1.7.5",