clear the testing commits
This commit is contained in:
@@ -2,6 +2,7 @@ import { Socket, Server } from "socket.io";
|
||||
import { EVENTS } from "../../socket/events.ts";
|
||||
import { emitToSenderAndAdmins } from "../../utils/emitEventResponse.ts";
|
||||
import { DelZone, SetZone } from "../../../shared/services/builder/zoneService.ts";
|
||||
import { ErrorResponse, FinalResponse, validateFields } from "../../utils/socketfunctionHelpers.ts";
|
||||
|
||||
|
||||
export const SetZoneHandleEvent = async (
|
||||
@@ -18,18 +19,11 @@ export const SetZoneHandleEvent = async (
|
||||
"userId",
|
||||
"organization",
|
||||
];
|
||||
const missingFields = requiredFields.filter(field => !data?.[field]);
|
||||
const missingFields = validateFields(data, requiredFields);
|
||||
|
||||
if (missingFields.length > 0) {
|
||||
const response = {
|
||||
success: false,
|
||||
message: `Missing required field(s): ${missingFields.join(", ")}`,
|
||||
status: "MissingFields",
|
||||
socketId: socket.id,
|
||||
organization: data?.organization ?? "unknown",
|
||||
};
|
||||
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.zone_v1UpdateResponse, response, connectedUsersByOrg)
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.zone_v1UpdateResponse,
|
||||
ErrorResponse(missingFields, socket, data.organization), connectedUsersByOrg);
|
||||
return;
|
||||
}
|
||||
const result = await SetZone(data);
|
||||
@@ -45,28 +39,15 @@ export const SetZoneHandleEvent = async (
|
||||
};
|
||||
|
||||
const msg = messages[status] || { message: "Internal server error" };
|
||||
const Camera_Datas =
|
||||
const zone_Datas =
|
||||
status === "Success" && result?.data
|
||||
|
||||
? {
|
||||
// widget: {
|
||||
// id: result.data.widgetID,
|
||||
// type: result.data.projectName,
|
||||
// position: result.data.position,
|
||||
// },
|
||||
// Data: result.data.Data,
|
||||
// zoneId: result.data.zoneId,
|
||||
|
||||
}
|
||||
: undefined;
|
||||
|
||||
const response = {
|
||||
success: status === "Success",
|
||||
message: msg.message,
|
||||
status,
|
||||
socketId: socket.id,
|
||||
organization: data.organization,
|
||||
...(Camera_Datas ? { data: Camera_Datas } : {}),
|
||||
};
|
||||
const response = FinalResponse(status, socket, data.organization, messages, zone_Datas);
|
||||
|
||||
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.zone_v1UpdateResponse, response, connectedUsersByOrg)
|
||||
@@ -80,23 +61,17 @@ export const DeleteZoneHandleEvent = async (
|
||||
) => {
|
||||
if (event !== EVENTS.deleteZone_v1 || !data?.organization) return;
|
||||
const requiredFields = [
|
||||
"zoneId",
|
||||
"zoneUuid",
|
||||
"projectId",
|
||||
"userId",
|
||||
"organization",
|
||||
];
|
||||
const missingFields = requiredFields.filter(field => !data?.[field]);
|
||||
|
||||
const missingFields = validateFields(data, requiredFields);
|
||||
|
||||
if (missingFields.length > 0) {
|
||||
const response = {
|
||||
success: false,
|
||||
message: `Missing required field(s): ${missingFields.join(", ")}`,
|
||||
status: "MissingFields",
|
||||
socketId: socket.id,
|
||||
organization: data?.organization ?? "unknown",
|
||||
};
|
||||
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.Zone_v1DeleteResponse, response, connectedUsersByOrg)
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.Zone_v1DeleteResponse,
|
||||
ErrorResponse(missingFields, socket, data.organization), connectedUsersByOrg);
|
||||
return;
|
||||
}
|
||||
const result = await DelZone(data);
|
||||
@@ -111,29 +86,15 @@ export const DeleteZoneHandleEvent = async (
|
||||
|
||||
};
|
||||
|
||||
const msg = messages[status] || { message: "Internal server error" };
|
||||
const Camera_Datas =
|
||||
const zone_Datas =
|
||||
status === "Success" && result?.data
|
||||
|
||||
? {
|
||||
// widget: {
|
||||
// id: result.data.widgetID,
|
||||
// type: result.data.projectName,
|
||||
// position: result.data.position,
|
||||
// },
|
||||
// Data: result.data.Data,
|
||||
// zoneId: result.data.zoneId,
|
||||
|
||||
}
|
||||
: undefined;
|
||||
|
||||
const response = {
|
||||
success: status === "Success",
|
||||
message: msg.message,
|
||||
status,
|
||||
socketId: socket.id,
|
||||
organization: data.organization,
|
||||
...(Camera_Datas ? { data: Camera_Datas } : {}),
|
||||
};
|
||||
const response = FinalResponse(status, socket, data.organization, messages, zone_Datas);
|
||||
|
||||
|
||||
emitToSenderAndAdmins(io, socket, data.organization, EVENTS.Zone_v1DeleteResponse, response, connectedUsersByOrg)
|
||||
|
||||
Reference in New Issue
Block a user