AssetData connections added, 3dWidget update and get added

src/api-server/Routes/widget3dRoutes.ts

@@ -3,4 +3,5 @@ import { widget3dService } from "../controller/visualization/3dWidgetService.ts"
 const router = express.Router();
 router.post("/3dwidget/save", widget3dService.add3Dwidget);
 router.get("/3dwidgetData/:zoneId/:organization", widget3dService.get3Dwiget);
+router.get("/widget3D/:id/:organization", widget3dService.getSingle3Dwidget);
 export default router;

src/api-server/controller/simulation/assetsFloorservice.ts

@@ -87,13 +87,18 @@ export class assetsFloorservice {
                   triggerRefs.push(triggerDoc._id);
                 }
               }
+              // point.connections{
+              //   source:{
 
+              //   }
+              // }
               pointRefs.push({
                 uuid: point.uuid,
                 position: point.position || [],
                 rotation: point.rotation || [],
                 actions: actionRefs,
                 triggers: triggerRefs,
+                connections: point.connections,
               });
             }
           }

src/api-server/controller/visualization/3dWidgetService.ts

@@ -24,7 +24,14 @@ export class widget3dService {
             zoneId: zoneId,
             isArchive: false,
           },
-          { position: widget.position },
+          {
+            position: widget?.position,
+            Data: {
+              measurements: widget?.Data.measurements,
+              duration: widget?.Data.duration,
+            },
+            widgetName: widget?.widgetName,
+          },
           { upsert: true, new: true }
         );
         if (update3dwidget)
@@ -34,7 +41,7 @@ export class widget3dService {
         else return res.send("Widget not updated");
       }
       const newWidget3d = await widget3dModel(organization).create({
-        widgetName: widget.type,
+        type: widget.type,
         widgetID: widget.id,
         position: widget.position,
         zoneId,
@@ -66,7 +73,7 @@ export class widget3dService {
           measurements: widget.Data?.measurements || {},
           duration: widget.Data?.duration || "1h",
         },
-        type: widget.widgetName,
+        type: widget.type,
         id: widget.widgetID,
         position: widget.position,
       }));
@@ -103,4 +110,22 @@ export class widget3dService {
   //     return res.status(500).send(error.message);
   //   }
   // }
+  static async getSingle3Dwidget(req: Request, res: Response): Promise<any> {
+    const { organization, id } = req.params;
+    try {
+      const widgetData = await widget3dModel(organization).findOne({
+        widgetID: id,
+        isArchive: false,
+      });
+      if (!widgetData) return res.send("WidgetID not found");
+      const structureData = {
+        measurements: widgetData?.Data.measurements,
+        duration: widgetData?.Data.duration,
+      };
+      const widgetName = widgetData.widgetName;
+      return res.status(200).json({ Data: structureData, widgetName });
+    } catch (error: any) {
+      return res.status(500).send(error.message);
+    }
+  }
 }

src/api-server/controller/visualization/widgetService.ts

