From 5c039a5d2bea4eeb4666c2fa1207a6e6320255c4 Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Mon, 29 Jan 2024 17:48:30 +0100
Subject: [PATCH 1/6] wip: port numbers in helper and in alarm service

---
 alarm/src/index.ts                  | 2 +-
 frontend/src/env.d.ts               | 2 ++
 frontend/src/utils/RequestHelper.ts | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/alarm/src/index.ts b/alarm/src/index.ts
index 8798231de..9220acc85 100644
--- a/alarm/src/index.ts
+++ b/alarm/src/index.ts
@@ -16,7 +16,7 @@ export const app: Express = express()
 app.use(express.json())
 app.use(cors())
 
-const PORT: number = Number(process.env.PORT) || 4000
+const PORT: number = Number(process.env.ALARM_PORT) || 4002
 
 app.use((req: Request, res: Response, next: NextFunction) => {
   const authHeader = req.headers.authorization
diff --git a/frontend/src/env.d.ts b/frontend/src/env.d.ts
index 7619ad8e5..61b7e8dfe 100644
--- a/frontend/src/env.d.ts
+++ b/frontend/src/env.d.ts
@@ -6,6 +6,8 @@ interface ImportMetaEnv {
   readonly VITE_MONITORING_PORT: string
   readonly VITE_AUTH_HOST: string
   readonly VITE_AUTH_PORT: string
+  readonly VITE_ALARM_HOST: string
+  readonly VITE_ALARM_PORT: string
 }
 
 interface ImportMeta {
diff --git a/frontend/src/utils/RequestHelper.ts b/frontend/src/utils/RequestHelper.ts
index ec8a208aa..1b9cd46f8 100644
--- a/frontend/src/utils/RequestHelper.ts
+++ b/frontend/src/utils/RequestHelper.ts
@@ -14,10 +14,15 @@ type Headers = {
 
 export const authHost: string = import.meta.env.VITE_AUTH_HOST || 'localhost'
 export const authPort: string = import.meta.env.VITE_AUTH_PORT || '4000'
+export const monitoringHost: string = import.meta.env.VITE_MONITORING_HOST || 'localhost'
+export const monitoringPort: string = import.meta.env.VITE_MONITORING_PORT || '4001'
+export const alarmHost: string = import.meta.env.VITE_ALARM_HOST || 'localhost'
+export const alarmPort: string = import.meta.env.VITE_ALARM_PORT || '4002'
+
 
 export default class RequestHelper {
   static getHeaders(): Headers {
-    return { headers: { Authorization: `Bearer ${userStore().accessToken}` } }
+    return { headers: { Authorization: `Bearer apikey-dev` } } //${userStore().accessToken}
   }
 
   static async get(url: string, params?: any): Promise<AxiosResponse> {

From 78de8dc0540e426d9dc5525d6f4624950d519d2c Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Mon, 29 Jan 2024 18:34:09 +0100
Subject: [PATCH 2/6] wip: deletion and get devices

---
 .../device/repositories/DeviceRepository.ts   |   4 +-
 .../storage/device/DeviceRepositoryImpl.ts    |  45 +++---
 frontend/src/views/DevicesView.vue            | 134 ++++++++++++------
 frontend/src/views/SecurityRuleView.vue       |   2 -
 monitoring/src/consumer.ts                    |  16 +--
 monitoring/src/controller/device.ts           |  10 +-
 monitoring/src/routes/device.ts               |  19 ++-
 7 files changed, 139 insertions(+), 91 deletions(-)

diff --git a/domain/src/domain/device/repositories/DeviceRepository.ts b/domain/src/domain/device/repositories/DeviceRepository.ts
index 7f23d38ef..21be7830d 100644
--- a/domain/src/domain/device/repositories/DeviceRepository.ts
+++ b/domain/src/domain/device/repositories/DeviceRepository.ts
@@ -22,5 +22,7 @@ export interface DeviceRepository {
 
   updateSensor(sensor: Sensor): Promise<void>
 
-  deleteDevice(deviceId: DeviceId): Promise<void>
+  deleteCamera(code: string): Promise<void>
+
+  deleteSensor(code: string): Promise<void>
 }
diff --git a/domain/src/storage/device/DeviceRepositoryImpl.ts b/domain/src/storage/device/DeviceRepositoryImpl.ts
index 2916f44e4..fdbb1cc66 100644
--- a/domain/src/storage/device/DeviceRepositoryImpl.ts
+++ b/domain/src/storage/device/DeviceRepositoryImpl.ts
@@ -142,30 +142,25 @@ export class DeviceRepositoryImpl implements DeviceRepository {
       .orFail()
   }
 
-  async deleteDevice(deviceId: DeviceId): Promise<void> {
-    switch (deviceId.type) {
-      case DeviceType.CAMERA:
-        await this.cameraModel
-          .deleteOne({
-            _id: {
-              type: DeviceTypeConverter.convertToString(deviceId.type),
-              code: deviceId.code
-            }
-          })
-          .orFail()
-        break
-      case DeviceType.SENSOR:
-        await this.sensorModel
-          .deleteOne({
-            _id: {
-              type: DeviceTypeConverter.convertToString(deviceId.type),
-              code: deviceId.code
-            }
-          })
-          .orFail()
-        break
-      default:
-        throw new Error('Error while deleting device')
-    }
+  async deleteCamera(code: string): Promise<void> {
+    await this.cameraModel
+      .deleteOne({
+        _id: {
+          type: "CAMERA",
+          code: code
+        }
+      })
+      .orFail()
+  }
+
+  async deleteSensor(code: string): Promise<void> {
+    await this.sensorModel
+      .deleteOne({
+        _id: {
+          type: "SENSOR",
+          code: code
+        }
+      })
+      .orFail()
   }
 }
diff --git a/frontend/src/views/DevicesView.vue b/frontend/src/views/DevicesView.vue
index f959b3761..75bb97951 100644
--- a/frontend/src/views/DevicesView.vue
+++ b/frontend/src/views/DevicesView.vue
@@ -1,6 +1,6 @@
 <script lang="ts"></script>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { onMounted, ref } from "vue";
 
 import SensorBadge from '@/components/devices/DeviceBadge.vue'
 import type {
@@ -18,6 +18,10 @@ import {
 import type { Camera, EnvironmentData, Sensor } from '@domain/device/core'
 import { Measure, MeasureUnit } from '@domain/device/core'
 import NewDevicePopup from '@/components/devices/NewDevicePopup.vue'
+import RequestHelper from "@/utils/RequestHelper";
+import type { Contact } from "domain/dist/domain/monitoring/core";
+import { ContactTypeConverter, MeasureConverter } from "domain/dist/utils";
+import type { ExceedingRule } from "domain/dist/domain/security-rule/core";
 
 const environmentDataFactory: EnvironmentDataFactory = new EnvironmentDataFactoryImpl()
 
@@ -25,55 +29,92 @@ const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
 const deviceFactory: DeviceFactory = new DeviceFactoryImpl()
 const resolutionFactory: ResolutionFactory = new ResolutionFactoryImpl()
 
-const sensors: ref<Sensor[]> = ref([
-  deviceFactory.createSensor(deviceIdFactory.createSensorId('Sensor 1'), '192.168.1.10', 5, [
-    Measure.HUMIDITY,
-    Measure.TEMPERATURE,
-    Measure.PRESSURE
-  ]),
-  deviceFactory.createSensor(deviceIdFactory.createSensorId('Sensor 2'), '192.168.1.11', 5, [
-    Measure.TEMPERATURE,
-    Measure.PRESSURE
-  ])
-])
-
-const environmentData: EnvironmentData = environmentDataFactory.createEnvironmentData(
-  deviceIdFactory.createSensorId('Sensor 1'),
-  20,
-  Measure.PRESSURE,
-  MeasureUnit.PASCAL,
-  new Date()
-)
-
-const cameras: ref<Camera[]> = ref([
-  deviceFactory.createCamera(
-    deviceIdFactory.createCameraId('Camera 1'),
-    '192.168.1.13',
-    resolutionFactory.createResolution(1920, 1080)
-  ),
-  deviceFactory.createCamera(
-    deviceIdFactory.createCameraId('Camera 2'),
-    '192.168.1.14',
-    resolutionFactory.createResolution(1920, 1080)
+const sensors: ref<Sensor[]> = ref([])
+
+const cameras: ref<Camera[]> = ref([])
+
+const getSensors = async () => {
+  console.log('getSensors')
+  await RequestHelper.get('http://localhost:4001/devices/sensors')
+    .then((res: any) => {
+      sensors.value = []
+      for (let i = 0; i < res.data.length; i++) {
+        console.log(res.data[i])
+        sensors.value.push(composeSensor(res.data[i]))
+      }
+    })
+    .catch((error) => {
+      console.log(error)
+    })
+}
+const getCameras = async () => {
+  console.log('getCameras')
+  await RequestHelper.get('http://localhost:4001/devices/cameras')
+    .then((res: any) => {
+      cameras.value = []
+      for (let i = 0; i < res.data.length; i++) {
+        cameras.value.push(composeCamera(res.data[i]))
+      }
+    })
+    .catch((error) => {
+      console.log(error)
+    })
+}
+
+const composeSensor = (sensor: any): Sensor => {
+  console.log(composeMeasure(sensor.measures))
+  return deviceFactory.createSensor(
+    deviceIdFactory.createSensorId(sensor._id.code),
+    sensor.ipAddress,
+    sensor.intervalMillis,
+    composeMeasure(sensor.measures)
   )
-])
+}
 
-const deleteSensor = (sensor: Sensor) => {
-  const index = sensors.value.findIndex((s: Sensor) => s.deviceId === sensor.deviceId)
-  if (index !== -1) {
-    sensors.value.splice(index, 1)
-  }
+const composeCamera = (camera: any): Camera => {
+  return deviceFactory.createCamera(
+    deviceIdFactory.createCameraId(camera._id.code),
+    camera.ipAddress,
+    resolutionFactory.createResolution(camera.resolution.width, camera.resolution.height)
+  )
 }
-const deleteCamera = (camera: Camera) => {
-  const index = cameras.value.findIndex((s: Camera) => s.deviceId === camera.deviceId)
-  if (index !== -1) {
-    cameras.value.splice(index, 1)
-  }
+
+function composeMeasure(measures: any): Measure[] {
+  return measures.map((measure: any) => {
+    return MeasureConverter.convertToMeasure(measure)
+  })
 }
-const getDevices = () => {
-  console.log('getDevices')
-  return [...sensors.value, ...cameras.value]
+
+const deleteSensor = async (sensor: Sensor) => {
+  console.log(sensor.deviceId.type, sensor.deviceId.code)
+  await RequestHelper.delete(
+    'http://localhost:4001/devices/sensors/' + sensor.deviceId.code
+  )
+    .then(async (res: any) => {
+      //TODO A CONFIRM POPUP
+      await getSensors()
+    })
+    .catch((error) => {
+      console.log(error)
+    })
 }
+const deleteCamera = async (camera: Camera) => {
+  await RequestHelper.delete(
+    'http://localhost:4001/devices/cameras/' + camera.deviceId.code
+  )
+    .then(async (res: any) => {
+      //TODO A CONFIRM POPUP
+      await getCameras()
+    })
+    .catch((error) => {
+      console.log(error)
+    })
+}
+
+onMounted(async () => {
+  await getSensors()
+  await getCameras()
+})
 
 const popupVisible = ref<boolean>(false)
 </script>
@@ -104,7 +145,8 @@ const popupVisible = ref<boolean>(false)
     />
   </div>
 
-  <new-device-popup v-model="popupVisible" @update-devices="getDevices"></new-device-popup>
+<!--  to check!!-->
+  <new-device-popup v-model="popupVisible" @update-devices="getSensors"></new-device-popup>
 </template>
 
 <style scoped lang="scss">
diff --git a/frontend/src/views/SecurityRuleView.vue b/frontend/src/views/SecurityRuleView.vue
index 22799aee3..b0cb98f48 100644
--- a/frontend/src/views/SecurityRuleView.vue
+++ b/frontend/src/views/SecurityRuleView.vue
@@ -92,7 +92,6 @@ const deleteIntrusionRule = async (intrusionRule: IntrusionRule) => {
   )
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
-      await getExceedingSecurityRules()
       await getIntrusionSecurityRules()
     })
     .catch((error) => {
@@ -107,7 +106,6 @@ const deleteExceedingRule = async (exceedingRule: ExceedingRule) => {
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
       await getExceedingSecurityRules()
-      await getIntrusionSecurityRules()
     })
     .catch((error) => {
       console.log(error)
diff --git a/monitoring/src/consumer.ts b/monitoring/src/consumer.ts
index 42e8c1c2a..fc940be8c 100644
--- a/monitoring/src/consumer.ts
+++ b/monitoring/src/consumer.ts
@@ -7,9 +7,9 @@ const kafkaPort: string = process.env.KAFKA_PORT || '9092'
 
 const consumers: { id: string; consumer: Consumer }[] = []
 
-const getConsumerById = (id: string): Consumer => {
+/*const getConsumerById = (id: string): Consumer => {
   return consumers.find((c): boolean => c.id === id)!.consumer
-}
+}*/
 
 export const setupConsumers = async (): Promise<void> => {
   console.log('Setting up consumers')
@@ -24,27 +24,27 @@ export const setupConsumers = async (): Promise<void> => {
     console.log('Consumers', consumers)
 
     socket.on('disconnect', () => {
-      getConsumerById(socket.id).disconnect()
+/*      getConsumerById(socket.id).disconnect()
       consumers.splice(
         consumers.findIndex((c): boolean => c.id === socket.id),
         1
-      )
+      )*/
       console.log('A client disconnected', socket.id)
       console.log('Consumers', consumers)
     })
 
     socket.on('pause', async (topics: string[]): Promise<void> => {
       console.log('Pausing topics', topics)
-      getConsumerById(socket.id).pause(
+/*      getConsumerById(socket.id).pause(
         topics.map((topic: string): { topic: string } => ({ topic }))
-      )
+      )*/
     })
 
     socket.on('resume', async (topics: string[]): Promise<void> => {
       console.log('Resuming topics', topics)
-      getConsumerById(socket.id).resume(
+/*      getConsumerById(socket.id).resume(
         topics.map((topic: string): { topic: string } => ({ topic }))
-      )
+      )*/
     })
 
     socket.on('subscribe', async (topics: string[]): Promise<void> => {
diff --git a/monitoring/src/controller/device.ts b/monitoring/src/controller/device.ts
index 54dbfd07f..d173616ba 100644
--- a/monitoring/src/controller/device.ts
+++ b/monitoring/src/controller/device.ts
@@ -11,7 +11,6 @@ import { DeviceFactory } from '@domain/device/factories/DeviceFactory.js'
 import { DeviceFactoryImpl } from '@domain/device/factories/impl/DeviceFactoryImpl.js'
 import { DeviceIdFactory } from '@domain/device/factories/DeviceIdFactory.js'
 import { DeviceIdFactoryImpl } from '@domain/device/factories/impl/DeviceIdFactoryImpl.js'
-import { DeviceTypeConverter } from '@utils/DeviceTypeConverter.js'
 import { Resolution } from '@domain/device/core/Resolution.js'
 import { Measure } from '@domain/device/core/impl/enum/Measure.js'
 import { DeviceType } from 'domain/dist/domain/device/core'
@@ -82,9 +81,10 @@ export const deviceController = {
       deviceFactory.createSensor(deviceId, ipAddress, intervalMillis, measures)
     )
   },
-  deleteDevice: async (type: string, code: string): Promise<void> => {
-    return await deviceManager.deleteDevice(
-      deviceIdFactory.createId(DeviceTypeConverter.convertToDeviceType(type), code)
-    )
+  deleteCamera: async (code: string): Promise<void> => {
+    return await deviceManager.deleteCamera(code)
+  },
+  deleteSensor: async (code: string): Promise<void> => {
+    return await deviceManager.deleteSensor(code)
   }
 }
diff --git a/monitoring/src/routes/device.ts b/monitoring/src/routes/device.ts
index 255ad6fa4..6d301d267 100644
--- a/monitoring/src/routes/device.ts
+++ b/monitoring/src/routes/device.ts
@@ -119,13 +119,24 @@ deviceRouter.route('/sensors').put((req: Request, res: Response): void => {
     })
 })
 
-deviceRouter.route('/').delete((req: Request, res: Response): void => {
+deviceRouter.route('/cameras/:code').delete((req: Request, res: Response): void => {
   deviceController
-    .deleteDevice(req.body.type, req.body.code)
+    .deleteCamera(req.params.code)
     .then((): void => {
-      res.status(HttpStatusCode.OK).send({ success: 'Device correctly deleted' })
+      res.status(HttpStatusCode.OK).send({ success: 'Sensor correctly deleted' })
     })
     .catch((): void => {
-      res.status(HttpStatusCode.INTERNAL_SERVER_ERROR).send({ error: 'Device not deleted' })
+      res.status(HttpStatusCode.INTERNAL_SERVER_ERROR).send({ error: 'Sensor not deleted' })
+    })
+})
+
+deviceRouter.route('/sensors/:code').delete((req: Request, res: Response): void => {
+  deviceController
+    .deleteSensor(req.params.code)
+    .then((): void => {
+      res.status(HttpStatusCode.OK).send({ success: 'Camera correctly deleted' })
+    })
+    .catch((): void => {
+      res.status(HttpStatusCode.INTERNAL_SERVER_ERROR).send({ error: 'Camera not deleted' })
     })
 })

From bfd0b19227a2418f0e26f4771f04c840ceb25c35 Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Mon, 29 Jan 2024 18:40:32 +0100
Subject: [PATCH 3/6] wip: set correct link to vue views

---
 frontend/src/views/DevicesView.vue      | 10 +++++-----
 frontend/src/views/NotificationView.vue |  9 +++------
 frontend/src/views/SecurityRuleView.vue | 13 +++++++------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/frontend/src/views/DevicesView.vue b/frontend/src/views/DevicesView.vue
index 75bb97951..669d6a82e 100644
--- a/frontend/src/views/DevicesView.vue
+++ b/frontend/src/views/DevicesView.vue
@@ -22,6 +22,7 @@ import RequestHelper from "@/utils/RequestHelper";
 import type { Contact } from "domain/dist/domain/monitoring/core";
 import { ContactTypeConverter, MeasureConverter } from "domain/dist/utils";
 import type { ExceedingRule } from "domain/dist/domain/security-rule/core";
+import { monitoringHost, monitoringPort } from "@/utils/RequestHelper";
 
 const environmentDataFactory: EnvironmentDataFactory = new EnvironmentDataFactoryImpl()
 
@@ -30,12 +31,11 @@ const deviceFactory: DeviceFactory = new DeviceFactoryImpl()
 const resolutionFactory: ResolutionFactory = new ResolutionFactoryImpl()
 
 const sensors: ref<Sensor[]> = ref([])
-
 const cameras: ref<Camera[]> = ref([])
 
 const getSensors = async () => {
   console.log('getSensors')
-  await RequestHelper.get('http://localhost:4001/devices/sensors')
+  await RequestHelper.get(`http://${monitoringHost}:${monitoringPort}/devices/sensors`)
     .then((res: any) => {
       sensors.value = []
       for (let i = 0; i < res.data.length; i++) {
@@ -49,7 +49,7 @@ const getSensors = async () => {
 }
 const getCameras = async () => {
   console.log('getCameras')
-  await RequestHelper.get('http://localhost:4001/devices/cameras')
+  await RequestHelper.get(`http://${monitoringHost}:${monitoringPort}/devices/cameras`)
     .then((res: any) => {
       cameras.value = []
       for (let i = 0; i < res.data.length; i++) {
@@ -88,7 +88,7 @@ function composeMeasure(measures: any): Measure[] {
 const deleteSensor = async (sensor: Sensor) => {
   console.log(sensor.deviceId.type, sensor.deviceId.code)
   await RequestHelper.delete(
-    'http://localhost:4001/devices/sensors/' + sensor.deviceId.code
+    `http://${monitoringHost}:${monitoringPort}/devices/sensors/` + sensor.deviceId.code
   )
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
@@ -100,7 +100,7 @@ const deleteSensor = async (sensor: Sensor) => {
 }
 const deleteCamera = async (camera: Camera) => {
   await RequestHelper.delete(
-    'http://localhost:4001/devices/cameras/' + camera.deviceId.code
+    `http://${monitoringHost}:${monitoringPort}/devices/cameras/` + camera.deviceId.code
   )
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
diff --git a/frontend/src/views/NotificationView.vue b/frontend/src/views/NotificationView.vue
index b893c3e43..59156f824 100644
--- a/frontend/src/views/NotificationView.vue
+++ b/frontend/src/views/NotificationView.vue
@@ -4,16 +4,13 @@ import { onMounted, ref } from 'vue'
 import type { Exceeding, Intrusion } from '@domain/anomaly/core'
 import type { Notification } from '@domain/alarm-system/core'
 import { DeviceType } from '@domain/device/core'
-
 import { type AnomalyFactory, AnomalyFactoryImpl } from '@domain/anomaly/factories'
 import { type DeviceIdFactory, DeviceIdFactoryImpl } from '@domain/device/factories'
 import { type NotificationFactory, NotificationFactoryImpl } from '@domain/alarm-system/factories'
-
 import { ObjectClassConverter } from '@utils/ObjectClassConverter.js'
 import { DeviceTypeConverter } from '@utils/DeviceTypeConverter.js'
 import { MeasureConverter } from '@utils/MeasureConverter.js'
-import RequestHelper from '@/utils/RequestHelper'
-
+import RequestHelper, { alarmHost, alarmPort } from '@/utils/RequestHelper'
 import NotificationBadge from '@/components/notification/NotificationBadge.vue'
 
 const notificationFactory: NotificationFactory = new NotificationFactoryImpl()
@@ -23,7 +20,7 @@ const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
 let notifications: ref<Notification[]> = ref<Notification[]>([])
 
 async function getNotifications() {
-  await RequestHelper.get('http://localhost:4000/notifications')
+  await RequestHelper.get(`http://${alarmHost}:${alarmPort}/notifications`)
     .then((res: any) => {
       for (let i = 0; i < res.data.length; i++) {
         composeNotification(res.data[i])
@@ -35,7 +32,7 @@ async function getNotifications() {
 }
 
 async function composeNotification(notification: any) {
-  await RequestHelper.get('http://localhost:4000/anomalies/' + notification.anomalyId)
+  await RequestHelper.get(`http://${alarmHost}:${alarmPort}/anomalies/` + notification.anomalyId)
     .then((anomaly: any) => {
       switch (DeviceTypeConverter.convertToDeviceType(anomaly.data.deviceId.type)) {
         case DeviceType.CAMERA:
diff --git a/frontend/src/views/SecurityRuleView.vue b/frontend/src/views/SecurityRuleView.vue
index b0cb98f48..ea38f2822 100644
--- a/frontend/src/views/SecurityRuleView.vue
+++ b/frontend/src/views/SecurityRuleView.vue
@@ -13,6 +13,7 @@ import NewSecurityRulePopup from '@/components/security-rule/NewSecurityRulePopu
 import SecurityRuleBadge from '@/components/security-rule/SecurityRuleBadge.vue'
 import RequestHelper from '@/utils/RequestHelper'
 import { ContactTypeConverter, MeasureConverter, ObjectClassConverter } from 'domain/dist/utils'
+import { alarmHost, alarmPort } from "@/utils/RequestHelper";
 
 const securityRuleFactory: SecurityRuleFactory = new SecurityRuleFactoryImpl()
 const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
@@ -23,7 +24,7 @@ const exceedingsSecurityRules: ref<ExceedingRule[]> = ref([])
 const intrusionsSecurityRules: ref<IntrusionRule[]> = ref([])
 
 const getExceedingSecurityRules = async () => {
-  await RequestHelper.get('http://localhost:4000/security-rules/exceedings')
+  await RequestHelper.get(`http://localhost:4000/security-rules/exceedings`)
     .then((res: any) => {
       exceedingsSecurityRules.value = []
       for (let i = 0; i < res.data.length; i++) {
@@ -36,7 +37,7 @@ const getExceedingSecurityRules = async () => {
 }
 
 const getIntrusionSecurityRules = async () => {
-  await RequestHelper.get('http://localhost:4000/security-rules/intrusions')
+  await RequestHelper.get(`http://${alarmHost}:${alarmPort}/security-rules/intrusions`)
     .then((res: any) => {
       intrusionsSecurityRules.value = []
       for (let i = 0; i < res.data.length; i++) {
@@ -88,7 +89,7 @@ function composeContacts(contacts: any): Contact[] {
 
 const deleteIntrusionRule = async (intrusionRule: IntrusionRule) => {
   await RequestHelper.delete(
-    'http://localhost:4000/security-rules/intrusions/' + intrusionRule.securityRuleId
+    `http://${alarmHost}:${alarmPort}/security-rules/intrusions/` + intrusionRule.securityRuleId
   )
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
@@ -101,7 +102,7 @@ const deleteIntrusionRule = async (intrusionRule: IntrusionRule) => {
 
 const deleteExceedingRule = async (exceedingRule: ExceedingRule) => {
   await RequestHelper.delete(
-    'http://localhost:4000/security-rules/exceedings/' + exceedingRule.securityRuleId
+    `http://${alarmHost}:${alarmPort}/security-rules/exceedings/` + exceedingRule.securityRuleId
   )
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
@@ -113,7 +114,7 @@ const deleteExceedingRule = async (exceedingRule: ExceedingRule) => {
 }
 
 const insertExceedingRule = async (exceedingRule: ExceedingRule) => {
-  await RequestHelper.post('http://localhost:4000/security-rules/exceedings', {
+  await RequestHelper.post(`http://${alarmHost}:${alarmPort}/security-rules/exceedings`, {
     deviceId: {
       code: exceedingRule.deviceId.code
     },
@@ -137,7 +138,7 @@ const insertExceedingRule = async (exceedingRule: ExceedingRule) => {
 }
 
 const insertIntrusionRule = async (intrusionRule: IntrusionRule) => {
-  await RequestHelper.post('http://localhost:4000/security-rules/intrusions', {
+  await RequestHelper.post(`http://${alarmHost}:${alarmPort}/security-rules/intrusions`, {
     deviceId: {
       code: intrusionRule.deviceId.code
     },

From 1c0ae8df3e5d687492c61cfa1c0f9f453df2a848 Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Mon, 29 Jan 2024 19:00:27 +0100
Subject: [PATCH 4/6] feat(frontend): add new device from gui

---
 .../storage/device/DeviceRepositoryImpl.ts    |  4 +-
 .../src/components/devices/NewDevicePopup.vue | 72 ++++++++++++++----
 frontend/src/utils/RequestHelper.ts           |  1 -
 frontend/src/views/DevicesView.vue            | 76 ++++++++++++++++---
 frontend/src/views/SecurityRuleView.vue       |  4 +-
 monitoring/src/consumer.ts                    |  6 +-
 6 files changed, 128 insertions(+), 35 deletions(-)

diff --git a/domain/src/storage/device/DeviceRepositoryImpl.ts b/domain/src/storage/device/DeviceRepositoryImpl.ts
index fdbb1cc66..f33e8428f 100644
--- a/domain/src/storage/device/DeviceRepositoryImpl.ts
+++ b/domain/src/storage/device/DeviceRepositoryImpl.ts
@@ -146,7 +146,7 @@ export class DeviceRepositoryImpl implements DeviceRepository {
     await this.cameraModel
       .deleteOne({
         _id: {
-          type: "CAMERA",
+          type: 'CAMERA',
           code: code
         }
       })
@@ -157,7 +157,7 @@ export class DeviceRepositoryImpl implements DeviceRepository {
     await this.sensorModel
       .deleteOne({
         _id: {
-          type: "SENSOR",
+          type: 'SENSOR',
           code: code
         }
       })
diff --git a/frontend/src/components/devices/NewDevicePopup.vue b/frontend/src/components/devices/NewDevicePopup.vue
index abb75c809..e74216a9d 100644
--- a/frontend/src/components/devices/NewDevicePopup.vue
+++ b/frontend/src/components/devices/NewDevicePopup.vue
@@ -1,16 +1,21 @@
 <script setup lang="ts">
 import { Measure } from 'domain/dist/domain/device/core/impl/enum/Measure'
-import { ref } from 'vue'
-import { DeviceType } from '@domain/device/core'
+import { ref, toRaw } from 'vue'
+import { type Camera, DeviceType, type Sensor } from '@domain/device/core'
 import type { DeviceFactory, DeviceIdFactory, ResolutionFactory } from '@domain/device/factories'
 import {
   DeviceFactoryImpl,
   DeviceIdFactoryImpl,
   ResolutionFactoryImpl
 } from '@domain/device/factories'
+import { AnomalyType } from 'domain/dist/domain/anomaly/core'
+import type { ExceedingRule, IntrusionRule } from 'domain/dist/domain/security-rule/core'
+import type { Contact } from 'domain/dist/domain/monitoring/core'
 
 const emit = defineEmits<{
   (e: 'update-devices'): void
+  (e: 'insert-camera', camera: Camera): void
+  (e: 'insert-sensor', sensor: Sensor): void
 }>()
 
 const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
@@ -41,24 +46,59 @@ const options = ref([
 
 const addNewDevice = () => {
   if (deviceType.value == DeviceType.SENSOR) {
-    console.log(
-      deviceFactory.createSensor(
-        deviceIdFactory.createSensorId(code),
-        ipAddress,
-        intervalMillis,
-        measures.value
-      )
+    const newSensor: Sensor = deviceFactory.createSensor(
+      deviceIdFactory.createSensorId(code.value),
+      ipAddress.value,
+      intervalMillis.value,
+      measures.value
     )
+    emit('insert-sensor', newSensor)
   } else if (deviceType.value == DeviceType.CAMERA) {
-    console.log(
-      deviceFactory.createCamera(
-        deviceIdFactory.createCameraId(code),
-        ipAddress,
-        resolutionFactory.createResolution(width, height)
-      )
+    const newCamera: Camera = deviceFactory.createCamera(
+      deviceIdFactory.createCameraId(code.value),
+      ipAddress.value,
+      resolutionFactory.createResolution(width.value, height.value)
     )
+    emit('insert-camera', newCamera)
   }
-  emit('update-devices')
+
+  /*if (anomalyType.value == AnomalyType.EXCEEDING) {
+    const newExceedingRule: ExceedingRule = securityRuleFactory.createExceedingRule(
+      min.value,
+      max.value,
+      measure.value,
+      '',
+      deviceIdFactory.createSensorId(toRaw(code.value).value),
+      'aaaaaaaaaaaaaaaaaaaaaaaa', // to put the id of the user taken from the pinia storage
+      toRaw(contacts.value).map((c: Contact) => {
+        return {
+          type: toRaw(c).label,
+          value: toRaw(c).value
+        }
+      }),
+      description.value,
+      new Date('1970-01-01T' + from.value + ':00.000Z'),
+      new Date('2030-01-01T' + to.value + ':00.000Z')
+    )
+    emit('insert-exceeding-rule', newExceedingRule)
+  } else if (anomalyType.value == AnomalyType.INTRUSION) {
+    const newIntrusionRule: IntrusionRule = securityRuleFactory.createIntrusionRule(
+      objectClass.value,
+      '',
+      deviceIdFactory.createCameraId(toRaw(code.value).value),
+      'aaaaaaaaaaaaaaaaaaaaaaaa', // to put the id of the user taken from the pinia storage
+      toRaw(contacts.value).map((c: Contact) => {
+        return {
+          type: toRaw(c).label,
+          value: toRaw(c).value
+        }
+      }),
+      description.value,
+      new Date('1970-01-01T' + from.value + ':00.000Z'),
+      new Date('2040-01-01T' + to.value + ':00.000Z')
+    )
+    emit('insert-intrusion-rule', newIntrusionRule)
+  }*/
 }
 </script>
 
diff --git a/frontend/src/utils/RequestHelper.ts b/frontend/src/utils/RequestHelper.ts
index 1b9cd46f8..c7d681334 100644
--- a/frontend/src/utils/RequestHelper.ts
+++ b/frontend/src/utils/RequestHelper.ts
@@ -19,7 +19,6 @@ export const monitoringPort: string = import.meta.env.VITE_MONITORING_PORT || '4
 export const alarmHost: string = import.meta.env.VITE_ALARM_HOST || 'localhost'
 export const alarmPort: string = import.meta.env.VITE_ALARM_PORT || '4002'
 
-
 export default class RequestHelper {
   static getHeaders(): Headers {
     return { headers: { Authorization: `Bearer apikey-dev` } } //${userStore().accessToken}
diff --git a/frontend/src/views/DevicesView.vue b/frontend/src/views/DevicesView.vue
index 669d6a82e..005d21102 100644
--- a/frontend/src/views/DevicesView.vue
+++ b/frontend/src/views/DevicesView.vue
@@ -1,6 +1,6 @@
 <script lang="ts"></script>
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted, ref } from 'vue'
 
 import SensorBadge from '@/components/devices/DeviceBadge.vue'
 import type {
@@ -15,14 +15,11 @@ import {
   EnvironmentDataFactoryImpl,
   ResolutionFactoryImpl
 } from '@domain/device/factories'
-import type { Camera, EnvironmentData, Sensor } from '@domain/device/core'
-import { Measure, MeasureUnit } from '@domain/device/core'
+import type { Camera, Sensor } from '@domain/device/core'
+import { Measure } from '@domain/device/core'
 import NewDevicePopup from '@/components/devices/NewDevicePopup.vue'
-import RequestHelper from "@/utils/RequestHelper";
-import type { Contact } from "domain/dist/domain/monitoring/core";
-import { ContactTypeConverter, MeasureConverter } from "domain/dist/utils";
-import type { ExceedingRule } from "domain/dist/domain/security-rule/core";
-import { monitoringHost, monitoringPort } from "@/utils/RequestHelper";
+import RequestHelper, { monitoringHost, monitoringPort } from '@/utils/RequestHelper'
+import { MeasureConverter } from 'domain/dist/utils'
 
 const environmentDataFactory: EnvironmentDataFactory = new EnvironmentDataFactoryImpl()
 
@@ -85,6 +82,60 @@ function composeMeasure(measures: any): Measure[] {
   })
 }
 
+const insertSensor = async (sensor: Sensor) => {
+  console.log('CO SONOOOO')
+  console.log({
+    code: sensor.deviceId.code,
+    ipAddress: sensor.ipAddress,
+    intervalMillis: sensor.intervalMillis,
+    measures: sensor.measures.map((m: Measure) => {
+      return MeasureConverter.convertToString(m)
+    })
+  })
+  await RequestHelper.post(`http://${monitoringHost}:${monitoringPort}/devices/sensors`, {
+    code: sensor.deviceId.code,
+    ipAddress: sensor.ipAddress,
+    intervalMillis: sensor.intervalMillis,
+    measures: sensor.measures.map((m: Measure) => {
+      return MeasureConverter.convertToString(m)
+    })
+  })
+    .then(async (res: any) => {
+      //TODO A CONFIRM POPUP
+      await getSensors()
+    })
+    .catch((error) => {
+      console.log(error)
+    })
+}
+
+const insertCamera = async (camera: Camera) => {
+  console.log('CO SONOOOO')
+  console.log({
+    code: camera.deviceId.code,
+    ipAddress: camera.ipAddress,
+    resolution: {
+      width: camera.resolution.width,
+      height: camera.resolution.height
+    }
+  })
+  await RequestHelper.post(`http://${monitoringHost}:${monitoringPort}/devices/cameras`, {
+    code: camera.deviceId.code,
+    ipAddress: camera.ipAddress,
+    resolution: {
+      width: camera.resolution.width,
+      height: camera.resolution.height
+    }
+  })
+    .then(async (res: any) => {
+      //TODO A CONFIRM POPUP
+      await getCameras()
+    })
+    .catch((error) => {
+      console.log(error)
+    })
+}
+
 const deleteSensor = async (sensor: Sensor) => {
   console.log(sensor.deviceId.type, sensor.deviceId.code)
   await RequestHelper.delete(
@@ -145,8 +196,13 @@ const popupVisible = ref<boolean>(false)
     />
   </div>
 
-<!--  to check!!-->
-  <new-device-popup v-model="popupVisible" @update-devices="getSensors"></new-device-popup>
+  <!--  to check!!-->
+  <new-device-popup
+    v-model="popupVisible"
+    @update-devices="getSensors"
+    @insert-sensor="insertSensor"
+    @insert-camera="insertCamera"
+  ></new-device-popup>
 </template>
 
 <style scoped lang="scss">
diff --git a/frontend/src/views/SecurityRuleView.vue b/frontend/src/views/SecurityRuleView.vue
index ea38f2822..3936ea8ab 100644
--- a/frontend/src/views/SecurityRuleView.vue
+++ b/frontend/src/views/SecurityRuleView.vue
@@ -13,7 +13,7 @@ import NewSecurityRulePopup from '@/components/security-rule/NewSecurityRulePopu
 import SecurityRuleBadge from '@/components/security-rule/SecurityRuleBadge.vue'
 import RequestHelper from '@/utils/RequestHelper'
 import { ContactTypeConverter, MeasureConverter, ObjectClassConverter } from 'domain/dist/utils'
-import { alarmHost, alarmPort } from "@/utils/RequestHelper";
+import { alarmHost, alarmPort } from '@/utils/RequestHelper'
 
 const securityRuleFactory: SecurityRuleFactory = new SecurityRuleFactoryImpl()
 const deviceIdFactory: DeviceIdFactory = new DeviceIdFactoryImpl()
@@ -130,7 +130,6 @@ const insertExceedingRule = async (exceedingRule: ExceedingRule) => {
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
       await getExceedingSecurityRules()
-      await getIntrusionSecurityRules()
     })
     .catch((error) => {
       console.log(error)
@@ -151,7 +150,6 @@ const insertIntrusionRule = async (intrusionRule: IntrusionRule) => {
   })
     .then(async (res: any) => {
       //TODO A CONFIRM POPUP
-      await getExceedingSecurityRules()
       await getIntrusionSecurityRules()
     })
     .catch((error) => {
diff --git a/monitoring/src/consumer.ts b/monitoring/src/consumer.ts
index fc940be8c..3d1fea40e 100644
--- a/monitoring/src/consumer.ts
+++ b/monitoring/src/consumer.ts
@@ -24,7 +24,7 @@ export const setupConsumers = async (): Promise<void> => {
     console.log('Consumers', consumers)
 
     socket.on('disconnect', () => {
-/*      getConsumerById(socket.id).disconnect()
+      /*      getConsumerById(socket.id).disconnect()
       consumers.splice(
         consumers.findIndex((c): boolean => c.id === socket.id),
         1
@@ -35,14 +35,14 @@ export const setupConsumers = async (): Promise<void> => {
 
     socket.on('pause', async (topics: string[]): Promise<void> => {
       console.log('Pausing topics', topics)
-/*      getConsumerById(socket.id).pause(
+      /*      getConsumerById(socket.id).pause(
         topics.map((topic: string): { topic: string } => ({ topic }))
       )*/
     })
 
     socket.on('resume', async (topics: string[]): Promise<void> => {
       console.log('Resuming topics', topics)
-/*      getConsumerById(socket.id).resume(
+      /*      getConsumerById(socket.id).resume(
         topics.map((topic: string): { topic: string } => ({ topic }))
       )*/
     })

From b93387e87c4d5141b52b69ab7e1d242d03cb8c3a Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Mon, 29 Jan 2024 19:21:10 +0100
Subject: [PATCH 5/6] other: fix init scripts for database

---
 alarm/db/alarm-init.js                  | 64 ++++++++-----------------
 auth/db/auth-init.js                    |  4 +-
 frontend/src/views/SecurityRuleView.vue |  2 +-
 3 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/alarm/db/alarm-init.js b/alarm/db/alarm-init.js
index f01a39fe6..b37291db3 100644
--- a/alarm/db/alarm-init.js
+++ b/alarm/db/alarm-init.js
@@ -4,7 +4,7 @@ db.createCollection('anomaly')
 
 db.anomaly.insert([
   {
-    _id: '65b514200718dbb3580fb9e6',
+    _id: ObjectId('65b514200718dbb3580fb9e6'),
     deviceId: {
       type: 'SENSOR',
       code: 'sen-01'
@@ -17,7 +17,7 @@ db.anomaly.insert([
     __v: 0
   },
   {
-    _id: '65b514240718dbb3580fb9e8',
+    _id: ObjectId('65b514240718dbb3580fb9e8'),
     deviceId: {
       type: 'CAMERA',
       code: 'cam-03'
@@ -34,8 +34,8 @@ db.createCollection('notification')
 
 db.notification.insert([
   {
-    _id: '65b5113633b1c7e038248937',
-    anomalyId: '65b514200718dbb3580fb9e6',
+    _id: ObjectId('65b5113633b1c7e038248937'),
+    anomalyId: ObjectId('65b514200718dbb3580fb9e6'),
     anomalyType: 'EXCEEDING',
     timestamp: {
       $date: '2024-01-27T14:20:38.950Z'
@@ -43,8 +43,8 @@ db.notification.insert([
     __v: 0
   },
   {
-    _id: '65b513ef0718dbb3580fb9e3',
-    anomalyId: '65b514240718dbb3580fb9e8',
+    _id: ObjectId('65b513ef0718dbb3580fb9e3'),
+    anomalyId: ObjectId('65b514240718dbb3580fb9e8'),
     anomalyType: 'INTRUSION',
     timestamp: {
       $date: '2024-01-27T14:32:15.925Z'
@@ -56,12 +56,12 @@ db.notification.insert([
 db.createCollection('securityRule')
 db.securityRule.insert([
   {
-    _id: '65b527590fa38e9a5422537c',
+    _id: ObjectId('65b527590fa38e9a5422537c'),
     deviceId: {
       type: 'SENSOR',
       code: 'sen-01'
     },
-    creatorId: 'aaaaaaaaaaaaaaaaaaaaaaaa',
+    creatorId: ObjectId('aaaaaaaaaaaaaaaaaaaaaaaa'),
     description: 'Exceeding rule description',
     minValue: 0,
     maxValue: 25,
@@ -69,17 +69,11 @@ db.securityRule.insert([
     contacts: [
       {
         type: 'SMS',
-        value: '3333333333',
-        _id: {
-          $oid: '65b527590fa38e9a5422537d'
-        }
+        value: '3333333333'
       },
       {
         type: 'EMAIL',
-        value: 'email@gmail.com',
-        _id: {
-          $oid: '65b527590fa38e9a5422537e'
-        }
+        value: 'email@gmail.com'
       }
     ],
     from: {
@@ -91,28 +85,22 @@ db.securityRule.insert([
     __v: 0
   },
   {
-    _id: '65b52e53cffd8e469604ef10',
+    _id: ObjectId('65b52e53cffd8e469604ef10'),
     deviceId: {
       type: 'CAMERA',
       code: 'cam-01'
     },
-    creatorId: 'aaaaaaaaaaaaaaaaaaaaaaab',
+    creatorId: ObjectId('aaaaaaaaaaaaaaaaaaaaaaab'),
     description: 'Intrusion rule description',
     objectClass: 'PERSON',
     contacts: [
       {
         type: 'SMS',
-        value: '3333333333',
-        _id: {
-          $oid: '65b52e53cffd8e469604ef11'
-        }
+        value: '3333333333'
       },
       {
         type: 'EMAIL',
-        value: 'email@gmail.com',
-        _id: {
-          $oid: '65b52e53cffd8e469604ef12'
-        }
+        value: 'email@gmail.com'
       }
     ],
     from: {
@@ -129,43 +117,31 @@ db.createCollection('recognizingNode')
 
 db.recognizingNode.insert([
   {
-    _id: '65a020d5de7178fe501e7dda',
+    _id: ObjectId('65a020d5de7178fe501e7dda'),
     ipAddress: '192.168.1.2',
     deviceIds: [
       {
         type: 'CAMERA',
-        code: 'cam-01',
-        _id: {
-          $oid: '65a10044aa628f95323324a9'
-        }
+        code: 'cam-01'
       },
       {
         type: 'SENSOR',
-        code: 'sen-01',
-        _id: {
-          $oid: '65a10044aa628f95323324aa'
-        }
+        code: 'sen-01'
       }
     ],
     __v: 0
   },
   {
-    _id: '65a020d5de7178fe501e7ddb',
+    _id: ObjectId('65a020d5de7178fe501e7ddb'),
     ipAddress: '192.168.1.2',
     deviceIds: [
       {
         type: 'CAMERA',
-        code: 'cam-02',
-        _id: {
-          $oid: '65a10044aa628f95323324b9'
-        }
+        code: 'cam-02'
       },
       {
         type: 'SENSOR',
-        code: 'sen-02',
-        _id: {
-          $oid: '65a10044aa628f95323324ac'
-        }
+        code: 'sen-02'
       }
     ],
     __v: 0
diff --git a/auth/db/auth-init.js b/auth/db/auth-init.js
index 2b127dfd4..eb78680c5 100644
--- a/auth/db/auth-init.js
+++ b/auth/db/auth-init.js
@@ -4,7 +4,7 @@ db.createCollection('user')
 //TODO to test
 db.user.insertMany([
   {
-    _id: 'aaaaaaaaaaaaaaaaaaaaaaaa',
+    _id: ObjectId('aaaaaaaaaaaaaaaaaaaaaaaa'),
     name: 'Mattia',
     surname: 'Matteini',
     username: 'mattia',
@@ -18,7 +18,7 @@ db.user.insertMany([
     ]
   },
   {
-    _id: 'aaaaaaaaaaaaaaaaaaaaaaab',
+    _id: ObjectId('aaaaaaaaaaaaaaaaaaaaaaab'),
     name: 'Mario',
     surname: 'Rossi',
     username: 'paga16',
diff --git a/frontend/src/views/SecurityRuleView.vue b/frontend/src/views/SecurityRuleView.vue
index 3936ea8ab..c29407cd1 100644
--- a/frontend/src/views/SecurityRuleView.vue
+++ b/frontend/src/views/SecurityRuleView.vue
@@ -24,7 +24,7 @@ const exceedingsSecurityRules: ref<ExceedingRule[]> = ref([])
 const intrusionsSecurityRules: ref<IntrusionRule[]> = ref([])
 
 const getExceedingSecurityRules = async () => {
-  await RequestHelper.get(`http://localhost:4000/security-rules/exceedings`)
+  await RequestHelper.get(`http://${alarmHost}:${alarmPort}/security-rules/exceedings`)
     .then((res: any) => {
       exceedingsSecurityRules.value = []
       for (let i = 0; i < res.data.length; i++) {

From 8e104dcd76804a9a6a59beb315620155a844e7ce Mon Sep 17 00:00:00 2001
From: Alberto Paganelli <alberto.paganelli3@studio.unibo.it>
Date: Tue, 30 Jan 2024 10:43:19 +0100
Subject: [PATCH 6/6] other: remove console.log

---
 .../src/components/devices/NewDevicePopup.vue | 38 -------------------
 frontend/src/views/DevicesView.vue            | 20 ----------
 monitoring/src/consumer.ts                    | 16 ++++----
 3 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/frontend/src/components/devices/NewDevicePopup.vue b/frontend/src/components/devices/NewDevicePopup.vue
index e74216a9d..c5da1d66e 100644
--- a/frontend/src/components/devices/NewDevicePopup.vue
+++ b/frontend/src/components/devices/NewDevicePopup.vue
@@ -61,44 +61,6 @@ const addNewDevice = () => {
     )
     emit('insert-camera', newCamera)
   }
-
-  /*if (anomalyType.value == AnomalyType.EXCEEDING) {
-    const newExceedingRule: ExceedingRule = securityRuleFactory.createExceedingRule(
-      min.value,
-      max.value,
-      measure.value,
-      '',
-      deviceIdFactory.createSensorId(toRaw(code.value).value),
-      'aaaaaaaaaaaaaaaaaaaaaaaa', // to put the id of the user taken from the pinia storage
-      toRaw(contacts.value).map((c: Contact) => {
-        return {
-          type: toRaw(c).label,
-          value: toRaw(c).value
-        }
-      }),
-      description.value,
-      new Date('1970-01-01T' + from.value + ':00.000Z'),
-      new Date('2030-01-01T' + to.value + ':00.000Z')
-    )
-    emit('insert-exceeding-rule', newExceedingRule)
-  } else if (anomalyType.value == AnomalyType.INTRUSION) {
-    const newIntrusionRule: IntrusionRule = securityRuleFactory.createIntrusionRule(
-      objectClass.value,
-      '',
-      deviceIdFactory.createCameraId(toRaw(code.value).value),
-      'aaaaaaaaaaaaaaaaaaaaaaaa', // to put the id of the user taken from the pinia storage
-      toRaw(contacts.value).map((c: Contact) => {
-        return {
-          type: toRaw(c).label,
-          value: toRaw(c).value
-        }
-      }),
-      description.value,
-      new Date('1970-01-01T' + from.value + ':00.000Z'),
-      new Date('2040-01-01T' + to.value + ':00.000Z')
-    )
-    emit('insert-intrusion-rule', newIntrusionRule)
-  }*/
 }
 </script>
 
diff --git a/frontend/src/views/DevicesView.vue b/frontend/src/views/DevicesView.vue
index 005d21102..d9d363570 100644
--- a/frontend/src/views/DevicesView.vue
+++ b/frontend/src/views/DevicesView.vue
@@ -31,7 +31,6 @@ const sensors: ref<Sensor[]> = ref([])
 const cameras: ref<Camera[]> = ref([])
 
 const getSensors = async () => {
-  console.log('getSensors')
   await RequestHelper.get(`http://${monitoringHost}:${monitoringPort}/devices/sensors`)
     .then((res: any) => {
       sensors.value = []
@@ -45,7 +44,6 @@ const getSensors = async () => {
     })
 }
 const getCameras = async () => {
-  console.log('getCameras')
   await RequestHelper.get(`http://${monitoringHost}:${monitoringPort}/devices/cameras`)
     .then((res: any) => {
       cameras.value = []
@@ -83,15 +81,6 @@ function composeMeasure(measures: any): Measure[] {
 }
 
 const insertSensor = async (sensor: Sensor) => {
-  console.log('CO SONOOOO')
-  console.log({
-    code: sensor.deviceId.code,
-    ipAddress: sensor.ipAddress,
-    intervalMillis: sensor.intervalMillis,
-    measures: sensor.measures.map((m: Measure) => {
-      return MeasureConverter.convertToString(m)
-    })
-  })
   await RequestHelper.post(`http://${monitoringHost}:${monitoringPort}/devices/sensors`, {
     code: sensor.deviceId.code,
     ipAddress: sensor.ipAddress,
@@ -110,15 +99,6 @@ const insertSensor = async (sensor: Sensor) => {
 }
 
 const insertCamera = async (camera: Camera) => {
-  console.log('CO SONOOOO')
-  console.log({
-    code: camera.deviceId.code,
-    ipAddress: camera.ipAddress,
-    resolution: {
-      width: camera.resolution.width,
-      height: camera.resolution.height
-    }
-  })
   await RequestHelper.post(`http://${monitoringHost}:${monitoringPort}/devices/cameras`, {
     code: camera.deviceId.code,
     ipAddress: camera.ipAddress,
diff --git a/monitoring/src/consumer.ts b/monitoring/src/consumer.ts
index 3d1fea40e..42e8c1c2a 100644
--- a/monitoring/src/consumer.ts
+++ b/monitoring/src/consumer.ts
@@ -7,9 +7,9 @@ const kafkaPort: string = process.env.KAFKA_PORT || '9092'
 
 const consumers: { id: string; consumer: Consumer }[] = []
 
-/*const getConsumerById = (id: string): Consumer => {
+const getConsumerById = (id: string): Consumer => {
   return consumers.find((c): boolean => c.id === id)!.consumer
-}*/
+}
 
 export const setupConsumers = async (): Promise<void> => {
   console.log('Setting up consumers')
@@ -24,27 +24,27 @@ export const setupConsumers = async (): Promise<void> => {
     console.log('Consumers', consumers)
 
     socket.on('disconnect', () => {
-      /*      getConsumerById(socket.id).disconnect()
+      getConsumerById(socket.id).disconnect()
       consumers.splice(
         consumers.findIndex((c): boolean => c.id === socket.id),
         1
-      )*/
+      )
       console.log('A client disconnected', socket.id)
       console.log('Consumers', consumers)
     })
 
     socket.on('pause', async (topics: string[]): Promise<void> => {
       console.log('Pausing topics', topics)
-      /*      getConsumerById(socket.id).pause(
+      getConsumerById(socket.id).pause(
         topics.map((topic: string): { topic: string } => ({ topic }))
-      )*/
+      )
     })
 
     socket.on('resume', async (topics: string[]): Promise<void> => {
       console.log('Resuming topics', topics)
-      /*      getConsumerById(socket.id).resume(
+      getConsumerById(socket.id).resume(
         topics.map((topic: string): { topic: string } => ({ topic }))
-      )*/
+      )
     })
 
     socket.on('subscribe', async (topics: string[]): Promise<void> => {