From ec9dd9172cb2b065f0757fc6faed066cb4ab233b Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Sat, 6 Feb 2021 16:35:59 +0100
Subject: [PATCH] T157 PUT/update working, POST/addNew problems with eureka

---
 .idea/workspace.xml                           |  3 +-
 .../klaus/controller/MockController.java      |  9 +++---
 src/main/resources/static/js/datatransfer.js  | 29 ++++++++++++++-----
 src/main/resources/templates/mock.html        |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a95a43f..2c539ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,6 +23,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -311,7 +312,7 @@
       <workItem from="1612259068808" duration="10440000" />
       <workItem from="1612279535476" duration="5692000" />
       <workItem from="1612442837870" duration="8318000" />
-      <workItem from="1612609113694" duration="7143000" />
+      <workItem from="1612609113694" duration="11380000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>
diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index 7b93cf3..0b66768 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -69,8 +69,9 @@ public class MockController {
         return messages;
     }
 
-    @PostMapping("/mock/json")
-    public ResponseEntity<String> addNewMessage(@RequestParam UUID clientUUID){
+    @PostMapping("/mock/json/{uuid}")
+    public ResponseEntity<String> addNewMessage(@PathVariable String uuidValue){
+        UUID clientUUID = UUID.fromString(uuidValue);
         List<MockedMessageDto> messages = klausService.getAllMockedResponses(clientUUID);
         MockedMessageDto nextMessage = buildDefaultMessage(clientUUID, findNextId(messages));
         return klausService.setMockedResponse(nextMessage);
@@ -106,8 +107,8 @@ public class MockController {
     public static int findNextId(List<MockedMessageDto> messages) {
         int highestId = 0;
         for (MockedMessageDto m : messages)
-            highestId = highestId < m.getMockedResponseId() ? highestId : m.getMockedResponseId();
-        return highestId;
+            highestId = highestId > m.getMockedResponseId() ? highestId : m.getMockedResponseId();
+        return ++highestId;
     }
 
 
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 11f6c46..1505ec7 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -56,15 +56,27 @@ function updateData(){
     $.ajax({
         url: 'http://localhost:8097/mock/json',
         type: 'PUT',
-        data: updatedJson,
-        success: function(data) {
-            console.log('PUT request received 200');
-        }
+        data: JSON.stringify(updatedJson, null, 2),
+        error: function(e) {
+            console.log(e);
+        },
+        dataType: "json",
+        contentType: "application/json"
+        // success: function(data) {
+        //     console.log('PUT request received 200');
+        // }
+    });
+    getData();
+}
+
+function addMessage(){
+    $.ajax({
+        url: 'http://localhost:8097/mock/json/'+clientUUID,
+        type: 'POST',
+        // success: function(data) {
+        //     console.log('PUT request received 200');
+        // }
     });
-    // $.put('http://localhost:8097/mock/json', function(data){
-    //
-    // });
-    // console.log('PUT request sent');
     getData();
 }
 
@@ -133,6 +145,7 @@ function generateHeaderTable(headers){
 }
 
 function fillMessageList(){
+    $("#listItems").html('');
     var innerHTML = '';
     for(let i=0; i<json.length; i++){
         innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType);
diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html
index da3a69a..05dbf5a 100644
--- a/src/main/resources/templates/mock.html
+++ b/src/main/resources/templates/mock.html
@@ -18,7 +18,7 @@
             <div id="selectMenuContent" style="display: none;">
                 <div id="selectMenuHead" class="articleHead">List</div>
                 <div id="listItems"></div>
-                <div id="iconPlus" class="menuItem"><i class="icon-plus"></i></div>
+                <div id="iconPlus" class="menuItem" onclick="addMessage()"><i class="icon-plus"></i></div>
             </div>
 
         </div>