From d74b9245e2b73f629b7386825933279b3a6ad8a0 Mon Sep 17 00:00:00 2001
From: mizanur-rahman-m4 <mizanur.rahman@metafour.com>
Date: Tue, 18 Jul 2023 12:27:58 +0600
Subject: [PATCH] Adding email field

---
 .../samples/petclinic/owner/Owner.java           | 16 ++++++++++++++++
 src/main/resources/db/postgres/schema.sql        |  3 ++-
 .../owners/createOrUpdateOwnerForm.html          |  3 +++
 .../resources/templates/owners/ownerDetails.html |  5 +++++
 .../resources/templates/owners/ownersList.html   |  2 ++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
index 78599d087..69f2cf833 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
@@ -58,6 +58,11 @@ public class Owner extends Person {
 	@NotEmpty
 	@Digits(fraction = 0, integer = 10)
 	private String telephone;
+	
+	
+	@Column(name = "email")
+	@NotEmpty
+	private String email;
 
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinColumn(name = "owner_id")
@@ -87,6 +92,17 @@ public class Owner extends Person {
 	public void setTelephone(String telephone) {
 		this.telephone = telephone;
 	}
+	
+	
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	
+	
 
 	public List<Pet> getPets() {
 		return this.pets;
diff --git a/src/main/resources/db/postgres/schema.sql b/src/main/resources/db/postgres/schema.sql
index 1bd582dc2..4cef997fb 100644
--- a/src/main/resources/db/postgres/schema.sql
+++ b/src/main/resources/db/postgres/schema.sql
@@ -29,7 +29,8 @@ CREATE TABLE IF NOT EXISTS owners (
   last_name  TEXT,
   address    TEXT,
   city       TEXT,
-  telephone  TEXT
+  telephone  TEXT,
+  Email  TEXT
 );
 CREATE INDEX ON owners (last_name);
 
diff --git a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
index 72c40fbc6..407dcab6e 100644
--- a/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
+++ b/src/main/resources/templates/owners/createOrUpdateOwnerForm.html
@@ -16,6 +16,9 @@
         th:replace="~{fragments/inputField :: input ('City', 'city', 'text')}" />
       <input
         th:replace="~{fragments/inputField :: input ('Telephone', 'telephone', 'text')}" />
+        
+        <input
+        th:replace="~{fragments/inputField :: input ('Email', 'email', 'text')}" />
     </div>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
diff --git a/src/main/resources/templates/owners/ownerDetails.html b/src/main/resources/templates/owners/ownerDetails.html
index 41f7d1680..a858db211 100644
--- a/src/main/resources/templates/owners/ownerDetails.html
+++ b/src/main/resources/templates/owners/ownerDetails.html
@@ -26,6 +26,11 @@
         <th>Telephone</th>
         <td th:text="*{telephone}"></td>
       </tr>
+      
+      <tr>
+        <th>Email</th>
+        <td th:text="*{email}"></td>
+      </tr>
     </table>
   
     <a th:href="@{__${owner.id}__/edit}" class="btn btn-primary">Edit
diff --git a/src/main/resources/templates/owners/ownersList.html b/src/main/resources/templates/owners/ownersList.html
index 9af325289..4e9ac5e30 100644
--- a/src/main/resources/templates/owners/ownersList.html
+++ b/src/main/resources/templates/owners/ownersList.html
@@ -13,6 +13,7 @@
     <th style="width: 200px;">Address</th>
     <th>City</th>
     <th style="width: 120px">Telephone</th>
+    <th style="width: 200px">Email</th>
     <th>Pets</th>
   </tr>
   </thead>
@@ -24,6 +25,7 @@
     <td th:text="${owner.address}"/>
     <td th:text="${owner.city}"/>
     <td th:text="${owner.telephone}"/>
+    <td th:text="${owner.email}"/>
     <td><span th:text="${#strings.listJoin(owner.pets, ', ')}"/></td>
   </tr>
   </tbody>