From 2b9abff7f154f913514b557b7f557d08c5ea0ab8 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Thu, 12 Mar 2020 00:36:06 +0100
Subject: [PATCH] add: receive more controller properties and save them add:
 more tests

---
 controllers/api_v1_controllers_discover.cc    | 19 +++++++----------
 sql/migration_0.sql                           |  1 +
 .../test_schedules_protected.tavern.yaml      | 21 +++++++++++++++++++
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/controllers/api_v1_controllers_discover.cc b/controllers/api_v1_controllers_discover.cc
index 0f9d548..75b1bd1 100644
--- a/controllers/api_v1_controllers_discover.cc
+++ b/controllers/api_v1_controllers_discover.cc
@@ -106,16 +106,10 @@ void controllers::post_discover(const HttpRequestPtr &req, std::function<void(co
             uuid_t discovered_id;
             int id_size = sizeof(uuid_t);
             memcpy(&discovered_id, binn_map_blob(answer_payload, DISCOVERY_MAPPING_ID, &id_size), id_size);
-            //strncpy(&id, binn_map_blob(answer_payload, DISCOVERY_MAPPING_ID, &uuid_size), uuid_size);
 
-            char uuid_str[38];
-            uuid_unparse(discovered_id, uuid_str);
-            LOG_DEBUG << uuid_str;
-            continue;
-
-            free(answer_payload);
-
-            Json::Value client_info;
+            char *discovered_name = binn_map_str(answer_payload, DISCOVERY_MAPPING_NAME);
+            uint32_t discovered_command_port = binn_map_uint32(answer_payload, DISCOVERY_MAPPING_COMMAND_PORT);
+            uint8_t discovered_relay_count = binn_map_uint8(answer_payload, DISCOVERY_MAPPING_RELAY_COUNT);
 
             bool found_discovered_in_list = false;
 
@@ -143,13 +137,14 @@ void controllers::post_discover(const HttpRequestPtr &req, std::function<void(co
                 controller_dbo discovered_controller{};
                 strcpy(discovered_controller.ip, inet_ntoa(addr.sin_addr));
                 memcpy(discovered_controller.id, discovered_id, sizeof(uuid_t));
-                strcpy(discovered_controller.name, client_info["name"].asCString());
-                discovered_controller.relay_count = client_info["relay_count"].asInt();
-                discovered_controller.port = client_info["port"].asInt();
+                strcpy(discovered_controller.name, discovered_name);
+                discovered_controller.relay_count = discovered_relay_count;
+                discovered_controller.port = discovered_command_port;
                 discovered_controller.active = true;
 
                 discovered_controller.insert();
             }
+            free(answer_payload);
 
             discover_answer_buf[0] = config::discover_code_accept;
             send(client_fd, discover_answer_buf, sizeof(uint8_t), 0);
diff --git a/sql/migration_0.sql b/sql/migration_0.sql
index fc8c912..2d12d9d 100644
--- a/sql/migration_0.sql
+++ b/sql/migration_0.sql
@@ -12,6 +12,7 @@ create table controllers
     ip          VARCHAR(16),
     port        INTEGER,
     relay_count INTEGER,
+    tag         varchar(64),
     active      BOOLEAN     not null
 );
 
diff --git a/tavern_tests/test_schedules_protected.tavern.yaml b/tavern_tests/test_schedules_protected.tavern.yaml
index 4b9935d..f0ac8ed 100644
--- a/tavern_tests/test_schedules_protected.tavern.yaml
+++ b/tavern_tests/test_schedules_protected.tavern.yaml
@@ -43,3 +43,24 @@ stages:
           url: "http://localhost:5000/api/v1/schedules/on"
       response:
           status_code: 200
+          body:
+              name: "on"
+              periods:
+                  - start: "00:00"
+                    end: "23:59"
+    - name: overwrite protected on schedule
+      request:
+          method: PUT
+          url: "http://localhost:5000/api/v1/schedules/on"
+          json:
+              name: "turned_on"
+              periods:
+                - start: '00:10'
+                  end: '00:20'
+      response:
+          status_code: 200
+          body:
+              name: "{tavern.request_vars.json.name}"
+              periods:
+                  - start: "00:00"
+                    end: "23:59"