From 11230f198bd20187b3b7ad4fe780ab96289d992f Mon Sep 17 00:00:00 2001
From: c2038058 <gillj8@cardiff.ac.uk>
Date: Fri, 10 Dec 2021 12:45:48 +0000
Subject: [PATCH] UserFavouriteTagSaver fully logged

---
 .../services/UserFavouriteTagSaver.java       | 23 +++++++++++++++----
 .../SaveUserFavouriteTagController.java       |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/clientproject/services/UserFavouriteTagSaver.java b/src/main/java/com/example/clientproject/services/UserFavouriteTagSaver.java
index 80e5ea3..dd6429d 100644
--- a/src/main/java/com/example/clientproject/services/UserFavouriteTagSaver.java
+++ b/src/main/java/com/example/clientproject/services/UserFavouriteTagSaver.java
@@ -1,26 +1,41 @@
 package com.example.clientproject.services;
 
+import com.example.clientproject.service.LoggingService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+import javax.servlet.http.HttpSession;
+
 @Service
 public class UserFavouriteTagSaver {
 
-    @Autowired
     JdbcTemplate jdbc;
+    LoggingService loggingService;
+
+    public UserFavouriteTagSaver(JdbcTemplate jdbc, LoggingService loggingService) {
+        this.jdbc = jdbc;
+        this.loggingService = loggingService;
+    }
 
-    public void saveUserFavTag(int UserID, String TagID){
+    public void saveUserFavTag(int userID, String tagID, HttpSession session){
 
         String disableFKeyChecks = "SET FOREIGN_KEY_CHECKS=0;";
         String enableFKeyChecks = "SET FOREIGN_KEY_CHECKS=1;";
         jdbc.execute(disableFKeyChecks);
 
-        String query = "INSERT INTO user_favourite_tags (User_Id, Tag_Id) VALUES ("+ UserID + ","+TagID + ")";
+        String query = "INSERT INTO mydb.user_favourite_tags (User_Id, Tag_Id) VALUES ("+ userID + ","+tagID + ")";
         jdbc.execute(query);
         jdbc.execute(enableFKeyChecks);
+        // Log the changes
+        loggingService.logEvent(
+                "UserFavouriteTag Inserted",
+                session,
+                "UserFavouriteTag Inserted with User Id: " + userID +
+                        "and Tag Id: " + tagID +
+                        " in UserFavouriteTagSaver.saveUserFavTag()"
+        );
     }
-
 }
 
 
diff --git a/src/main/java/com/example/clientproject/web/controllers/SaveUserFavouriteTagController.java b/src/main/java/com/example/clientproject/web/controllers/SaveUserFavouriteTagController.java
index 54c2554..56aa5d2 100644
--- a/src/main/java/com/example/clientproject/web/controllers/SaveUserFavouriteTagController.java
+++ b/src/main/java/com/example/clientproject/web/controllers/SaveUserFavouriteTagController.java
@@ -38,7 +38,7 @@ public class SaveUserFavouriteTagController {
             //System.out.println(TagID_List.size());
             //System.out.println(TagID);
             int UserID = jwtUtils.getLoggedInUserId(session).get();
-            FavTagService.saveUserFavTag(UserID,TagID);
+            FavTagService.saveUserFavTag(UserID,TagID, session);
         }
         return("redirect:/");
     }
-- 
GitLab