@duvdu-v1/duvdu 1.1.200 → 1.1.202

package/build/models/copyrights.model.d.ts

@@ -36,8 +36,8 @@ export interface IcopyRights {
     };
     address: string;
     location: {
-        lat: number;
-        lng: number;
+        type: 'Point';
+        coordinates: [number, number];
     };
     searchKeywords: string[];
     showOnHome: boolean;

package/build/models/copyrights.model.js

@@ -22,11 +22,11 @@ exports.CopyRights = (0, mongoose_1.model)(model_names_1.MODELS.copyrights, new
     subCategory: {
         ar: String,
         en: String,
-        _id: String
+        _id: String,
     },
     location: {
-        lat: { type: Number, default: null },
-        lng: { type: Number, default: null },
+        type: { type: String, default: 'Point' },
+        coordinates: { type: [Number], default: [31.2357, 30.0444] },
     },
     minBudget: { type: Number, default: null },
     maxBudget: { type: Number, default: null },
@@ -35,4 +35,5 @@ exports.CopyRights = (0, mongoose_1.model)(model_names_1.MODELS.copyrights, new
     collection: model_names_1.MODELS.copyrights,
 })
     .index({ createdAt: 1, updatedAt: -1 })
-    .index({ searchKeywords: 'text' }));
+    .index({ searchKeywords: 'text' })
+    .index({ location: '2dsphere' }));

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

@@ -59,8 +59,8 @@ export interface IprojectCycle {
         inviteStatus: InviteStatus;
     }[];
     location: {
-        lat: number;
-        lng: number;
+        type: 'Point';
+        coordinates: [number, number];
     };
     address: string;
     searchKeyWords: string[];

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

@@ -12,7 +12,11 @@ var InviteStatus;
 exports.ProjectCycle = (0, mongoose_1.model)(model_names_1.MODELS.portfolioPost, new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.user },
     category: { type: mongoose_1.Schema.Types.ObjectId, ref: model_names_1.MODELS.category },
-    subCategory: { ar: { type: String, default: null }, en: { type: String, default: null }, _id: String },
+    subCategory: {
+        ar: { type: String, default: null },
+        en: { type: String, default: null },
+        _id: String,
+    },
     tags: [{ ar: { type: String, default: null }, en: { type: String, default: null } }],
     cover: { type: String, default: null },
     audioCover: { type: String, default: null },
@@ -29,7 +33,10 @@ exports.ProjectCycle = (0, mongoose_1.model)(model_names_1.MODELS.portfolioPost,
             inviteStatus: { type: String, enum: InviteStatus, default: InviteStatus.pending },
         },
     ],
-    location: { lat: { type: Number, default: 0 }, lng: { type: Number, default: 0 } },
+    location: {
+        type: { type: String, default: 'Point' },
+        coordinates: { type: [Number], default: [31.2357, 30.0444] },
+    },
     address: { type: String, default: null },
     searchKeyWords: [String],
     showOnHome: { type: Boolean, default: true },
@@ -50,4 +57,4 @@ exports.ProjectCycle = (0, mongoose_1.model)(model_names_1.MODELS.portfolioPost,
     },
     minBudget: { type: Number, default: null },
     maxBudget: { type: Number, default: null },
-}, { timestamps: true, collection: model_names_1.MODELS.portfolioPost }));
+}, { timestamps: true, collection: model_names_1.MODELS.portfolioPost }).index({ location: '2dsphere' }));

package/build/models/rental.model.d.ts

@@ -52,8 +52,8 @@ export interface Irental {
     email: string;
     description: string;
     location: {
-        lat: number;
-        lng: number;
+        type: 'Point';
+        coordinates: [number, number];
     };
     address: string;
     searchKeywords: string[];

package/build/models/rental.model.js

@@ -22,7 +22,10 @@ exports.Rentals = (0, mongoose_1.model)('rentals', new mongoose_1.Schema({
     phoneNumber: String,
     email: String,
     description: String,
-    location: { lat: Number, lng: Number },
+    location: {
+        type: { type: String, default: 'Point' },
+        coordinates: { type: [Number], default: [31.2357, 30.0444] },
+    },
     address: String,
     searchKeywords: [String],
     insurance: { type: Number, default: null },
@@ -37,4 +40,6 @@ exports.Rentals = (0, mongoose_1.model)('rentals', new mongoose_1.Schema({
     rate: { ratersCounter: Number, totalRates: Number },
     minBudget: { type: Number, default: null },
     maxBudget: { type: Number, default: null },
-}, { collection: 'rentals', timestamps: true }).index({ createdAt: 1, updatedAt: -1 }));
+}, { collection: 'rentals', timestamps: true })
+    .index({ createdAt: 1, updatedAt: -1 })
+    .index({ location: '2dsphere' }));

package/build/utils/bucket.d.ts

@@ -5,4 +5,5 @@ export declare class Bucket {
     constructor();
     saveBucketFiles(folder: string, ...files: Express.Multer.File[]): Promise<void>;
     removeBucketFiles(...filePaths: string[]): Promise<void>;
+    private getContentType;
 }

package/build/utils/bucket.js

@@ -29,12 +29,15 @@ class Bucket {
         return __awaiter(this, void 0, void 0, function* () {
             for (const file of files) {
                 const fileStream = fs_1.default.createReadStream(path_1.default.resolve(`media/${folder}/${file.filename}`));
+                const contentType = this.getContentType(file.filename);
                 yield new Promise((resolve, reject) => {
                     this.s3.putObject({
                         Bucket: this.bucketName,
                         Key: `${folder}/${file.filename}`,
                         Body: fileStream,
                         ContentDisposition: 'inline',
+                        ContentType: contentType,
+                        ACL: 'public-read'
                     }, (err, data) => {
                         if (err)
                             reject(err);
@@ -58,5 +61,63 @@ class Bucket {
             });
         });
     }
+    getContentType(filename) {
+        const ext = path_1.default.extname(filename).toLowerCase();
+        switch (ext) {
+            // Video Types
+            case '.mp4':
+                return 'video/mp4';
+            case '.webm':
+                return 'video/webm';
+            case '.ogg':
+                return 'video/ogg';
+            case '.avi':
+                return 'video/x-msvideo';
+            case '.mov':
+                return 'video/quicktime';
+            case '.wmv':
+                return 'video/x-ms-wmv';
+            case '.mkv':
+                return 'video/x-matroska';
+            case '.flv':
+                return 'video/x-flv';
+            // Audio Types
+            case '.mp3':
+                return 'audio/mpeg';
+            case '.wav':
+                return 'audio/wav';
+            case '.aac':
+                return 'audio/aac';
+            case '.flac':
+                return 'audio/flac';
+            case '.m4a':
+                return 'audio/x-m4a';
+            case '.wma':
+                return 'audio/x-ms-wma';
+            // Image Types
+            case '.jpg':
+            case '.jpeg':
+                return 'image/jpeg';
+            case '.png':
+                return 'image/png';
+            case '.gif':
+                return 'image/gif';
+            case '.bmp':
+                return 'image/bmp';
+            case '.webp':
+                return 'image/webp';
+            case '.svg':
+                return 'image/svg+xml';
+            case '.tiff':
+            case '.tif':
+                return 'image/tiff';
+            // PDF and other document types
+            case '.pdf':
+                return 'application/pdf';
+            // Default fallback
+            default:
+                return 'application/octet-stream'; // Fallback for unknown types
+        }
+    }
 }
 exports.Bucket = Bucket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.200",
+  "version": "1.1.202",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [