diff --git a/src/api-server/Routes/zoneRoutes.ts b/src/api-server/Routes/zoneRoutes.ts index 6b2064e..b3126b2 100644 --- a/src/api-server/Routes/zoneRoutes.ts +++ b/src/api-server/Routes/zoneRoutes.ts @@ -245,7 +245,7 @@ const router = express.Router(); * type: string * example: "Internal server error" */ -router.post("/zone/save", ZoneService.addandUpdateZone); +router.post("/zone/save", ZoneService.addandUpdateZone); /** * @swagger @@ -536,7 +536,8 @@ router.get("/A_zone/:zoneId/:organization", ZoneService.ZoneData); * type: string * example: "Internal Server Error" */ -router.patch("/zone/:zoneId", ZoneService.deleteAZone); +router.patch("/zone/:zoneId", ZoneService.deleteAZone); +router.get("/findZones/:organization", ZoneService.getZones); router.patch("/zones/lockedPanels", ZoneService.lockedPanel); export default router; diff --git a/src/api-server/controller/lines/zoneService.ts b/src/api-server/controller/lines/zoneService.ts index 0f7ae4e..d84bfc7 100644 --- a/src/api-server/controller/lines/zoneService.ts +++ b/src/api-server/controller/lines/zoneService.ts @@ -272,4 +272,24 @@ export class ZoneService { return res.status(500).send(error.message); } } + + static async getZones(req: Request, res: Response) { + try { + const { organization } = req.params; + + const findZoneId = await zoneSchema(organization) + .find() + .select( + "zoneId zoneName layer points viewPortCenter viewPortposition -_id" + ); + + if (!findZoneId) { + res.status(500).json({ message: "Invalid zone" }); + } + res.status(201).json({ data: findZoneId, organization: organization }); + } catch (error) { + console.log("error: ", error); + res.status(500).json({ message: "Zone not found", error }); + } + } } diff --git a/src/shared/model/builder/lines/zone-Model.ts b/src/shared/model/builder/lines/zone-Model.ts index fe6f4a6..29d004a 100644 --- a/src/shared/model/builder/lines/zone-Model.ts +++ b/src/shared/model/builder/lines/zone-Model.ts @@ -4,7 +4,7 @@ import MainModel from "../../../connect/mongoose.ts"; export interface Zone extends Document { zoneName: string; zoneId: string; - zonePoints: []; + points: []; viewPortCenter: []; viewPortposition: []; isArchive: boolean;