new API -V1, modelfileID updated to assetId

src/api-server/V1/v1Controllers/builderController/v1assetController.ts

@@ -21,7 +21,7 @@ export const CreateAssetController = async (
       position,
       rotation,
       eventData,
-      modelfileID,
+      assetId,
       isLocked,
       isVisible,
       projectId,
@@ -45,7 +45,7 @@ export const CreateAssetController = async (
       position,
       rotation,
       eventData,
-      modelfileID,
+      assetId,
       isLocked,
       isVisible,
       projectId,

src/api-server/V1/v1Controllers/builderController/v1wallController.ts

@@ -17,6 +17,7 @@ export const WallSetup = async (
       modelName,
       position,
       type,
+      assetId,
       csgposition,
       csgscale,
       quaternion,
@@ -47,6 +48,7 @@ export const WallSetup = async (
       modelName,
       position,
       type,
+      assetId,
       csgposition,
       csgscale,
       quaternion,

src/shared/V1Models/Builder/assetModel.ts

@@ -25,7 +25,7 @@ export interface AssetData extends Document {
   projectId: Project["_id"];
   versionId: Version["_id"];
   modelUuid: string;
-  modelfileID: string;
+  assetId: string;
   modelName: string;
   isLocked: boolean;
   type: string;
@@ -48,7 +48,7 @@ const assetDataSchema: Schema = new Schema({
   versionId: { type: Schema.Types.ObjectId, ref: "Version" },
   isArchive: { type: Boolean, default: false },
   modelUuid: { type: String },
-  modelfileID: { type: String },
+  assetId: { type: String },
   modelName: { type: String },
   type: { type: String },
   position: { type: Array },

src/shared/V1Models/Builder/wallItemsModel.ts

@@ -8,6 +8,7 @@ export interface WallItems extends Document {
   projectId: Project["_id"];
   versionId: Version["_id"];
   modelUuid: string;
+  assetId: string;
   modelName: string;
   type: string;
   csgposition: [];
@@ -22,6 +23,7 @@ const wallItemsSchema: Schema = new Schema({
   projectId: { type: Schema.Types.ObjectId, ref: "Project" },
   versionId: { type: Schema.Types.ObjectId, ref: "Version" },
   modelUuid: { type: String, unique: true },
+  assetId: { type: String },
   modelName: { type: String },
   type: { type: String },
   csgposition: { type: Array },

src/shared/services/builder/assetService.ts

@@ -12,7 +12,7 @@ interface SetAssetInput {
   position: [];
   rotation: object;
   eventData: Mixed;
-  modelfileID: string;
+  assetId: string;
   isLocked: boolean;
   isVisible: boolean;
   organization: string;
@@ -59,7 +59,7 @@ export const setAssetModel = async (
       position,
       rotation,
       eventData,
-      modelfileID,
+      assetId,
       isLocked,
       isVisible,
       organization,
@@ -110,7 +110,7 @@ export const setAssetModel = async (
         modelUuid,
         modelName,
         position,
-        modelfileID,
+        assetId,
         rotation,
         isLocked,
         isVisible,
@@ -166,7 +166,7 @@ export const setAssetModel = async (
           userId: assetDoc.userId,
           modelUuid: assetDoc.modelUuid,
           modelName: assetDoc.modelName,
-          modelfileID: assetDoc.modelfileID,
+          assetId: assetDoc.assetId,
           position: assetDoc.position,
           rotation: assetDoc.rotation,
           isLocked: assetDoc.isLocked,
@@ -179,7 +179,7 @@ export const setAssetModel = async (
           userId: assetDoc.userId,
           modelUuid: assetDoc.modelUuid,
           modelName: assetDoc.modelName,
-          modelfileID: assetDoc.modelfileID,
+          assetId: assetDoc.assetId,
           position: assetDoc.position,
           rotation: assetDoc.rotation,
           isLocked: assetDoc.isLocked,
@@ -195,7 +195,7 @@ export const setAssetModel = async (
           userId: assetDoc.userId,
           modelUuid: assetDoc.modelUuid,
           modelName: assetDoc.modelName,
-          modelfileID: assetDoc.modelfileID,
+          assetId: assetDoc.assetId,
           position: assetDoc.position,
           rotation: assetDoc.rotation,
           isLocked: assetDoc.isLocked,
@@ -211,7 +211,7 @@ export const setAssetModel = async (
           userId: assetDoc.userId,
           modelUuid: assetDoc.modelUuid,
           modelName: assetDoc.modelName,
-          modelfileID: assetDoc.modelfileID,
+          assetId: assetDoc.assetId,
           position: assetDoc.position,
           rotation: assetDoc.rotation,
           isLocked: assetDoc.isLocked,
@@ -227,7 +227,7 @@ export const setAssetModel = async (
           userId: assetDoc.userId,
           modelUuid: assetDoc.modelUuid,
           modelName: assetDoc.modelName,
-          modelfileID: assetDoc.modelfileID,
+          assetId: assetDoc.assetId,
           position: assetDoc.position,
           rotation: assetDoc.rotation,
           isLocked: assetDoc.isLocked,
@@ -453,7 +453,7 @@ export const getFloorItems = async (
         modelName: item.modelName,
         position: item.position,
         rotation: item.rotation,
-        modelfileID: item.modelfileID,
+        assetId: item.assetId,
         isLocked: item.isLocked,
         isVisible: item.isVisible,
         eventData: item.eventData,

src/shared/services/builder/wallService.ts

@@ -5,6 +5,7 @@ import {
 } from "../helpers/v1projecthelperFns.ts";
 interface IWallSetupData {
   modelUuid: string;
+  assetId: string;
   modelName: string;
   type: string;
   csgposition: [];
@@ -45,6 +46,7 @@ export const setWallItems = async (
       csgposition,
       csgscale,
       quaternion,
+      assetId,
       scale,
       projectId,
       organization,
@@ -90,6 +92,7 @@ export const setWallItems = async (
         csgscale,
         quaternion,
         scale,
+        assetId,
       });
       console.log("newValue: ", newValue);
       return {

src/socket-server/controllers/builderController/asset-Controller.ts

@@ -27,7 +27,7 @@ export const setAssetHandleEvent = async (
     "modelName",
     "position",
     "rotation",
-    "modelfileID",
+    "assetId",
     "isLocked",
     "isVisible",
     "projectId",

src/socket-server/controllers/builderController/wall-Controller.ts

@@ -20,6 +20,7 @@ export const setWallItemsHandleEvent = async (
         "csgposition",
         "csgscale",
         "quaternion",
+        "assetId",
         "scale",
         "projectId",
         "userId",