feature: modifiy rules from fronted

revue-org · Jan 31, 2024 · 78786a7 · 78786a7
1 parent 2d0fc7d
commit 78786a7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/domain/src/storage/security-rule/SecurityRuleRepositoryImpl.ts b/domain/src/storage/security-rule/SecurityRuleRepositoryImpl.ts
@@ -6,6 +6,7 @@ import { IntrusionRule } from '../../domain/security-rule/core/IntrusionRule.js'
 import { DeviceTypeConverter } from '../../utils/DeviceTypeConverter.js'
 import { MeasureConverter } from '../../utils/MeasureConverter.js'
 import { ObjectClassConverter } from '../../utils/ObjectClassConverter.js'
+import { ContactTypeConverter } from '../../utils'
 
 export class SecurityRuleRepositoryImpl implements SecurityRuleRepository {
   exceedingRuleModel: Model<ExceedingRule>
@@ -81,7 +82,7 @@ export class SecurityRuleRepositoryImpl implements SecurityRuleRepository {
       new mongoose.Types.ObjectId(exceedingRule.securityRuleId),
       {
         deviceId: {
-          type: exceedingRule.deviceId.type,
+          type: DeviceTypeConverter.convertToString(exceedingRule.deviceId.type),
           code: exceedingRule.deviceId.code
         },
         contacts: exceedingRule.contactsToNotify,
@@ -100,7 +101,7 @@ export class SecurityRuleRepositoryImpl implements SecurityRuleRepository {
       new mongoose.Types.ObjectId(intrusionRule.securityRuleId),
       {
         deviceId: {
-          type: intrusionRule.deviceId.type,
+          type: DeviceTypeConverter.convertToString(intrusionRule.deviceId.type),
           code: intrusionRule.deviceId.code
         },
         contacts: intrusionRule.contactsToNotify,

diff --git a/frontend/src/components/security-rule/SecurityRuleBadge.vue b/frontend/src/components/security-rule/SecurityRuleBadge.vue
@@ -9,8 +9,8 @@ import {
 } from '@domain/security-rule/core'
 import UpdateSecurityRulePopup from './UpdateSecurityRulePopup.vue'
 import { ref } from 'vue'
-import { DeviceTypeConverter, MeasureConverter, ObjectClassConverter } from "domain/dist/utils";
-import RequestHelper, { alarmHost, alarmPort } from "@/utils/RequestHelper";
+import { DeviceTypeConverter, MeasureConverter, ObjectClassConverter } from 'domain/dist/utils'
+import RequestHelper, { alarmHost, alarmPort } from '@/utils/RequestHelper'
 
 defineProps<{
   securityRule: SecurityRule
@@ -23,32 +23,24 @@ defineEmits<{
 const updatePopupVisible = ref<boolean>(false)
 
 const updateExceedingRule = async (exceedingRule: ExceedingRule) => {
-  /*
-  * {
-    "id": "65b527590fa38e9a5422537c",
-    "deviceId": {
-        "type": "SENSOR",
-        "code": "sen-01"
+  console.log(DeviceTypeConverter.convertToString(exceedingRule.deviceId.type))
+  console.log(exceedingRule.deviceId.type)
+  console.log({
+    id: exceedingRule.securityRuleId,
+    deviceId: {
+      type: DeviceTypeConverter.convertToString(exceedingRule.deviceId.type),
+      code: exceedingRule.deviceId.code
     },
-    "description": "ciao",
-    "minValue": 0,
-    "maxValue": 50,
-    "measure": "TEMPERATURE",
-    "from": "2018-01-01T01:00:00.000Z",
-    "to": "2020-01-01T01:00:00.000Z",
-    "contacts": [
-        {
-            "value": "3667161457",
-            "type": "SMS"
-        },
-        {
-            "value": "[email protected]",
-            "type": "EMAIL"
-        }
-    ]
-}
-* */
+    description: exceedingRule.description,
+    minValue: exceedingRule.min,
+    maxValue: exceedingRule.max,
+    measure: MeasureConverter.convertToString(exceedingRule.measure),
+    from: exceedingRule.from.toISOString(),
+    to: exceedingRule.to.toISOString(),
+    contacts: exceedingRule.contactsToNotify
+  })
   await RequestHelper.put(`http://${alarmHost}:${alarmPort}/security-rules/exceedings`, {
+    id: exceedingRule.securityRuleId,
     deviceId: {
       type: DeviceTypeConverter.convertToString(exceedingRule.deviceId.type),
       code: exceedingRule.deviceId.code
@@ -72,6 +64,7 @@ const updateExceedingRule = async (exceedingRule: ExceedingRule) => {
 
 const updateIntrusionRule = async (intrusionRule: IntrusionRule) => {
   await RequestHelper.put(`http://${alarmHost}:${alarmPort}/security-rules/intrusions`, {
+    id: intrusionRule.securityRuleId,
     deviceId: {
       type: DeviceTypeConverter.convertToString(intrusionRule.deviceId.type),
       code: intrusionRule.deviceId.code

diff --git a/frontend/src/components/security-rule/UpdateSecurityRulePopup.vue b/frontend/src/components/security-rule/UpdateSecurityRulePopup.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Measure } from 'domain/dist/domain/device/core/impl/enum/Measure'
-import { onMounted, ref, toRaw } from "vue";
+import { onMounted, ref, toRaw } from 'vue'
 import { DeviceType } from '@domain/device/core'
 import type { DeviceIdFactory } from '@domain/device/factories'
 import { DeviceIdFactoryImpl } from '@domain/device/factories'
@@ -74,6 +74,7 @@ const measure: ref<Measure> = ref(Measure.TEMPERATURE)
 const objectClass: ref<ObjectClass> = ref(ObjectClass.PERSON)
 
 const updateSecurityRule = () => {
+  console.log(securityRule)
   if (securityRule.deviceId.type == DeviceType.SENSOR) {
     const updatedExceedingRule: ExceedingRule = securityRuleFactory.createExceedingRule(
       (securityRule as ExceedingRule).min,