From 720eed2a738a3311ed57df5a3c667755872a0de9 Mon Sep 17 00:00:00 2001
From: widlam <mikolaj.widla@gmail.com>
Date: Mon, 15 May 2023 13:35:00 +0200
Subject: [PATCH] started to making view of history on frontend

---
 .../java/com/r11/tools/KlausApplication.java  |  2 --
 .../tools/mappers/RequestHistoryMapper.java   |  5 ++++
 .../scripts/tools/mock/historyloader.js       | 26 ++++++++++++++++++-
 Frontend/tools/mock.html                      |  4 ++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/KlausApplication.java b/Backend/mocked-services/src/main/java/com/r11/tools/KlausApplication.java
index 916928a..47cb9e9 100644
--- a/Backend/mocked-services/src/main/java/com/r11/tools/KlausApplication.java
+++ b/Backend/mocked-services/src/main/java/com/r11/tools/KlausApplication.java
@@ -1,9 +1,7 @@
 package com.r11.tools;
 
-import com.r11.tools.configuration.RetentionConfigurationProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 /**
  * It's generic Spring context starter. Move along...
diff --git a/Backend/mocked-services/src/main/java/com/r11/tools/mappers/RequestHistoryMapper.java b/Backend/mocked-services/src/main/java/com/r11/tools/mappers/RequestHistoryMapper.java
index 5bef839..62456bc 100644
--- a/Backend/mocked-services/src/main/java/com/r11/tools/mappers/RequestHistoryMapper.java
+++ b/Backend/mocked-services/src/main/java/com/r11/tools/mappers/RequestHistoryMapper.java
@@ -3,10 +3,15 @@ package com.r11.tools.mappers;
 import com.r11.tools.model.RequestHistory;
 import com.r11.tools.model.RequestHistoryDTO;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 @Mapper
 public interface RequestHistoryMapper {
+
+    @Mapping(target = "id", expression = "java(null)")
+    @Mapping(target = "clientUUID", expression = "java(requestHistoryDTO.getClientUUID().toString())")
     RequestHistory requestHistoryDTOToRequestHistory(RequestHistoryDTO requestHistoryDTO);
+    @Mapping(target = "clientUUID", expression = "java(java.util.UUID.fromString(requestHistory.getClientUUID()))")
     RequestHistoryDTO requestHistoryToRequestHistoryDTO(RequestHistory requestHistory);
 
 }
diff --git a/Frontend/assets/scripts/tools/mock/historyloader.js b/Frontend/assets/scripts/tools/mock/historyloader.js
index 8c1912a..4031f81 100644
--- a/Frontend/assets/scripts/tools/mock/historyloader.js
+++ b/Frontend/assets/scripts/tools/mock/historyloader.js
@@ -29,6 +29,7 @@ function loadHistory(dateFrom, dateTo){
         contentType: "application/json"
     }).done(function(data){
         historyJson = data;
+        console.log(data);
         displayHistory();
     });
 }
@@ -36,6 +37,7 @@ function loadHistory(dateFrom, dateTo){
 function getLast24hHistoryData(){
     $.getJSON(host + '/api/event/' + clientUUID + '/' + lastId, function(data){
         historyJson = data;
+        console.log(data);
         displayHistory();
     });
 }
@@ -47,12 +49,34 @@ function historyToHtml(){
         let style = i%2==0 ? ' class="even"' : '';
         innerHTML += '<tr' + style + '>' +
             '<td>' + historyJson[i].dateTimeStamp + '</td>' +
-            '<td>' + historyJson[i].interfaceName + '</td>' +
+            '<td>' + historyJson[i].httpMethod + '</td>' +
+            '<td>' + historyJson[i].requestBody + '</td>' +
+            '<td>' +
+            '<th> Header Name </th>' +
+            '<th> Header Value </th>' +
+            historyJson[i].headers.forEach(
+
+            )
+            + '</td>'
+            '<td>' + parseHeaders(historyJson[i].headers) + '</td>' +
         '</tr>';
     }
     return innerHTML;
 }
 
+function parseHeaders(json){
+    console.log(json);
+    parsedJson = "";
+    Object.keys( json ).forEach(
+        (key) => {
+            console.log(key);
+            console.log(json.key)
+            parsedJson += key + " : " + json[key] + "\n";
+        }
+    )
+    return parsedJson;
+}
+
 function displayHistory(){
     $('#historyTable tbody').html(historyToHtml());
 }
diff --git a/Frontend/tools/mock.html b/Frontend/tools/mock.html
index 6039601..07ef039 100644
--- a/Frontend/tools/mock.html
+++ b/Frontend/tools/mock.html
@@ -149,7 +149,9 @@
                                             <thead>
                                                 <tr class="bottom-border">
                                                     <th>Timestamp</th>
-                                                    <th>Type</th>
+                                                    <th>Method</th>
+                                                    <th>Request Body</th>
+                                                    <th>Request Headers</th>
                                                 </tr>
                                             </thead>
                                             <tbody>