Changeset 7926d68

Timestamp:

02/10/23 01:52:11 (21 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

ef84238

Parents:

73f0dbc

Message:

Profiles for user and worker

Location:

src/main

Files:

• java/com/example/moviezone/config/WebSecurityConfig.java (modified) (1 diff)
• java/com/example/moviezone/repository/WorkerRepository.java (modified) (1 diff)
• java/com/example/moviezone/service/Impl/WorkerServiceImpl.java (modified) (1 diff)
• java/com/example/moviezone/service/WorkerService.java (modified) (1 diff)
• java/com/example/moviezone/web/HomeController.java (modified) (1 diff)
• resources/templates/fragments/header.html (modified) (1 diff)
• resources/templates/profileUser.html (added)
• resources/templates/profileWorker.html (added)

src/main/java/com/example/moviezone/config/WebSecurityConfig.java

@@ -33 +33 @@
                 .authorizeRequests()
                 .antMatchers("/","/films","/home/projections","/home/events","/home/getProjections/**","/home/films","/home/getFilm/**","/getFilm/**","/home/getEvent/**","/getEvent/**","/login","/events","/projections" ,"/home", "/assets/**", "/register", "/api/**").permitAll()
-                .antMatchers("/home/getSeats/**","/myTickets","/home/addRating/**","/addRating/**","/getProjection/**","/home/makeReservation").hasRole("USER")
+                .antMatchers("/home/getSeats/**","/myTickets","/home/addRating/**","/addRating/**","/getProjection/**","/home/makeReservation","/profileUser").hasRole("USER")
                 .antMatchers("/**").hasRole("ADMIN")
                 .anyRequest()

src/main/java/com/example/moviezone/repository/WorkerRepository.java

@@ -7 +7 @@
 @Repository
 public interface WorkerRepository extends JpaRepository<Worker,Integer> {
+    Worker getByUsername(String username);
 }

src/main/java/com/example/moviezone/service/Impl/WorkerServiceImpl.java

@@ -20 +20 @@
         return workerRepository.findAll();
     }
+
+    @Override
+    public Worker getWorkerByUsername(String username) {
+        return workerRepository.getByUsername(username);
+    }
 }

src/main/java/com/example/moviezone/service/WorkerService.java

@@ -7 +7 @@
 public interface WorkerService {
     List<Worker> findAllWorkers();
+    Worker getWorkerByUsername(String username);
 }

src/main/java/com/example/moviezone/web/HomeController.java

@@ -403 +403 @@
         return "redirect:/home/getFilm/"+id;
     }
-
+    @GetMapping("/profileWorker")
+    public String getWorkerProfile(Model model,HttpServletRequest request)
+    {
+        Worker worker=workerService.getWorkerByUsername(request.getRemoteUser());
+        model.addAttribute("worker",worker);
+        model.addAttribute("bodyContent", "profileWorker");
+        return "master-template";
+    }
+    @GetMapping("/profileUser")
+    public String getUserProfile(Model model,HttpServletRequest request)
+    {
+        Customer customer=customerService.findByUsername(request.getRemoteUser());
+        System.out.println(customer.getFirst_name());
+        model.addAttribute("customer",customer);
+        model.addAttribute("bodyContent", "profileUser");
+        return "master-template";
+    }
 }

src/main/resources/templates/fragments/header.html

@@ -83 +83 @@
     </ul>
     <ul class="menu-right">
-        <th:block th:if="${#request.getRemoteUser() != null}">
+        <th:block sec:authorize="hasAuthority('ROLE_ADMIN')" th:if="${#request.getRemoteUser() != null}">
             <li class="reg">
-                <a href="/">
+                <a href="/profileWorker">
+                    <th:block th:text="${#request.getRemoteUser()}"></th:block>
+                </a>
+            </li>
+        </th:block>
+        <th:block sec:authorize="hasAuthority('ROLE_USER')" th:if="${#request.getRemoteUser() != null}">
+            <li class="reg">
+                <a href="/profileUser">
                     <th:block th:text="${#request.getRemoteUser()}"></th:block>
                 </a>