feat-ISSUE-3782-PR 1/2 adding crosstables rule - zone for destination and source

roles/common/files/fwo-api-calls/import/rollbackImport.graphql

@@ -1,5 +1,4 @@
 mutation rollbackImport($importId: bigint!) {
-    delete_rule(where: {rule_create: {_eq: $importId}}) { affected_rows }
     delete_rulebase(where: {created: {_eq: $importId}}) { affected_rows }
     delete_rulebase_link(where: {created: {_eq: $importId}}) { affected_rows }
     delete_object(where: {obj_create: {_eq: $importId}}) { affected_rows }
@@ -18,7 +17,10 @@ mutation rollbackImport($importId: bigint!) {
     delete_rule_nwobj_resolved(where: {created: {_eq: $importId}}) { affected_rows }
     delete_rule_svc_resolved(where: {created: {_eq: $importId}}) { affected_rows }
     delete_rule_user_resolved(where: {created: {_eq: $importId}}) { affected_rows }
+    delete_rule_from_zone(where: {created: {_eq: $importId}}) { affected_rows }
+    delete_rule_to_zone(where: {created: {_eq: $importId}}) { affected_rows }
     delete_rule_enforced_on_gateway(where: {created: {_eq: $importId}}) { affected_rows }
+    delete_rule(where: {rule_create: {_eq: $importId}}) { affected_rows }
     update_rule(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     update_rulebase(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     update_rulebase_link(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
@@ -38,6 +40,8 @@ mutation rollbackImport($importId: bigint!) {
     update_rule_nwobj_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     update_rule_svc_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     update_rule_user_resolved(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
+    update_rule_from_zone(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
+    update_rule_to_zone(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     update_rule_enforced_on_gateway(where: {removed: {_eq: $importId}}, _set: {removed: null}) { affected_rows }
     delete_import_control(where: {control_id: {_eq: $importId}}) { affected_rows }            
 }

roles/common/files/fwo-api-calls/report/getManagementForLatestNormalizedConfig.graphql

@@ -120,11 +120,15 @@ fragment ruleFragment on rule {
     rule_last_hit
   }
   rule_comment
-  src_zone: zone {
-    zone_name
+  rule_from_zones {
+    zone {
+      zone_name
+    }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
+  rule_to_zones {
+    zone {
+      zone_name
+    }
   }
   section_header: rule_head_text
 }

roles/common/files/fwo-api-calls/report/getManagementForNormalizedConfig.graphql

@@ -167,11 +167,15 @@ fragment ruleFragment on rule {
     rule_last_hit
   }
   rule_comment
-  src_zone: zone {
-    zone_name
+  rule_from_zones {
+    zone {
+      zone_name
+    }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
+  rule_to_zones {
+    zone {
+      zone_name
+    }
   }
   section_header: rule_head_text
 }
@@ -193,6 +197,7 @@ fragment deviceFragment on device {
 }
 
 fragment ruleBaseLinkFragment on rulebase_link {
+  gw_id
   rule {
     rule_uid
   }

roles/common/files/fwo-api-calls/rule/fragments/ruleDetails.graphql

@@ -9,10 +9,12 @@ fragment ruleDetails on rule {
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   active
   rule_create
   rule_last_seen
@@ -41,9 +43,11 @@ fragment ruleDetails on rule {
       ...networkObjectDetails
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     active: { _eq: $active }

roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesNew.graphql

@@ -7,10 +7,12 @@
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -49,9 +51,11 @@
       ...networkObjectDetailsChangesNew
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     active: { _eq: $active }

roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsChangesOld.graphql

@@ -7,10 +7,12 @@
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -49,9 +51,11 @@
       ...networkObjectDetailsChangesOld
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     active: { _eq: $active }

roles/common/files/fwo-api-calls/rule/fragments/ruleDetailsForReport.graphql

@@ -7,11 +7,13 @@
   section_header: rule_head_text
   rule_comment
   rule_track
-  rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_disabled  
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -51,9 +53,11 @@
       ...networkObjectDetails
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     rt_create: { _lte: $import_id_end }

roles/common/files/fwo-api-calls/rule/fragments/ruleOverview.graphql

@@ -8,10 +8,12 @@ fragment ruleOverview on rule {
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -52,9 +54,11 @@ fragment ruleOverview on rule {
       ...networkObjectOverview
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     rt_create: { _lte: $import_id_end }

roles/common/files/fwo-api-calls/rule/fragments/ruleOverviewChangesNew.graphql

@@ -7,10 +7,12 @@ fragment ruleOverviewChangesNew on rule {
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -46,9 +48,11 @@ fragment ruleOverviewChangesNew on rule {
       ...networkObjectOverview
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     active: { _eq: $active }

roles/common/files/fwo-api-calls/rule/fragments/ruleOverviewChangesOld.graphql

@@ -7,10 +7,12 @@ fragment ruleOverviewChangesOld on rule {
   rule_comment
   rule_track
   rule_disabled
-  src_zone: zone {
-    zone_name
-    zone_id
-  }
+  rule_from_zones {
+      zone {
+        zone_name
+		zone_id
+      }
+    }
   rule_metadatum {
     rule_metadata_id
     rule_created
@@ -46,9 +48,11 @@ fragment ruleOverviewChangesOld on rule {
       ...networkObjectOverview
     }
   }
-  dst_zone: zoneByRuleToZone {
-    zone_name
-    zone_id
+  rule_to_zones {
+    zone {
+      zone_name
+      zone_id
+    }
   }
   rule_tos(where: {
     active: { _eq: $active }

roles/common/files/fwo-api-calls/rule/insertRuleRefs.graphql

@@ -5,6 +5,8 @@ mutation insertRuleRefs(
     $ruleNwObjResolveds: [rule_nwobj_resolved_insert_input!]!
     $ruleSvcResolveds: [rule_svc_resolved_insert_input!]!
     $ruleUserResolveds: [rule_user_resolved_insert_input!]!
+    $ruleFromZones: [rule_from_zone_insert_input!]!
+    $ruleToZones: [rule_to_zone_insert_input!]!
 ) {
     insert_rule_from(objects: $ruleFroms) {
         affected_rows
@@ -24,4 +26,10 @@ mutation insertRuleRefs(
     insert_rule_user_resolved(objects: $ruleUserResolveds) {
         affected_rows
     }
+    insert_rule_from_zone(objects: $ruleFromZones) {
+        affected_rows
+    }
+    insert_rule_to_zone(objects: $ruleToZones) {
+        affected_rows
+    }
 }

roles/common/files/fwo-api-calls/rule/updateRuleRefs.graphql

@@ -6,6 +6,8 @@ mutation updateRuleRefs(
     $ruleNwObjResolveds: [rule_nwobj_resolved_bool_exp!]
     $ruleSvcResolveds: [rule_svc_resolved_bool_exp!]!
     $ruleUserResolveds: [rule_user_resolved_bool_exp!]!
+    $ruleFromZones: [rule_from_zone_bool_exp!]
+    $ruleToZones: [rule_to_zone_bool_exp!]
 ) {
     update_rule_from(where: {
         _or: $ruleFroms
@@ -58,4 +60,20 @@ mutation updateRuleRefs(
     }) {
         affected_rows
     }
+    update_rule_from_zone(where: {
+        _or: $ruleFromZones
+        removed: {_is_null: true}
+    }, _set: {
+        removed: $importId
+    }) {
+        affected_rows
+    }
+    update_rule_to_zone(where: {
+        _or: $ruleToZones
+        removed: {_is_null: true}
+    }, _set: {
+        removed: $importId
+    }) {
+        affected_rows
+    }
 }

roles/database/files/sql/creation/fworch-create-foreign-keys.sql

@@ -114,6 +114,11 @@ Alter table "rulebase_link" add CONSTRAINT fk_rulebase_link_created_import_contr
 Alter table "rulebase_link" add CONSTRAINT fk_rulebase_link_removed_import_control_control_id 
 	foreign key ("removed") references "import_control" ("control_id") on update restrict on delete cascade;
 
+ALTER TABLE "rule_to_zone"
+ADD CONSTRAINT fk_rule_to_zone_rule_id_rule_rule_id FOREIGN KEY ("rule_id") REFERENCES "rule" ("rule_id");
+ALTER TABLE "rule_to_zone"
+ADD CONSTRAINT fk_rule_to_zone_zone_id_zone_zone_id FOREIGN KEY ("zone_id") REFERENCES "zone" ("zone_id");
+
 Alter table "rule_from" add  foreign key ("obj_id") references "object" ("obj_id") on update restrict on delete cascade;
 Alter table "rule_from" add  foreign key ("rf_create") references "import_control" ("control_id") on update restrict on delete cascade;
 Alter table "rule_from" add  foreign key ("rf_last_seen") references "import_control" ("control_id") on update restrict on delete cascade;
@@ -143,6 +148,11 @@ Alter table "rule_service" add  foreign key ("rs_last_seen") references "import_
 Alter table "rule_service" add  foreign key ("rule_id") references "rule" ("rule_id") on update restrict on delete cascade;
 Alter table "rule_service" add  foreign key ("svc_id") references "service" ("svc_id") on update restrict on delete cascade;
 
+ALTER TABLE "rule_from_zone"
+ADD CONSTRAINT fk_rule_from_zone_rule_id_rule_rule_id FOREIGN KEY ("rule_id") REFERENCES "rule" ("rule_id");
+ALTER TABLE "rule_from_zone"
+ADD CONSTRAINT fk_rule_from_zone_zone_id_zone_zone_id FOREIGN KEY ("zone_id") REFERENCES "zone" ("zone_id");
+
 Alter table "rule_svc_resolved" add foreign key ("svc_id") references "service" ("svc_id") on update restrict on delete cascade;
 Alter table "rule_svc_resolved" add foreign key ("rule_id") references "rule" ("rule_id") on update restrict on delete cascade;
 Alter table "rule_svc_resolved" add foreign key ("mgm_id") references "management" ("mgm_id") on update restrict on delete cascade;