diff --git a/src/main/java/dev/araozu/eeg_java/controller/MainController.java b/src/main/java/dev/araozu/eeg_java/controller/MainController.java deleted file mode 100644 index 6ec0410..0000000 --- a/src/main/java/dev/araozu/eeg_java/controller/MainController.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.araozu.eeg_java.controller; - -import dev.araozu.eeg_java.model.Person; -import dev.araozu.eeg_java.model.PersonRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -@Controller -@RequestMapping(path = "/demo") -public class MainController { - - @Autowired - private PersonRepository personRepository; - - @PostMapping(path = "/add") - public @ResponseBody String addNewPerson(@RequestParam String name, @RequestParam String dni) { - Person person = new Person(); - person.setPerson_dni(dni); - person.setPerson_names(name); - person.setPerson_paternal_surname("Doe"); - person.setPerson_maternal_surname("Smith"); - person.setPerson_classroom_id(1); - person.setPerson_classroom_username("JohnDoe"); - personRepository.save(person); - - return "Saved :D"; - } - - @GetMapping(path = "/all") - public @ResponseBody Iterable getAllPersons() { - return personRepository.findAll(); - } -} diff --git a/src/main/java/dev/araozu/eeg_java/model/Person.java b/src/main/java/dev/araozu/eeg_java/model/Person.java deleted file mode 100644 index f02c20e..0000000 --- a/src/main/java/dev/araozu/eeg_java/model/Person.java +++ /dev/null @@ -1,76 +0,0 @@ -package dev.araozu.eeg_java.model; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; - -@Entity(name = "person") -public class Person { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer person_id; - - private String person_dni; - private String person_names; - private String person_paternal_surname; - private String person_maternal_surname; - private Integer person_classroom_id; - private String person_classroom_username; - - public Integer getPerson_id() { - return person_id; - } - - public void setPerson_id(Integer person_id) { - this.person_id = person_id; - } - - public String getPerson_dni() { - return person_dni; - } - - public void setPerson_dni(String person_dni) { - this.person_dni = person_dni; - } - - public String getPerson_names() { - return person_names; - } - - public void setPerson_names(String person_names) { - this.person_names = person_names; - } - - public String getPerson_paternal_surname() { - return person_paternal_surname; - } - - public void setPerson_paternal_surname(String person_paternal_surname) { - this.person_paternal_surname = person_paternal_surname; - } - - public String getPerson_maternal_surname() { - return person_maternal_surname; - } - - public void setPerson_maternal_surname(String person_maternal_surname) { - this.person_maternal_surname = person_maternal_surname; - } - - public Integer getPerson_classroom_id() { - return person_classroom_id; - } - - public void setPerson_classroom_id(Integer person_classroom_id) { - this.person_classroom_id = person_classroom_id; - } - - public String getPerson_classroom_username() { - return person_classroom_username; - } - - public void setPerson_classroom_username(String person_classroom_username) { - this.person_classroom_username = person_classroom_username; - } -} diff --git a/src/main/java/dev/araozu/eeg_java/person/Person.java b/src/main/java/dev/araozu/eeg_java/person/Person.java new file mode 100644 index 0000000..92ea967 --- /dev/null +++ b/src/main/java/dev/araozu/eeg_java/person/Person.java @@ -0,0 +1,87 @@ +package dev.araozu.eeg_java.person; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +@Entity(name = "person") +public class Person { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer person_id; + + @Column(name = "person_dni") + private String personDni; + @Column(name = "person_names") + private String personNames; + + @Column(name = "person_paternal_surname") + private String personPaternalSurname; + + @Column(name = "person_maternal_surname") + private String personMaternalSurname; + + @Column(name = "person_classroom_id") + private Integer personClassroomId; + + @Column(name = "person_classroom_username") + private String personClassroomUsername; + + public String getPersonClassroomUsername() { + return personClassroomUsername; + } + + public void setPersonClassroomUsername(String personClassroomUsername) { + this.personClassroomUsername = personClassroomUsername; + } + + public Integer getPersonId() { + return person_id; + } + + public void setPersonId(Integer person_id) { + this.person_id = person_id; + } + + public String getPersonDni() { + return personDni; + } + + public void setPersonDni(String person_dni) { + this.personDni = person_dni; + } + + public String getPersonNames() { + return personNames; + } + + public void setPersonNames(String personNames) { + this.personNames = personNames; + } + + public String getPersonPaternalSurname() { + return personPaternalSurname; + } + + public void setPersonPaternalSurname(String personPaternalSurname) { + this.personPaternalSurname = personPaternalSurname; + } + + public String getPersonMaternalSurname() { + return personMaternalSurname; + } + + public void setPersonMaternalSurname(String personMaternalSurname) { + this.personMaternalSurname = personMaternalSurname; + } + + public Integer getPersonClassroomId() { + return personClassroomId; + } + + public void setPersonClassroomId(Integer personClassroomId) { + this.personClassroomId = personClassroomId; + } +} diff --git a/src/main/java/dev/araozu/eeg_java/person/PersonController.java b/src/main/java/dev/araozu/eeg_java/person/PersonController.java index d0da63c..8102dc7 100644 --- a/src/main/java/dev/araozu/eeg_java/person/PersonController.java +++ b/src/main/java/dev/araozu/eeg_java/person/PersonController.java @@ -1,19 +1,39 @@ package dev.araozu.eeg_java.person; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; + +import jakarta.servlet.http.HttpServletResponse; + import org.springframework.web.bind.annotation.GetMapping; @Controller @RequestMapping(path = "/person") public class PersonController { + + @Autowired + private PersonRepository personRepository; + @GetMapping("/") public String searchPersonByDniString( - @RequestParam(required = true, value="person_dni") String personDni + @RequestParam(required = true, value="person_dni") String personDni, + HttpServletResponse response ) { - System.out.println("PersonController.searchPersonByDniString: " + personDni); - return "fragments/sample.html"; + var maybePerson = personRepository.findByPersonDni(personDni); + + if (maybePerson.isPresent()) { + Person person = maybePerson.get(); + System.out.println(person.getPersonDni()); + + return "fragments/person/display.html"; + } else { + // send http 404 + response.setStatus(HttpServletResponse.SC_NOT_FOUND); + + return "fragments/person/create.html"; + } } } diff --git a/src/main/java/dev/araozu/eeg_java/model/PersonRepository.java b/src/main/java/dev/araozu/eeg_java/person/PersonRepository.java similarity index 53% rename from src/main/java/dev/araozu/eeg_java/model/PersonRepository.java rename to src/main/java/dev/araozu/eeg_java/person/PersonRepository.java index a5fee43..988f553 100644 --- a/src/main/java/dev/araozu/eeg_java/model/PersonRepository.java +++ b/src/main/java/dev/araozu/eeg_java/person/PersonRepository.java @@ -1,6 +1,9 @@ -package dev.araozu.eeg_java.model; +package dev.araozu.eeg_java.person; + +import java.util.Optional; import org.springframework.data.repository.CrudRepository; public interface PersonRepository extends CrudRepository { + Optional findByPersonDni(String personDni); } diff --git a/src/main/resources/templates/certs.html b/src/main/resources/templates/certs.html index bcfe9a1..bef6b8f 100644 --- a/src/main/resources/templates/certs.html +++ b/src/main/resources/templates/certs.html @@ -10,7 +10,9 @@
-
+
@@ -19,7 +21,7 @@
-
+
+ @@ -55,7 +58,7 @@
-

+

Error: {error()}

diff --git a/src/main/resources/templates/fragments/person/create.html b/src/main/resources/templates/fragments/person/create.html new file mode 100644 index 0000000..8f309ab --- /dev/null +++ b/src/main/resources/templates/fragments/person/create.html @@ -0,0 +1,3 @@ +
+

Create a new person here:

+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/person/display.html b/src/main/resources/templates/fragments/person/display.html new file mode 100644 index 0000000..ff2716c --- /dev/null +++ b/src/main/resources/templates/fragments/person/display.html @@ -0,0 +1,49 @@ +
+
+ + + AAAAAAA + + + +
+ +
+ + + BBBBBB + + + +
+ +
+ + + CCCCCCCC + + + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/fragments/sample.html b/src/main/resources/templates/fragments/sample.html deleted file mode 100644 index 815e504..0000000 --- a/src/main/resources/templates/fragments/sample.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Sample response :D (carita feliz) -
\ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 832370d..7139067 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,7 +1,7 @@ - +