From 45e673df2b62518772dfca119428aa657f7914b7 Mon Sep 17 00:00:00 2001
From: Jyustin <supercatsd@gmail.com>
Date: Tue, 30 Jan 2024 17:36:12 -0800
Subject: [PATCH 1/2] added read to backend

---
 .../controllers/readcontroller.java           | 41 +++++++++++++++----
 src/main/resources/templates/layouts/nav.html |  2 +-
 src/main/resources/templates/person/read.html |  2 +-
 src/main/resources/templates/reading.html     |  8 +---
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java b/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
index 9c93334..34ec32f 100644
--- a/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
+++ b/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
@@ -7,21 +7,44 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.nighthawk.spring_portfolio.mvc.person.Person;
+import com.nighthawk.spring_portfolio.mvc.person.PersonDetailsService;
+import com.nighthawk.spring_portfolio.mvc.person.PersonJpaRepository;
 @Controller  // HTTP requests are handled as a controller, using the @Controller annotation
 public class readcontroller {
 
+    @Autowired
+    private PersonJpaRepository repository;
+
     // @GetMapping handles GET request for /greet, maps it to greeting() method
     @GetMapping("/reading")
+    @PreAuthorize("isAuthenticated()")
     // @RequestParam handles variables binding to frontend, defaults, etc
-    public String read(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) {
-
-        // model attributes are visible to Thymeleaf when HTML is "pre-processed"
-        model.addAttribute("person", name);
-
-        // load HTML VIEW (greet.html)
-        return "reading"; 
-
-    }
+    public String person(Model model) {
+        List<Person> persons = repository.findAllByOrderByNameAsc();
+        model.addAttribute("persons", persons);
+        // System.out.println(persons.toString()); for testing purposes
+        return "reading";
+        }
+    
 
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/layouts/nav.html b/src/main/resources/templates/layouts/nav.html
index bfa456c..2015d96 100644
--- a/src/main/resources/templates/layouts/nav.html
+++ b/src/main/resources/templates/layouts/nav.html
@@ -34,7 +34,7 @@
                 <div class="collapse navbar-collapse" id="login">
                     <ul class="navbar-nav">
                         <li class="nav-item active">
-                            <a class="nav-link" th:href="@{/mvc/person/read/}">read<span class="sr-only"></span></a>
+                            <a class="nav-link" th:href="@{/reading}">read<span class="sr-only"></span></a>
                         </li>
                     </ul>
                 </div>
diff --git a/src/main/resources/templates/person/read.html b/src/main/resources/templates/person/read.html
index 455b836..70d0349 100644
--- a/src/main/resources/templates/person/read.html
+++ b/src/main/resources/templates/person/read.html
@@ -35,7 +35,7 @@ <h2>Person Viewer</h2>
                     </tr>
                     </thead>
                     <tbody>
-                    <tr th:each="person : ${list}">
+                    <tr th:each="person : ${persons}">
                         <td th:text="${person.id}">Person ID</td>
                         <td th:text="${person.email}">Birth Date</td>
                         <td th:text="${person.name}">Name</td>
diff --git a/src/main/resources/templates/reading.html b/src/main/resources/templates/reading.html
index 455b836..fdc4d42 100644
--- a/src/main/resources/templates/reading.html
+++ b/src/main/resources/templates/reading.html
@@ -30,21 +30,15 @@ <h2>Person Viewer</h2>
                         <th>ID</th>
                         <th>User ID</th>
                         <th>Person</th>
-                        <th>Age</th>
-                        <th>Action</th>
                     </tr>
                     </thead>
                     <tbody>
-                    <tr th:each="person : ${list}">
+                    <tr th:each="person : ${persons}">
                         <td th:text="${person.id}">Person ID</td>
                         <td th:text="${person.email}">Birth Date</td>
                         <td th:text="${person.name}">Name</td>
-                        <td th:if="${person.getAge() != -1}" th:text="${person.getAge()}">Age</td>
-                        <td th:unless="${person.getAge() != -1}" th:text="Unknown">Unknown Age</td>
                         <td>
                             <!--- <a th:href="@{/mvc/notes/{id}(id = ${person.id})}">Notes</a> -->
-                            <a th:href="@{/mvc/person/update/{id}(id = ${person.id})}">Update</a>
-                            <a th:href="@{/mvc/person/delete/{id}(id = ${person.id})}">Delete</a>
                         </td>
                     </tr>
                     </tbody>

From 3f90bfc188b14ddd9a07cc038dbf2198c6d1526c Mon Sep 17 00:00:00 2001
From: Jyustin <supercatsd@gmail.com>
Date: Thu, 1 Feb 2024 09:12:31 -0800
Subject: [PATCH 2/2] delete method for backend

---
 .../spring_portfolio/SecurityConfig.java      |  5 +-
 .../controllers/readcontroller.java           | 18 +++-
 .../controllers/updatecontroller.java         | 51 +++++++++++
 src/main/resources/templates/reading.html     | 13 ++-
 src/main/resources/templates/updating.html    | 89 +++++++++++++++++++
 5 files changed, 169 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/nighthawk/spring_portfolio/controllers/updatecontroller.java
 create mode 100644 src/main/resources/templates/updating.html

diff --git a/src/main/java/com/nighthawk/spring_portfolio/SecurityConfig.java b/src/main/java/com/nighthawk/spring_portfolio/SecurityConfig.java
index 1ad2572..3abe2e7 100644
--- a/src/main/java/com/nighthawk/spring_portfolio/SecurityConfig.java
+++ b/src/main/java/com/nighthawk/spring_portfolio/SecurityConfig.java
@@ -69,8 +69,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 				// list the requests/endpoints need to be authenticated
 				.authorizeHttpRequests(auth -> auth
 					.requestMatchers("/authenticate").permitAll()
-					.requestMatchers("/mvc/person/update/**", "/mvc/person/delete/**").hasAnyAuthority("ROLE_PLAYER")
-					.requestMatchers("/api/person/delete/**").hasAnyAuthority("ROLE_PLAYER")
+					.requestMatchers("/reading").hasAnyAuthority("ROLE_ADMIN")
+					.requestMatchers("/mvc/person/update/**", "/mvc/person/delete/**").hasAnyAuthority("ROLE_ADMIN")
+					.requestMatchers("/api/person/delete/**").hasAnyAuthority("ROLE_ADMIN")
 					.requestMatchers("/**").permitAll()
 				)
 				// support cors
diff --git a/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java b/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
index 34ec32f..373ce9d 100644
--- a/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
+++ b/src/main/java/com/nighthawk/spring_portfolio/controllers/readcontroller.java
@@ -38,6 +38,8 @@ public class readcontroller {
     // @GetMapping handles GET request for /greet, maps it to greeting() method
     @GetMapping("/reading")
     @PreAuthorize("isAuthenticated()")
+
+    //@PreAuthorize("hasRole('ROLE_ADMIN')")
     // @RequestParam handles variables binding to frontend, defaults, etc
     public String person(Model model) {
         List<Person> persons = repository.findAllByOrderByNameAsc();
@@ -45,6 +47,20 @@ public String person(Model model) {
         // System.out.println(persons.toString()); for testing purposes
         return "reading";
         }
-    
+
+        @GetMapping("/delete/{id}")
+        public String deletePerson(@PathVariable Long id) {
+            if(id < 7)
+            { 
+            System.out.println("can't delete admins!");
+            return "redirect:/reading";
+         }
+         else {
+            repository.deleteById(id);
+            return "redirect:/reading";
+         }
+        }
+        
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/nighthawk/spring_portfolio/controllers/updatecontroller.java b/src/main/java/com/nighthawk/spring_portfolio/controllers/updatecontroller.java
new file mode 100644
index 0000000..c1d0360
--- /dev/null
+++ b/src/main/java/com/nighthawk/spring_portfolio/controllers/updatecontroller.java
@@ -0,0 +1,51 @@
+package com.nighthawk.spring_portfolio.controllers;
+/* MVC code that shows defining a simple Model, calling View, and this file serving as Controller
+ * Web Content with Spring MVCSpring Example: https://spring.io/guides/gs/serving-web-con
+ */
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.nighthawk.spring_portfolio.mvc.person.Person;
+import com.nighthawk.spring_portfolio.mvc.person.PersonDetailsService;
+import com.nighthawk.spring_portfolio.mvc.person.PersonJpaRepository;
+@Controller  // HTTP requests are handled as a controller, using the @Controller annotation
+public class updatecontroller {
+
+    @Autowired
+    private PersonJpaRepository repository;
+
+    // @GetMapping handles GET request for /greet, maps it to greeting() method
+    @GetMapping("/updating")
+    @PreAuthorize("isAuthenticated()")
+    //@PreAuthorize("hasRole('ROLE_ADMIN')")
+    // @RequestParam handles variables binding to frontend, defaults, etc
+    public String person(Model model) {
+        List<Person> persons = repository.findAllByOrderByNameAsc();
+        model.addAttribute("persons", persons);
+        // System.out.println(persons.toString()); for testing purposes
+        return "reading";
+        }
+    
+
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/reading.html b/src/main/resources/templates/reading.html
index fdc4d42..104be4d 100644
--- a/src/main/resources/templates/reading.html
+++ b/src/main/resources/templates/reading.html
@@ -21,23 +21,27 @@
 
         <div class="container py-4 text-light bg-success">
 
-            <h2>Person Viewer</h2>
-            <a th:href="@{/mvc/person/create/}">Create Person</a>
+            <h2>Person Viewer + console (cannot delete admins)</h2>
+            <a th:href="@{/creating}">Create Person</a>
+            <a th:href="@{/updating}">Update Person</a>
+            <a th:href="@{/deleting}">Delete Person</a>
             <div class="row align-items-md-stretch">
                 <table class="table">
                     <thead>
                     <tr>
                         <th>ID</th>
-                        <th>User ID</th>
+                        <th>Email</th>
                         <th>Person</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr th:each="person : ${persons}">
                         <td th:text="${person.id}">Person ID</td>
-                        <td th:text="${person.email}">Birth Date</td>
+                        <td th:text="${person.email}">Birth Email</td>
                         <td th:text="${person.name}">Name</td>
                         <td>
+                            <a th:href="@{/delete/{id}(id=${person.id})}">Delete</a>
+                            <a th:href="@{/update/{id}(id=${person.id})}">updating</a>
                             <!--- <a th:href="@{/mvc/notes/{id}(id = ${person.id})}">Notes</a> -->
                         </td>
                     </tr>
@@ -51,4 +55,5 @@ <h2>Person Viewer</h2>
 </th:block>
 </body>
 
+
 </html>
diff --git a/src/main/resources/templates/updating.html b/src/main/resources/templates/updating.html
new file mode 100644
index 0000000..9ab4083
--- /dev/null
+++ b/src/main/resources/templates/updating.html
@@ -0,0 +1,89 @@
+<!-- This page is illustrative and contains ideas about HTML formatting -->
+<!DOCTYPE HTML>
+<!-- Signals to the Layout Dialect which layout should be used to decorate this View -->
+<html xmlns:layout="http://www.w3.org/1999/xhtml" xmlns:th="http://www.w3.org/1999/xhtml"
+      layout:decorate="~{layouts/base}" lang="en">
+
+<head>
+    <title>Person Update</title>
+</head>
+
+<body>
+<th:block layout:fragment="body" th:remove="tag">
+    <!-- Page specific body additions -->
+    <div class="container">
+
+        <div class="row justify-content-md-center">
+            <h2>Welcome, Update The Persons Details</h2>
+        </div>
+
+        <div class="row justify-content-md-center">
+            <div class="col8">
+                <div class="jumbotron">
+                    <!-- ThymeLeaf allows person abject of the Class Person to be acted upon by the form
+                         This is known as a “bean-backed form” or "form-backing bean".
+                            th:object - the backend form object (bean object)
+                         There are two fields in the Person bean,
+                            th:field="*{name}"
+                            th:field="*{age}".
+                         Each field has supporting line for to show errors in validation
+                            th:errors - form input errors added when validation errors occur
+                         Reference for CRUD
+                            https://www.baeldung.com/spring-boot-crud-thymeleaf
+                         Get started with dialects in 5 minutes
+                            https://www.thymeleaf.org/doc/articles/standarddialect5minutes.html
+                         Reference Bootstrap Form
+                            https://getbootstrap.com/docs/4.0/components/forms/#readonly-plain-text
+                     -->
+                    <!--Read Only Section -->
+                    <h3 th:text="'ID: ' + ${person.id}"></h3>
+                    <table>
+                        <tr th:if="${person.roles.empty}">
+                            <td colspan="2"> No Roles </td>
+                        </tr>
+                        <tr th:each="role : ${person.roles}">
+                            <td><span th:text="${role.name}"> Name </span></td>
+                        </tr>
+                    </table>
+                    <!--Update Form -->
+                    <form class="form-inline" action="#" th:action="@{/mvc/person/update}" th:object="${person}" method="POST">
+                        <!-- Hidden Section, stuff we need to reference to preserve on Update -->
+                        <div class="form-group mb-2 mr-sm-2">
+                            <label for="id" hidden></label>
+                            <input type="text" th:field="*{id}" id="id" hidden class="form-control-plaintext" >
+                            <label for="roles" hidden></label>
+                            <input type="text" th:field="*{roles}" id="roles" hidden class="form-control-plaintext" >
+                        </div>
+                        <!--Update Section -->
+                        <div class="form-group mb-2 mr-sm-2">
+                            <label for="email">Email:</label>
+                            <input type="email" th:field="*{email}" id="email" >
+                            <small th:if="${#fields.hasErrors('email')}" th:errors="*{email}">Email Error</small>
+                        </div>
+                        <div sec:authorize="hasRole('ADMIN')" class="form-group mb-2 mr-sm-2">
+                            <label for="password">Password:</label>
+                            <input type="password" th:field="*{password}" id="password">
+                            <small th:if="${#fields.hasErrors('password')}" th:errors="*{password}">Password Error</small>
+                        </div>
+                        <div class="form-group mb-2 mr-sm-2">
+                            <label for="name">Name:</label>
+                            <input type="text" th:field="*{name}" id="name">
+                            <small th:if="${#fields.hasErrors('name')}" th:errors="*{name}">Name Error</small>
+                        </div>
+                        <div class="form-group mb-2 mr-sm-2">
+                            <label for="dob">Birth Date:</label>
+                            <input type="date" th:field="*{dob}" id="dob">
+                            <small th:if="${#fields.hasErrors('dob')}" th:errors="*{dob}">Birth Date Error</small>
+                        </div>
+                        <button type="submit" class="btn btn-primary">Save</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</th:block>
+</body>
+
+
+</html>