From e2c7ea213f522ccfe6311d4b7fb9ef99ba23765b Mon Sep 17 00:00:00 2001
From: Bruno Gelatti <bgelatti@gmail.com>
Date: Tue, 27 Aug 2024 09:49:48 -0300
Subject: [PATCH 1/3] Created new type of trigger in action

---
 src/modules/Resources/actions.types.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/modules/Resources/actions.types.ts b/src/modules/Resources/actions.types.ts
index a68d4f3f..ef8dfdf2 100644
--- a/src/modules/Resources/actions.types.ts
+++ b/src/modules/Resources/actions.types.ts
@@ -1,6 +1,11 @@
 import { GenericID, Conditionals, TagsObj, Query, ExpireTimeOption } from "../../common/common.types";
 
-type ActionType = "condition" | "resource" | "interval" | "schedule" | "mqtt_topic";
+type ActionType = "condition" | "resource" | "interval" | "schedule" | "mqtt_topic" | "condition_geofence";
+type TriggerGeofenceValueType = {
+  center?: number[];
+  radius?: number;
+  coordinates?: Array<number[]>;
+};
 
 type ActionTypeParams =
   | {
@@ -63,6 +68,13 @@ type ActionTriggerType =
       second_value?: string;
       value_type: "string" | "number" | "boolean" | "*";
       unlock?: boolean;
+    }
+  | {
+      device: string;
+      variable: string;
+      is: "IN" | "OUT";
+      value: TriggerGeofenceValueType;
+      unlock?: boolean;
     };
 
 interface ActionCreateInfo {

From b94f81869284eb594c6472f1c863e777229f922f Mon Sep 17 00:00:00 2001
From: Bruno Gelatti <bgelatti@gmail.com>
Date: Tue, 27 Aug 2024 09:54:56 -0300
Subject: [PATCH 2/3] Created new type of trigger in action

---
 src/modules/Resources/actions.types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/Resources/actions.types.ts b/src/modules/Resources/actions.types.ts
index ef8dfdf2..b0df7ef2 100644
--- a/src/modules/Resources/actions.types.ts
+++ b/src/modules/Resources/actions.types.ts
@@ -2,9 +2,9 @@ import { GenericID, Conditionals, TagsObj, Query, ExpireTimeOption } from "../..
 
 type ActionType = "condition" | "resource" | "interval" | "schedule" | "mqtt_topic" | "condition_geofence";
 type TriggerGeofenceValueType = {
-  center?: number[];
+  center?: number[]; // [longitude, latitude]
   radius?: number;
-  coordinates?: Array<number[]>;
+  coordinates?: Array<number[]>; // [[longitude, latitude], [longitude, latitude], ...]
 };
 
 type ActionTypeParams =

From 2e3b4a65bfd982e29cdb2824d90e9a8a95b85b38 Mon Sep 17 00:00:00 2001
From: Fabiano Eger <fabiano.eger17@gmail.com>
Date: Tue, 15 Oct 2024 10:08:44 -0300
Subject: [PATCH 3/3] update conflicts

---
 src/modules/Resources/actions.types.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/modules/Resources/actions.types.ts b/src/modules/Resources/actions.types.ts
index efeb1c89..a4379edb 100644
--- a/src/modules/Resources/actions.types.ts
+++ b/src/modules/Resources/actions.types.ts
@@ -1,6 +1,13 @@
 import { GenericID, Conditionals, TagsObj, Query, ExpireTimeOption } from "../../common/common.types";
 
-type ActionType = "condition" | "resource" | "interval" | "schedule" | "mqtt_topic" | "usage_alert" | "condition_geofence";
+type ActionType =
+  | "condition"
+  | "resource"
+  | "interval"
+  | "schedule"
+  | "mqtt_topic"
+  | "usage_alert"
+  | "condition_geofence";
 type TriggerGeofenceValueType = {
   center?: number[]; // [longitude, latitude]
   radius?: number;
@@ -70,13 +77,6 @@ type ActionTriggerType =
       unlock?: boolean;
     }
   | {
-<<<<<<< HEAD
-      device: string;
-      variable: string;
-      is: "IN" | "OUT";
-      value: TriggerGeofenceValueType;
-      unlock?: boolean;
-=======
       service_or_resource:
         | "input"
         | "output"
@@ -95,7 +95,13 @@ type ActionTriggerType =
         | "am";
       condition: "=" | ">";
       condition_value: number;
->>>>>>> master
+    }
+  | {
+      device: string;
+      variable: string;
+      is: "IN" | "OUT";
+      value: TriggerGeofenceValueType;
+      unlock?: boolean;
     };
 
 interface ActionCreateInfo {