@@ -47,7 +47,7 @@ export class widgetService {
               $set: {
                 // panelID: existingPanel._id,
                 // widgetID: widget.id,
-                widgetName: widget.widgetName,
+                widgetName: widget?.widgetName,
                 Data: {
                   measurements: widget.Data?.measurements || {},
                   duration: widget.Data?.duration || "1h",
@@ -69,7 +69,7 @@ export class widgetService {
           widgetID: widget.id,
           elementType: widget.type,
           // widgetOrder: widgetOrder,
-          widgetName: widget.widgetName,
+          widgetName: widget.title,
           panelID: existingPanel._id,
           widgetside: widget.panel,
           // Data: {

src/shared/model/vizualization/3dwidget.ts

@@ -2,8 +2,9 @@ import mongoose, { Schema, Document, model } from "mongoose";
 import MainModel from "../../connect/mongoose.ts";
 
 export interface Widget3d extends Document {
-  widgetName: string;
+  type: string;
   widgetID: string;
+  widgetName: string;
   position: [];
   isArchive: boolean;
   zoneId: string;
@@ -14,8 +15,9 @@ export interface Widget3d extends Document {
 }
 const Widget3dSchema: Schema = new Schema(
   {
-    widgetName: { type: String },
+    type: { type: String },
     widgetID: { type: String },
+    widgetName: { type: String, default: "Widget3D" },
     position: { type: Array },
     zoneId: { type: String },
     Data: {

src/socket-server/services/assets/asset-Controller.ts

@@ -3,8 +3,18 @@ import actionModel from "../../../shared/model/simulation/actionmodel.ts";
 import triggerModel from "../../../shared/model/simulation/triggersmodel.ts";
 
 export const setAssetModel = async (data: any) => {
-    const {modeluuid, modelname,position,rotation, eventData,modelfileID,isLocked,isVisible,organization, }= data
+  const {
-    console.log('data: ', data);
+    modeluuid,
+    modelname,
+    position,
+    rotation,
+    eventData,
+    modelfileID,
+    isLocked,
+    isVisible,
+    organization,
+  } = data;
+  console.log("data: ", data);
   // const position=data.position
   // const rotation=data.rotation
   try {
@@ -14,7 +24,7 @@ export const setAssetModel = async (data: any) => {
     });
 
     if (findvalue) {
-          console.log('findvalue: ', findvalue);
+      console.log("findvalue: ", findvalue);
       const updatevalue = await assetModel(organization).findOneAndUpdate(
         { modeluuid: modeluuid, modelname: modelname },
         {
@@ -25,8 +35,13 @@ export const setAssetModel = async (data: any) => {
         },
         { new: true }
       );
-          console.log('updatevalue: ', updatevalue);
+      console.log("updatevalue: ", updatevalue);
-          return { success: true, message: 'Model updated successfully', data: updatevalue, organization: organization }
+      return {
+        success: true,
+        message: "Model updated successfully",
+        data: updatevalue,
+        organization: organization,
+      };
     } else {
       let assetData: any = {
         modeluuid,
@@ -83,6 +98,7 @@ export const setAssetModel = async (data: any) => {
               rotation: point.rotation || [],
               actions: actionRefs,
               triggers: triggerRefs,
+              connections: point.connections,
             });
           }
         }
@@ -96,32 +112,65 @@ export const setAssetModel = async (data: any) => {
       await assetDoc.save();
       //   await assetDoc.save();
       // if(assetDoc.)
-         const assetDatas={
+      const assetDatas = {
-          modeluuid:assetDoc.modeluuid,modelname:assetDoc.modelname,modelfileID:assetDoc.modelfileID,position:assetDoc.position,rotation:assetDoc.rotation,isLocked:assetDoc.isLocked,isVisible:assetDoc.isVisible
+        modeluuid: assetDoc.modeluuid,
-          ,eventData:{points:assetDoc.points,type:assetDoc.type,speed:assetDoc.speed}
+        modelname: assetDoc.modelname,
+        modelfileID: assetDoc.modelfileID,
+        position: assetDoc.position,
+        rotation: assetDoc.rotation,
+        isLocked: assetDoc.isLocked,
+        isVisible: assetDoc.isVisible,
+        eventData: {
+          points: assetDoc.points,
+          type: assetDoc.type,
+          speed: assetDoc.speed,
+        },
+      };
+      return {
+        success: true,
+        message: "Model created successfully",
+        data: assetDatas,
+        organization: organization,
+      };
     }
-          return { success: true, message:"Model created successfully", data: assetDatas, organization: organization }
+  } catch (error: any) {
-        }
-      } catch (error:any) {
     // console.error("Error creating flooritems:", error);
-        return { success: false, message: error?.message || "Error occurred while ModelAsset", error, organization: organization }
+    return {
+      success: false,
+      message: error?.message || "Error occurred while ModelAsset",
+      error,
+      organization: organization,
+    };
   }
-}
+};
- export const deleteAssetModel = async (data: any)=>{
+export const deleteAssetModel = async (data: any) => {
-   const { modeluuid,modelname,organization } = data;
+  const { modeluuid, modelname, organization } = data;
   try {
-
+    const findValue = await assetModel(organization).findOneAndDelete({
-            const findValue = await assetModel(organization).findOneAndDelete({modeluuid:modeluuid,modelname:modelname})
+      modeluuid: modeluuid,
+      modelname: modelname,
+    });
     if (!findValue) {
-                return { success: false, message: 'model not found',organization:organization }
+      return {
-
+        success: false,
+        message: "model not found",
+        organization: organization,
+      };
     } else {
-
+      return {
-                return { success: true, message: 'Model deleted successfully', data: findValue,organization:organization }
+        success: true,
+        message: "Model deleted successfully",
+        data: findValue,
+        organization: organization,
+      };
     }
   } catch (error) {
     // console.error('Error get flooritems:', error);
-            return { success: false, message: 'Failed to delete asset', error,organization:organization }
+    return {
-
+      success: false,
-        }
+      message: "Failed to delete asset",
+      error,
+      organization: organization,
+    };
   }
+};