@duvdu-v1/duvdu 1.1.128 → 1.1.130

package/build/models/portfolio-post.model.d.ts

@@ -54,7 +54,6 @@ export interface IprojectCycle {
     };
     address: string;
     searchKeyWords: string[];
-    insurance: number;
     showOnHome: boolean;
     projectScale: {
         unit: string;

package/build/models/portfolio-post.model.js

@@ -18,7 +18,6 @@ exports.ProjectCycle = (0, mongoose_1.model)(duvdu_1.MODELS.portfolioPost, new m
     location: { lat: { type: Number, default: 0 }, lng: { type: Number, default: 0 } },
     address: { type: String, default: null },
     searchKeyWords: [String],
-    insurance: { type: Number, default: 0 },
     showOnHome: { type: Boolean, default: true },
     projectScale: { unit: String, minimum: Number, maximum: Number, pricerPerUnit: Number },
     isDeleted: { type: Boolean, default: false },

package/build/services/category.service.d.ts

@@ -6,8 +6,9 @@ interface Ititle {
     ar: string;
     en: string;
 }
-export declare function filterTagsForCategory(categoryId: string, subcategoryId: string, tags: string[], cycle: string): Promise<{
+export declare function filterTagsForCategory(categoryId: string, subcategoryId: string, tagIds: string[], cycle: string, lang: string): Promise<{
     subCategoryTitle: Ititle;
     filteredTags: Itag[];
+    media: string | undefined;
 }>;
 export {};

package/build/services/category.service.js

@@ -13,24 +13,29 @@ exports.filterTagsForCategory = void 0;
 const bad_request_error_1 = require("../errors/bad-request-error");
 const notfound_error_1 = require("../errors/notfound-error");
 const category_model_1 = require("../models/category.model");
-function filterTagsForCategory(categoryId, subcategoryId, tags, cycle) {
+const cycles_1 = require("../types/cycles");
+function filterTagsForCategory(categoryId, subcategoryId, tagIds, cycle, lang) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const category = yield category_model_1.Categories.findOne({ _id: categoryId });
         if (!category)
-            throw new notfound_error_1.NotFound('Category not found');
+            throw new notfound_error_1.NotFound({ en: 'Category not found', ar: 'الفئة غير موجودة' }, lang);
         if (category.cycle !== cycle)
-            throw new bad_request_error_1.BadRequestError('This category is not related to this cycle');
+            throw new bad_request_error_1.BadRequestError({ en: 'This category is not related to this cycle', ar: 'هذه الفئة ليست مرتبطة بهذه الدورة' }, lang);
+        if (cycle === cycles_1.CYCLES.portfolioPost) {
+            if (!category.media)
+                throw new bad_request_error_1.BadRequestError({ en: 'category must be incluide media', ar: 'يجب أن تتضمن الفئة الوسائط' }, lang);
+        }
         const subcategoryFound = (_a = category.subCategories) === null || _a === void 0 ? void 0 : _a.find((subCategory) => subCategory._id.toString() === subcategoryId);
         if (!subcategoryFound)
-            throw new bad_request_error_1.BadRequestError('Invalid subcategory');
-        function filterTags(tags, searchStrings) {
-            return tags.filter(tag => searchStrings.includes(tag.ar) || searchStrings.includes(tag.en));
+            throw new bad_request_error_1.BadRequestError({ en: 'Invalid subcategory', ar: 'فئة فرعية غير صالحة' }, lang);
+        if (!subcategoryFound.tags || !Array.isArray(subcategoryFound.tags)) {
+            throw new bad_request_error_1.BadRequestError({ en: 'Subcategory does not contain valid tags', ar: 'الفئة الفرعية لا تحتوي على علامات صالحة' }, lang);
         }
-        const filteredTags = filterTags(subcategoryFound.tags, tags);
-        if (filteredTags.length != tags.length)
-            throw new bad_request_error_1.BadRequestError('Invalid tags');
-        return { subCategoryTitle: subcategoryFound.title, filteredTags };
+        const filteredTags = subcategoryFound.tags.filter((tag) => tagIds.includes(tag._id.toString()));
+        if (filteredTags.length !== tagIds.length)
+            throw new bad_request_error_1.BadRequestError({ en: 'Invalid tags', ar: 'العلامات غير صالحة' }, lang);
+        return { subCategoryTitle: subcategoryFound.title, filteredTags, media: category.media ? category.media : undefined };
     });
 }
 exports.filterTagsForCategory = filterTagsForCategory;

package/package.json

@@ -1,57 +1,57 @@
-{
-  "name": "@duvdu-v1/duvdu",
-  "version": "1.1.128",
-  "main": "./build/index.js",
-  "types": "./build/index.d.ts",
-  "files": [
-    "build/**/*"
-  ],
-  "scripts": {
-    "clean": "rimraf ./build",
-    "build": "npm run clean && tsc",
-    "fix:build": "mv ./build/common/src/* ./build && rm -rf ./build/auth ./build/common",
-    "pub": "git add . && git commit -m \"updates\" && npm version patch && npm run build && npm publish",
-    "lint": "eslint .",
-    "lint:fix": "eslint --fix .",
-    "format": "prettier --write ."
-  },
-  "keywords": [],
-  "author": "motemed khaled",
-  "license": "ISC",
-  "dependencies": {
-    "@duvdu-v1/duvdu": "^1.1.116",
-    "@types/express": "^4.17.21",
-    "@types/express-session": "^1.18.0",
-    "@types/jsonwebtoken": "^9.0.5",
-    "@types/multer": "^1.4.11",
-    "@types/node": "^20.11.0",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
-    "aws-sdk": "^2.1595.0",
-    "connect-redis": "^7.1.1",
-    "express": "^4.18.2",
-    "express-async-errors": "^3.1.1",
-    "express-session": "^1.18.0",
-    "express-validator": "^7.0.1",
-    "jsonwebtoken": "^9.0.2",
-    "mongoose": "^8.0.4",
-    "multer": "^1.4.5-lts.1",
-    "node-nats-streaming": "^0.3.2",
-    "redis": "^4.6.13",
-    "rimraf": "^5.0.5",
-    "typescript": "^5.3.3",
-    "uuid": "^9.0.1",
-    "winston": "^3.13.0",
-    "winston-daily-rotate-file": "^5.0.0"
-  },
-  "devDependencies": {
-    "@types/uuid": "^9.0.8",
-    "del-cli": "^5.1.0",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "prettier": "^3.2.4"
-  },
-  "description": ""
-}
+{
+  "name": "@duvdu-v1/duvdu",
+  "version": "1.1.130",
+  "main": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "files": [
+    "build/**/*"
+  ],
+  "scripts": {
+    "clean": "rimraf ./build",
+    "build": "npm run clean && tsc",
+    "fix:build": "mv ./build/common/src/* ./build && rm -rf ./build/auth ./build/common",
+    "pub": "git add . && git commit -m \"updates\" && npm version patch && npm run build && npm publish",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
+    "format": "prettier --write ."
+  },
+  "keywords": [],
+  "author": "motemed khaled",
+  "license": "ISC",
+  "dependencies": {
+    "@duvdu-v1/duvdu": "^1.1.116",
+    "@types/express": "^4.17.21",
+    "@types/express-session": "^1.18.0",
+    "@types/jsonwebtoken": "^9.0.5",
+    "@types/multer": "^1.4.11",
+    "@types/node": "^20.11.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
+    "aws-sdk": "^2.1595.0",
+    "connect-redis": "^7.1.1",
+    "express": "^4.18.2",
+    "express-async-errors": "^3.1.1",
+    "express-session": "^1.18.0",
+    "express-validator": "^7.0.1",
+    "jsonwebtoken": "^9.0.2",
+    "mongoose": "^8.0.4",
+    "multer": "^1.4.5-lts.1",
+    "node-nats-streaming": "^0.3.2",
+    "redis": "^4.6.13",
+    "rimraf": "^5.0.5",
+    "typescript": "^5.3.3",
+    "uuid": "^9.0.1",
+    "winston": "^3.13.0",
+    "winston-daily-rotate-file": "^5.0.0"
+  },
+  "devDependencies": {
+    "@types/uuid": "^9.0.8",
+    "del-cli": "^5.1.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.4"
+  },
+  "description": ""
+}