Changeset 77205be for src/main/java/edu/gjoko/schedlr/controllers

Timestamp:

12/26/23 18:50:43 (11 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

1413ee2

Parents:

950fa0d

Message:

Add entire code

Location:

src/main/java/edu/gjoko/schedlr/controllers

Files:

• AdministrationController.java (moved) (moved from src/main/java/edu/gjoko/schedlr/controllers/AdminController.java ) (1 diff, 1 prop)
• HomePageController.java (modified) (1 prop)
• LoginController.java (modified) (1 prop)
• RegisterController.java (modified) (1 prop)
• rest/AppointmentApi.java (added)
• rest/AppointmentController.java (deleted)
• rest/BusinessApi.java (moved) (moved from src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessController.java ) (3 diffs, 1 prop)
• rest/CustomerApi.java (added)
• rest/NomenclatureApi.java (moved) (moved from src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureController.java ) (1 diff, 1 prop)
• rest/ReviewApi.java (added)
• rest/UserApi.java (moved) (moved from src/main/java/edu/gjoko/schedlr/controllers/rest/UserController.java ) (2 diffs, 1 prop)

src/main/java/edu/gjoko/schedlr/controllers/AdministrationController.java

@@ -8 +8 @@
 
 import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
 
 @Controller
-public class AdminController {
+public class AdministrationController {
 
     @GetMapping(path = "/admin")
-    public String getAdminPageTemplate(Model model, HttpServletRequest request) {
+    public String getAdminPageTemplate(Model model) {
         return "admin";
     }
 
     @GetMapping(path = "/business_admin")
-    public String getBusinessAdminPageTemplate(Model model, HttpServletRequest request) {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        String currentPrincipalName = authentication.getName();
+    public String getBusinessAdminPageTemplate(Model model) {
+        return "business_admin";
+    }
 
-        return "business_admin";
+    @GetMapping(path = "/customer_admin")
+    public String getCustomerAdminPageTemplate(Model model) {
+        return "customer_admin";
     }
 

src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessApi.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.Business;
-import edu.gjoko.schedlr.entity.BusinessType;
 import edu.gjoko.schedlr.services.BusinessService;
 import lombok.AllArgsConstructor;
@@ -13 +12 @@
 @RequestMapping("api/business")
 @AllArgsConstructor
-public class BusinessController {
+public class BusinessApi {
 
-    final BusinessService businessService;
+    private final BusinessService businessService;
 
     @PostMapping
-    public void getBusinessTypes(@RequestBody Business business) {
+    public void saveBusiness(@RequestBody Business business) {
         businessService.saveBusiness(business);
     }
@@ -40 +39 @@
     @GetMapping(path = "/{businessTypeId}")
     public List<Business> getBusinessesByBusinessType(@PathVariable("businessTypeId") Long id) {
-        BusinessType businessType = new BusinessType();
-        businessType.setId(id);
-        return businessService.findByBusinessTypeAndActiveStatus(businessType);
+        return businessService.findByBusinessTypeAndActiveStatus(id);
     }
 }

src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureApi.java

@@ -13 +13 @@
 @RequestMapping("api/nomenclatures")
 @AllArgsConstructor
-public class NomenclatureController {
+public class NomenclatureApi {
 
     private final NomenclaturesService nomenclaturesService;

src/main/java/edu/gjoko/schedlr/controllers/rest/UserApi.java

@@ -1 +1 @@
 package edu.gjoko.schedlr.controllers.rest;
 
-import edu.gjoko.schedlr.entity.Business;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -8 +7 @@
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 @RestController
 @RequestMapping("api/user")
 @AllArgsConstructor
-public class UserController {
+public class UserApi {
 
     @GetMapping(path = "/me")