Dwinzo-Beta/Dwinzo-Backend-V0.0
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix in adding models that dont have eventData

Browse Source
This commit is contained in:
Nivetharamesh99
2025-05-10 10:34:24 +05:30
parent e7632afad6
commit cb668a6c96
3 changed files with 87 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env
View File

@@ -3,10 +3,11 @@
# MONGO_PASSWORD=mongodb@hexr2002 # MONGO_PASSWORD=mongodb@hexr2002
# MONGO_AUTH_DB=admin # MONGO_AUTH_DB=admin
MONGO_URI=mongodb://mongo/
MONGO_USER=admin MONGO_USER=admin
MONGO_PASSWORD=admin321 MONGO_PASSWORD=admin321
MONGO_AUTH_DB=admin MONGO_AUTH_DB=admin
MONGO_URI=mongodb://mongo/
API_PORT=5000 API_PORT=5000
SOCKET_PORT=8000 SOCKET_PORT=8000
NODE_ENV=development NODE_ENV=development

4
src/shared/model/builder/assets/asset-Model.ts
View File

@@ -34,10 +34,9 @@ export interface assetData extends Document {
z: number; z: number;
}; };
speed: number | string; speed: number | string;
eventData: IPoint|IPointsConveyor eventData: IPoint | IPointsConveyor;
} }
const assetDataSchema: Schema = new Schema({ const assetDataSchema: Schema = new Schema({
isArchive: { type: Boolean, default: false }, isArchive: { type: Boolean, default: false },
modelUuid: { type: String }, modelUuid: { type: String },
@@ -56,7 +55,6 @@ const assetDataSchema: Schema = new Schema({
isVisible: { type: Boolean }, isVisible: { type: Boolean },
eventData: { eventData: {
type: Schema.Types.Mixed, type: Schema.Types.Mixed,
required: true,
}, },
}); });

137
src/socket-server/services/assets/asset-Controller.ts
View File

@@ -231,7 +231,7 @@ export const setAssetModel = async (data: any) => {
rotation: rotation, rotation: rotation,
isVisible: isVisible, isVisible: isVisible,
isLocked: isLocked, isLocked: isLocked,
eventData: eventData eventData: eventData,
}, },
{ new: true } { new: true }
); );
@@ -252,20 +252,21 @@ export const setAssetModel = async (data: any) => {
isVisible, isVisible,
}; };
if (eventData?.type === 'Conveyor') { if (eventData) {
if (eventData?.type === "Conveyor") {
assetData.eventData = { assetData.eventData = {
type: eventData.type, type: eventData.type,
// point:undefined, // point:undefined,
points: eventData.points, points: eventData.points,
}; };
} else { } else {
assetData.eventData = { assetData.eventData = {
type: eventData.type, type: eventData.type,
point: eventData.point, point: eventData.point,
// points: undefined // points: undefined
}; };
} }
}
// if (eventData) { // if (eventData) {
@@ -301,70 +302,70 @@ export const setAssetModel = async (data: any) => {
const assetDoc = await assetModel(organization).create(assetData); const assetDoc = await assetModel(organization).create(assetData);
await assetDoc.save(); await assetDoc.save();
let assetDatas; let assetDatas;
// if (eventData.type === "Conveyor") { if (eventData.type === "Conveyor") {
// assetDatas = { assetDatas = {
// modelUuid: assetDoc.modelUuid, modelUuid: assetDoc.modelUuid,
// modelName: assetDoc.modelName, modelName: assetDoc.modelName,
// modelfileID: assetDoc.modelfileID, modelfileID: assetDoc.modelfileID,
// position: assetDoc.position, position: assetDoc.position,
// rotation: assetDoc.rotation, rotation: assetDoc.rotation,
// isLocked: assetDoc.isLocked, isLocked: assetDoc.isLocked,
// isVisible: assetDoc.isVisible, isVisible: assetDoc.isVisible,
// eventData:eventData eventData: eventData,
// }; };
// } else if (assetDoc.type === "Vehicle") { } else if (assetDoc.type === "Vehicle") {
// assetDatas = { assetDatas = {
// modelUuid: assetDoc.modelUuid, modelUuid: assetDoc.modelUuid,
// modelName: assetDoc.modelName, modelName: assetDoc.modelName,
// modelfileID: assetDoc.modelfileID, modelfileID: assetDoc.modelfileID,
// position: assetDoc.position, position: assetDoc.position,
// rotation: assetDoc.rotation, rotation: assetDoc.rotation,
// isLocked: assetDoc.isLocked, isLocked: assetDoc.isLocked,
// isVisible: assetDoc.isVisible, isVisible: assetDoc.isVisible,
// eventData: { eventData: {
// points: assetDoc.points, points: assetDoc.points,
// type: assetDoc.type, type: assetDoc.type,
// }, },
// }; };
// } else if (assetDoc.type === "ArmBot") { } else if (assetDoc.type === "ArmBot") {
// assetDatas = { assetDatas = {
// modelUuid: assetDoc.modelUuid, modelUuid: assetDoc.modelUuid,
// modelName: assetDoc.modelName, modelName: assetDoc.modelName,
// modelfileID: assetDoc.modelfileID, modelfileID: assetDoc.modelfileID,
// position: assetDoc.position, position: assetDoc.position,
// rotation: assetDoc.rotation, rotation: assetDoc.rotation,
// isLocked: assetDoc.isLocked, isLocked: assetDoc.isLocked,
// isVisible: assetDoc.isVisible, isVisible: assetDoc.isVisible,
// eventData: { eventData: {
// points: assetDoc.points, points: assetDoc.points,
// type: assetDoc.type, type: assetDoc.type,
// }, },
// }; };
// } else if (assetDoc.type === "StaticMachine") { } else if (assetDoc.type === "StaticMachine") {
// assetDatas = { assetDatas = {
// modelUuid: assetDoc.modelUuid, modelUuid: assetDoc.modelUuid,
// modelName: assetDoc.modelName, modelName: assetDoc.modelName,
// modelfileID: assetDoc.modelfileID, modelfileID: assetDoc.modelfileID,
// position: assetDoc.position, position: assetDoc.position,
// rotation: assetDoc.rotation, rotation: assetDoc.rotation,
// isLocked: assetDoc.isLocked, isLocked: assetDoc.isLocked,
// isVisible: assetDoc.isVisible, isVisible: assetDoc.isVisible,
// eventData: { eventData: {
// points: assetDoc.points, points: assetDoc.points,
// type: assetDoc.type, type: assetDoc.type,
// }, },
// }; };
// } else { } else {
// assetDatas = { assetDatas = {
// modelUuid: assetDoc.modelUuid, modelUuid: assetDoc.modelUuid,
// modelName: assetDoc.modelName, modelName: assetDoc.modelName,
// modelfileID: assetDoc.modelfileID, modelfileID: assetDoc.modelfileID,
// position: assetDoc.position, position: assetDoc.position,
// rotation: assetDoc.rotation, rotation: assetDoc.rotation,
// isLocked: assetDoc.isLocked, isLocked: assetDoc.isLocked,
// isVisible: assetDoc.isVisible, isVisible: assetDoc.isVisible,
// }; };
// } }
return { return {
success: true, success: true,
message: "Model created successfully", message: "Model created successfully",
@@ -414,7 +415,6 @@ export const deleteAssetModel = async (data: any) => {
message: "Failed to archive asset", message: "Failed to archive asset",
organization: organization, organization: organization,
}; };
} }
const updatedEvents = await EventsDataModel(organization).updateMany( const updatedEvents = await EventsDataModel(organization).updateMany(
{ modelUuid }, { modelUuid },
@@ -438,7 +438,6 @@ export const deleteAssetModel = async (data: any) => {
data: archivedAsset, data: archivedAsset,
organization: organization, organization: organization,
}; };
} catch (error) { } catch (error) {
// console.error('Error get flooritems:', error); // console.error('Error get flooritems:', error);
return { return {