Merge pull request #11 from Duna-System/feature/dxf

Adding new entity type
Duna-System · Jun 10, 2024 · 1febecb · 1febecb
2 parents 4e5e04f + 2a26db1
commit 1febecb
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 0 deletions.
diff --git a/build/interfaces.d.ts b/build/interfaces.d.ts
@@ -66,6 +66,7 @@ export interface IProjectDb {
     clouds: Array<string>;
     images: Array<string>;
     bim: Array<string>;
+    cad: Array<string>;
     photogrammetry: Array<string>;
     projectQuota: ProjectQuota;
     createdAt: number;
@@ -115,5 +116,6 @@ export declare enum EntityType {
     Image = "images",
     BIM = "bim",
     Photogrammetry = "photogrammerty",
+    CAD = "cad",
     Unknown = "unknown"
 }
diff --git a/build/interfaces.js b/build/interfaces.js
@@ -29,5 +29,6 @@ var EntityType;
     EntityType["Image"] = "images";
     EntityType["BIM"] = "bim";
     EntityType["Photogrammetry"] = "photogrammerty";
+    EntityType["CAD"] = "cad";
     EntityType["Unknown"] = "unknown";
 })(EntityType || (exports.EntityType = EntityType = {}));
diff --git a/build/projects/services/ProjectService.js b/build/projects/services/ProjectService.js
@@ -51,6 +51,7 @@ class ProjectService {
                 .findOne({ _id: project_id, user_id: user_id })
                 .populate('clouds')
                 .populate('bim')
+                .populate('cad')
                 .populate('images')
                 .populate('photogrammetry')
                 .lean()
@@ -139,6 +140,7 @@ class ProjectService {
                 .find({ user_id: user_id })
                 .populate('clouds')
                 .populate('bim')
+                .populate('cad')
                 .populate('images')
                 .populate('photogrammetry')
                 .lean()

diff --git a/build/projects/validationProjectsDb.js b/build/projects/validationProjectsDb.js
@@ -36,6 +36,7 @@ function createProjectCollectionWithValidation(uri, databaseName, collection_pro
                         'clouds',
                         'images',
                         'bim',
+                        "cad",
                         'photogrammetry',
                         'projectQuota',
                         'createdAt',
@@ -83,6 +84,11 @@ function createProjectCollectionWithValidation(uri, databaseName, collection_pro
                             items: { bsonType: 'string' },
                             description: 'List of associated BIM entities (string array)',
                         },
+                        cad: {
+                            bsonType: 'array',
+                            items: { bsonType: 'string' },
+                            description: 'List of associated CAD entities (string array)',
+                        },
                         photogrammetry: {
                             bsonType: 'array',
                             items: { bsonType: 'string' },

diff --git a/build/projects/validationProjectsModel.js b/build/projects/validationProjectsModel.js
@@ -13,6 +13,7 @@ const projectSchema = new mongoose_1.Schema({
     clouds: { type: [String], default: [], ref: 'entity' },
     images: { type: [String], default: [], ref: 'entity' },
     bim: { type: [String], default: [], ref: 'entity' },
+    cad: { type: [String], default: [], ref: 'entity' },
     photogrammetry: { type: [String], default: [], ref: 'entity' },
     projectQuota: {
         pointCloudUsedMB: { type: Number, required: true },

diff --git a/build/users/validationUserModel.d.ts b/build/users/validationUserModel.d.ts
@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Model } from 'mongoose';
 import { IUsers } from '../interfaces';
 declare const UserModel: Model<IUsers>;

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -70,6 +70,7 @@ export interface IProjectDb {
     clouds: Array<string>
     images: Array<string>
     bim: Array<string>
+    cad: Array<string>
     photogrammetry: Array<string>
     projectQuota: ProjectQuota
     createdAt: number
@@ -122,5 +123,6 @@ export enum EntityType {
     Image = 'images',
     BIM = 'bim',
     Photogrammetry = 'photogrammerty',
+    CAD = 'cad',
     Unknown = 'unknown',
 }
diff --git a/src/projects/services/ProjectService.ts b/src/projects/services/ProjectService.ts
@@ -46,6 +46,7 @@ export class ProjectService {
             .findOne({ _id: project_id, user_id: user_id })
             .populate('clouds')
             .populate('bim')
+            .populate('cad')
             .populate('images')
             .populate('photogrammetry')
             .lean()
@@ -149,6 +150,7 @@ export class ProjectService {
             .find({ user_id: user_id })
             .populate('clouds')
             .populate('bim')
+            .populate('cad')
             .populate('images')
             .populate('photogrammetry')
             .lean()

diff --git a/src/projects/validationProjectsDb.ts b/src/projects/validationProjectsDb.ts
@@ -28,6 +28,7 @@ export async function createProjectCollectionWithValidation(
                     'clouds',
                     'images',
                     'bim',
+                    'cad',
                     'photogrammetry',
                     'projectQuota',
                     'createdAt',
@@ -78,6 +79,12 @@ export async function createProjectCollectionWithValidation(
                         description:
                             'List of associated BIM entities (string array)',
                     },
+                    cad: {
+                        bsonType: 'array',
+                        items: { bsonType: 'string' },
+                        description:
+                            'List of associated CAD entities (string array)',
+                    },
                     photogrammetry: {
                         bsonType: 'array',
                         items: { bsonType: 'string' },

diff --git a/src/projects/validationProjectsModel.ts b/src/projects/validationProjectsModel.ts
@@ -12,6 +12,7 @@ const projectSchema = new Schema<IProjectDb>({
     clouds: { type: [String], default: [], ref: 'entity' },
     images: { type: [String], default: [], ref: 'entity' },
     bim: { type: [String], default: [], ref: 'entity' },
+    cad: { type: [String], default: [], ref: 'entity' },
     photogrammetry: { type: [String], default: [], ref: 'entity' },
     projectQuota: {
         pointCloudUsedMB: { type: Number, required: true },