CodersCampus · JP-CC-Projects · May 2, 2024
diff --git a/docs/NEW_MODULE_TEMPLATE.md b/docs/NEW_MODULE_TEMPLATE.md
@@ -67,11 +67,14 @@ import java.util.stream.Collectors;
 @Service
 public class CheckinService {
 
-    @Autowired
-    private CheckinRepository checkinRepo;
+    private final CheckinRepository checkinRepo;
+    private final StudentRepository studentRepo;
 
     @Autowired
-    private StudentRepository studentRepo;
+    public CheckinService(CheckinRepository checkinRepo, StudentRepository studentRepo) {
+        this.checkinRepo = checkinRepo;
+        this.studentRepo = studentRepo;
+    }
 
     public Checkin save(Checkin checkin) {
         if (checkin.getDate() == null) {
@@ -130,8 +133,12 @@ import java.util.List;
 @RequestMapping("/checkin")
 public class CheckinController {
 
+    private final CheckinService checkinService;
+
     @Autowired
-    private CheckinService checkinService;
+    public CheckinController(CheckinService checkinService) {
+        this.checkinService = checkinService;
+    }
 
     @GetMapping("/")
     public String home(ModelMap model) {
@@ -198,7 +205,7 @@ public class CheckinController {
 
 - Use `checkin/read.html` as a resource, not a template
 
-```HTML 
+```HTML
 <!DOCTYPE html>
 <html xmlns:th="http://thymeleaf.org">
 <div th:replace="~{fragments/head :: head(${pageTitle})}"></div>
@@ -242,7 +249,7 @@ public class CheckinController {
                         <td><span th:text="${checkin.codingType}"></span></td>
                         <td><span th:text="${checkin.issueNumber}"></span></td>
                         <td><a th:href="@{/checkin/update/{checkinId}(checkinId=${checkin.id})}">
-									<span><svg xmlns="http://www.w3.org/2000/svg" width="16"
+         <span><svg xmlns="http://www.w3.org/2000/svg" width="16"
                                                height="16" fill="currentColor" class="bi bi-view-list"
                                                viewBox="0 0 16 16">
   <path
@@ -469,4 +476,4 @@ public class CheckinController {
 
 
 
-```
+```
diff --git a/src/main/java/com/coderscampus/cp/service/CheckinService.java b/src/main/java/com/coderscampus/cp/service/CheckinService.java
@@ -15,16 +15,16 @@
 @Service
 public class CheckinService {
 
-    @Autowired
-    private CheckinRepository checkinRepo;
+    private final CheckinRepository checkinRepo;
+    private final StudentRepository studentRepo;
 
     @Autowired
-    private StudentRepository studentRepo;
+    public CheckinService(CheckinRepository checkinRepo, StudentRepository studentRepo) {
+        this.checkinRepo = checkinRepo;
+        this.studentRepo = studentRepo;
+    }
 
     public Checkin saveByUid(Checkin checkin, String uid) {
-//        if (checkinRepo.findByUid(uid) == null) {
-//            checkin.setDate(Instant.now());
-//        }
         setDateIfNull(checkin);
         setStudentAndUid(checkin, uid);
         return checkinRepo.save(checkin);
@@ -45,7 +45,8 @@ private void setDateIfNull(Checkin checkin) {
     }
 
     public List<Checkin> findAll() {
-        return checkinRepo.findAll().stream().sorted(Comparator.comparing(Checkin::getDate).reversed()).collect(Collectors.toList());
+        return checkinRepo.findAll().stream().sorted(Comparator.comparing(Checkin::getDate).reversed())
+                .collect(Collectors.toList());
     }
 
     public Checkin findById(Long id) {
@@ -57,7 +58,7 @@ public void delete(Checkin checkin) {
     }
 
     public List<Checkin> findByUid(String uid) {
-        return checkinRepo.findByUid(uid).stream().sorted(Comparator.comparing(Checkin::getDate).reversed()).collect(Collectors.toList());
+        return checkinRepo.findByUid(uid).stream().sorted(Comparator.comparing(Checkin::getDate).reversed())
+                .collect(Collectors.toList());
     }
 }
-
diff --git a/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java b/src/main/java/com/coderscampus/cp/service/CodingCategoryService.java
@@ -10,8 +10,12 @@
 @Service
 public class CodingCategoryService {
 
+    private final CodingCategoryRepository codingCategoryRepo;
+
     @Autowired
-    private CodingCategoryRepository codingCategoryRepo;
+    public CodingCategoryService(CodingCategoryRepository codingCategoryRepo) {
+        this.codingCategoryRepo = codingCategoryRepo;
+    }
 
     public CodingCategory save(CodingCategory codingCategory) {
         return codingCategoryRepo.save(codingCategory);

diff --git a/src/main/java/com/coderscampus/cp/service/FoobarService.java b/src/main/java/com/coderscampus/cp/service/FoobarService.java
@@ -12,11 +12,14 @@
 @Service
 public class FoobarService {
 
-    @Autowired
-    private FoobarRepository foobarRepo;
+    private final FoobarRepository foobarRepo;
+    private final StudentRepository studentRepo;
 
     @Autowired
-    private StudentRepository studentRepo;
+    public FoobarService(FoobarRepository foobarRepo, StudentRepository studentRepo) {
+        this.foobarRepo = foobarRepo;
+        this.studentRepo = studentRepo;
+    }
 
     public Foobar save(Foobar foobar) {
         System.out.println("FoobarService.java save method| Foobar is: " + foobar);

diff --git a/src/main/java/com/coderscampus/cp/service/SpringProjectService.java b/src/main/java/com/coderscampus/cp/service/SpringProjectService.java
@@ -11,8 +11,12 @@
 @Service
 public class SpringProjectService {
 
+    private final SpringProjectRepository springRepo;
+
     @Autowired
-    SpringProjectRepository springRepo;
+    public SpringProjectService(SpringProjectRepository springRepo) {
+        this.springRepo = springRepo;
+    }
 
     public List<SpringProject> findAll() {
         return springRepo.findAll();
@@ -22,4 +26,3 @@ public Optional<SpringProject> findById(Long springProjectId) {
         return springRepo.findById(springProjectId);
     }
 }
-
diff --git a/src/main/java/com/coderscampus/cp/service/StudentService.java b/src/main/java/com/coderscampus/cp/service/StudentService.java
@@ -14,8 +14,12 @@
 @Service
 public class StudentService {
 
+    private final StudentRepository studentRepo;
+
     @Autowired
-    private StudentRepository studentRepo;
+    public StudentService(StudentRepository studentRepo) {
+        this.studentRepo = studentRepo;
+    }
 
     public void save(Student student) {
         if (isValidNewStudent(student)) {
@@ -25,6 +29,7 @@ public void save(Student student) {
             studentRepo.save(student);
         }
     }
+
     @Transactional
     public StudentDTO saveByUid(Student student, String uid) {
         Student foundStudent = studentRepo.findByUid(uid);
@@ -37,7 +42,6 @@ public StudentDTO saveByUid(Student student, String uid) {
         return returnStudent;
     }
 
-
     boolean doesStudentExistInRepository(Student student) {
         Optional<Student> existingStudent = studentRepo.findById(student.getId());
 

diff --git a/src/main/java/com/coderscampus/cp/service/UserHistoryService.java b/src/main/java/com/coderscampus/cp/service/UserHistoryService.java
@@ -13,8 +13,12 @@
 @Service
 public class UserHistoryService {
 
+    private final UserHistoryRepository userHistoryRepo;
+
     @Autowired
-    private UserHistoryRepository userHistoryRepo;
+    public UserHistoryService(UserHistoryRepository userHistoryRepo) {
+        this.userHistoryRepo = userHistoryRepo;
+    }
 
     public UserHistory save(UserHistory userHistory) {
         if (userHistory.getDate() == null) {
@@ -24,7 +28,8 @@ public UserHistory save(UserHistory userHistory) {
     }
 
     public List<UserHistory> findAll() {
-        return userHistoryRepo.findAll().stream().sorted(Comparator.comparing(UserHistory::getDate).reversed()).collect(Collectors.toList());
+        return userHistoryRepo.findAll().stream().sorted(Comparator.comparing(UserHistory::getDate).reversed())
+                .collect(Collectors.toList());
     }
 
     public UserHistory findById(Long id) {

diff --git a/src/main/java/com/coderscampus/cp/web/ActivityLogController.java b/src/main/java/com/coderscampus/cp/web/ActivityLogController.java
@@ -11,8 +11,13 @@
 @Controller
 @RequestMapping("/activityLog")
 public class ActivityLogController {
+
+    private final ActivityLogService activityLogService;
+
     @Autowired
-    private ActivityLogService activityLogService;
+    public ActivityLogController(ActivityLogService activityLogService) {
+        this.activityLogService = activityLogService;
+    }
 
     @PostMapping("/create")
     public String postCreate(ActivityLog activityLog, @RequestParam("uid") String uid) {

diff --git a/src/main/java/com/coderscampus/cp/web/CheckinController.java b/src/main/java/com/coderscampus/cp/web/CheckinController.java
@@ -4,6 +4,8 @@
 import com.coderscampus.cp.domain.Checkin;
 import com.coderscampus.cp.service.CheckinService;
 import jakarta.servlet.http.HttpSession;
+
+import org.hibernate.annotations.DialectOverride.Check;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -15,8 +17,12 @@
 @RequestMapping("/checkin")
 public class CheckinController {
 
+    private final CheckinService checkinService;
+
     @Autowired
-    private CheckinService checkinService;
+    public CheckinController(CheckinService checkinService) {
+        this.checkinService = checkinService;
+    }
 
     @GetMapping("/")
     public String home(ModelMap model, HttpSession httpSession) {
@@ -55,7 +61,8 @@ public String fetch(ModelMap model, @PathVariable Long id) {
     }
 
     @PostMapping("/update/{id}")
-    public String update(@ModelAttribute("checkin") Checkin checkin, @ModelAttribute("activityLog") ActivityLog activityLog) {
+    public String update(@ModelAttribute("checkin") Checkin checkin,
+            @ModelAttribute("activityLog") ActivityLog activityLog) {
         checkin.getActivityLog().add(activityLog);
         return "redirect:/checkin/";
     }

diff --git a/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java b/src/main/java/com/coderscampus/cp/web/CodingCategoryController.java
@@ -16,8 +16,12 @@
 @RequestMapping("coding-category")
 public class CodingCategoryController {
 
+    private final CodingCategoryService codingCategoryService;
+
     @Autowired
-    private CodingCategoryService codingCategoryService;
+    public CodingCategoryController(CodingCategoryService codingCategoryService) {
+        this.codingCategoryService = codingCategoryService;
+    }
 
     @GetMapping("/")
     public String home(ModelMap model) {

diff --git a/src/main/java/com/coderscampus/cp/web/FoobarController.java b/src/main/java/com/coderscampus/cp/web/FoobarController.java
@@ -13,8 +13,12 @@
 @RequestMapping("/foobar")
 public class FoobarController {
 
+    private final FoobarService foobarService;
+
     @Autowired
-    private FoobarService foobarService;
+    public FoobarController(FoobarService foobarService) {
+        this.foobarService = foobarService;
+    }
 
     @GetMapping("/")
     public String home(ModelMap model) {

diff --git a/src/main/java/com/coderscampus/cp/web/UserHistoryController.java b/src/main/java/com/coderscampus/cp/web/UserHistoryController.java
@@ -16,8 +16,12 @@
 @RequestMapping("/user-history")
 public class UserHistoryController {
 
+    private final UserHistoryService userHistoryService;
+
     @Autowired
-    private UserHistoryService userHistoryService;
+    public UserHistoryController(UserHistoryService userHistoryService) {
+        this.userHistoryService = userHistoryService;
+    }
 
     @GetMapping("/")
     public String home(ModelMap model) {
@@ -43,7 +47,6 @@ public String create(UserHistory userHistory) {
         return "redirect:/user-history/";
     }
 
-
     @GetMapping("/update/{id}")
     public String fetch(ModelMap model, @PathVariable Long id) {
         UserHistory userHistory = userHistoryService.findById(id);