Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-21 23:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- add fish and turtles

Browse source 
- add ZIP code for Owners
This commit is contained in:
MoechtegernMoe 2023-11-23 12:02:39 +01:00
parent 923e2b7aa3
commit 187c4a367c
10 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/springframework/samples/petclinic/owner/Owner.java
View file

@ -54,6 +54,11 @@ public class Owner extends Person {
@NotBlank
private String city;
@Column(name = "zip_code")
@NotBlank
@Digits(fraction = 0, integer = 10)
private String zipCode;
@Column(name = "telephone")
@NotBlank
@Digits(fraction = 0, integer = 10)
@ -80,6 +85,10 @@ public class Owner extends Person {
this.city = city;
}
public String getZipCode() { return this.zipCode; }
public void setZipCode(String zipCode) { this.zipCode = zipCode; }
public String getTelephone() {
return this.telephone;
}
@ -150,6 +159,7 @@ public class Owner extends Person {
.append("firstName", this.getFirstName())
.append("address", this.address)
.append("city", this.city)
.append("zipCode", this.getZipCode())
.append("telephone", this.telephone)
.toString();
}

2
src/main/resources/application.properties
View file

@ -23,3 +23,5 @@ logging.level.org.springframework=INFO
# Maximum time static resources should be cached
spring.web.resources.cache.cachecontrol.max-age=12h
spring.h2.console.enabled=true

22
src/main/resources/db/h2/data.sql
View file

@ -21,17 +21,19 @@ INSERT INTO types VALUES (default, 'lizard');
INSERT INTO types VALUES (default, 'snake');
INSERT INTO types VALUES (default, 'bird');
INSERT INTO types VALUES (default, 'hamster');
INSERT INTO types VALUES (default, 'turtle');
INSERT INTO types VALUES (default, 'fish');
INSERT INTO owners VALUES (default, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
INSERT INTO owners VALUES (default, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
INSERT INTO owners VALUES (default, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
INSERT INTO owners VALUES (default, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
INSERT INTO owners VALUES (default, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
INSERT INTO owners VALUES (default, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
INSERT INTO owners VALUES (default, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
INSERT INTO owners VALUES (default, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
INSERT INTO owners VALUES (default, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
INSERT INTO owners VALUES (default, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
INSERT INTO owners VALUES (default, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '54923', '6085551023');
INSERT INTO owners VALUES (default, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '53590', '6085551749');
INSERT INTO owners VALUES (default, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '53558', '6085558763');
INSERT INTO owners VALUES (default, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '30297', '6085553198');
INSERT INTO owners VALUES (default, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '54923', '6085552765');
INSERT INTO owners VALUES (default, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '53716', '6085552654');
INSERT INTO owners VALUES (default, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '53716', '6085555387');
INSERT INTO owners VALUES (default, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '54923', '6085557683');
INSERT INTO owners VALUES (default, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '54923', '6085559435');
INSERT INTO owners VALUES (default, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '53597', '6085555487');
INSERT INTO pets VALUES (default, 'Leo', '2010-09-07', 1, 1);
INSERT INTO pets VALUES (default, 'Basil', '2012-08-06', 6, 2);

1
src/main/resources/db/h2/schema.sql
View file

@ -39,6 +39,7 @@ CREATE TABLE owners (
last_name VARCHAR_IGNORECASE(30),
address VARCHAR(255),
city VARCHAR(80),
zip_code VARCHAR(10),
telephone VARCHAR(20)
);
CREATE INDEX owners_last_name ON owners (last_name);

2
src/main/resources/db/hsqldb/data.sql
View file

@ -21,6 +21,8 @@ INSERT INTO types VALUES (3, 'lizard');
INSERT INTO types VALUES (4, 'snake');
INSERT INTO types VALUES (5, 'bird');
INSERT INTO types VALUES (6, 'hamster');
INSERT INTO types VALUES (7, 'turtle');
INSERT INTO types VALUES (8, 'fish');
INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');

2
src/main/resources/db/mysql/data.sql
View file

@ -21,6 +21,8 @@ INSERT IGNORE INTO types VALUES (3, 'lizard');
INSERT IGNORE INTO types VALUES (4, 'snake');
INSERT IGNORE INTO types VALUES (5, 'bird');
INSERT IGNORE INTO types VALUES (6, 'hamster');
INSERT IGNORE INTO types VALUES (7, 'turtle');
INSERT IGNORE INTO types VALUES (8, 'fish');
INSERT IGNORE INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
INSERT IGNORE INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');

2
src/main/resources/templates/owners/createOrUpdateOwnerForm.html
View file

@ -14,6 +14,8 @@
th:replace="~{fragments/inputField :: input ('Address', 'address', 'text')}" />
<input
th:replace="~{fragments/inputField :: input ('City', 'city', 'text')}" />
<input
th:replace="~{fragments/inputField :: input ('Zip Code', 'zipCode', 'text')}" />
<input
th:replace="~{fragments/inputField :: input ('Telephone', 'telephone', 'text')}" />
</div>

4
src/main/resources/templates/owners/ownerDetails.html
View file

@ -22,6 +22,10 @@
<th>City</th>
<td th:text="*{city}"></td>
</tr>
<tr>
<th>Zip Code</th>
<td th:text="*{zipCode}"></td>
</tr>
<tr>
<th>Telephone</th>
<td th:text="*{telephone}"></td>

2
src/main/resources/templates/owners/ownersList.html
View file

@ -12,6 +12,7 @@
<th style="width: 150px;">Name</th>
<th style="width: 200px;">Address</th>
<th>City</th>
<th>ZIP Code</th>
<th style="width: 120px">Telephone</th>
<th>Pets</th>
</tr>
@ -23,6 +24,7 @@
</td>
<td th:text="${owner.address}"/>
<td th:text="${owner.city}"/>
<td th:text="${owner.zipCode}"/>
<td th:text="${owner.telephone}"/>
<td><span th:text="${#strings.listJoin(owner.pets, ', ')}"/></td>
</tr>

1
src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
View file

@ -110,6 +110,7 @@ class ClinicServiceTests {
owner.setLastName("Schultz");
owner.setAddress("4, Evans Street");
owner.setCity("Wollongong");
owner.setZipCode("12345");
owner.setTelephone("4444444444");
this.owners.save(owner);
assertThat(owner.getId().longValue()).isNotEqualTo(0);