From 2f7dbbc788c722c4b699122b252f9ba4fb8c195b Mon Sep 17 00:00:00 2001 From: Marcin Alchimowicz Date: Thu, 18 Jan 2024 00:11:31 +0100 Subject: [PATCH] feat: final request finally works. This commit message is unprofessional. But this whole project is unprofessional so kinda whatever. Gimme 3 pls --- .../controller/HumanLogsController.java | 27 ++++++++ .../prapro2spring/dto/ActivityLogDTO.java | 4 +- .../prapro2spring/dto/OccupationLogDTO.java | 4 +- .../prapro2spring/model/ActivityLog.java | 4 +- .../prapro2spring/model/FullPerson.java | 69 ------------------- .../prapro2spring/model/HumanLogs.java | 51 ++++++++++++++ .../prapro2spring/model/OccupationLog.java | 4 +- .../repository/HumanLogsRepository.java | 7 ++ .../service/HumanLogsService.java | 25 +++++++ 9 files changed, 118 insertions(+), 77 deletions(-) create mode 100644 src/main/java/com/example/prapro2spring/controller/HumanLogsController.java delete mode 100644 src/main/java/com/example/prapro2spring/model/FullPerson.java create mode 100644 src/main/java/com/example/prapro2spring/model/HumanLogs.java create mode 100644 src/main/java/com/example/prapro2spring/repository/HumanLogsRepository.java create mode 100644 src/main/java/com/example/prapro2spring/service/HumanLogsService.java diff --git a/src/main/java/com/example/prapro2spring/controller/HumanLogsController.java b/src/main/java/com/example/prapro2spring/controller/HumanLogsController.java new file mode 100644 index 0000000..b411a71 --- /dev/null +++ b/src/main/java/com/example/prapro2spring/controller/HumanLogsController.java @@ -0,0 +1,27 @@ +package com.example.prapro2spring.controller; + +import com.example.prapro2spring.model.HumanLogs; +import com.example.prapro2spring.service.HumanLogsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/humanlogs") +public class HumanLogsController { + + @Autowired + private HumanLogsService HumanLogsService; + + + @GetMapping("/") + public List getAllPeopleValues() { + return HumanLogsService.findAll(); + } + + @GetMapping("/{id}") + public HumanLogs HumanLogsService(@PathVariable Integer id){ + return HumanLogsService.findById(id); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/prapro2spring/dto/ActivityLogDTO.java b/src/main/java/com/example/prapro2spring/dto/ActivityLogDTO.java index fa7abeb..b5222b4 100644 --- a/src/main/java/com/example/prapro2spring/dto/ActivityLogDTO.java +++ b/src/main/java/com/example/prapro2spring/dto/ActivityLogDTO.java @@ -14,10 +14,10 @@ public class ActivityLogDTO { @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; - @Column(name = "activityId") + @Column(name = "activity_id") private Integer activityId; - @Column(name = "humanId") + @Column(name = "human_id") private Integer personId; @Column(name = "start_timestamp") diff --git a/src/main/java/com/example/prapro2spring/dto/OccupationLogDTO.java b/src/main/java/com/example/prapro2spring/dto/OccupationLogDTO.java index 8d6e643..d682eed 100644 --- a/src/main/java/com/example/prapro2spring/dto/OccupationLogDTO.java +++ b/src/main/java/com/example/prapro2spring/dto/OccupationLogDTO.java @@ -14,10 +14,10 @@ public class OccupationLogDTO { @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; - @Column(name = "occupationId") + @Column(name = "occupation_id") private Integer occupationId; - @Column(name = "humanId") + @Column(name = "human_id") private Integer personId; @Column(name = "start_timestamp") diff --git a/src/main/java/com/example/prapro2spring/model/ActivityLog.java b/src/main/java/com/example/prapro2spring/model/ActivityLog.java index 70704c2..d259600 100644 --- a/src/main/java/com/example/prapro2spring/model/ActivityLog.java +++ b/src/main/java/com/example/prapro2spring/model/ActivityLog.java @@ -13,11 +13,11 @@ public class ActivityLog { private Integer id; @ManyToOne - @JoinColumn(name = "activityId") + @JoinColumn(name = "activity_id") private Activity activity; @ManyToOne - @JoinColumn(name = "humanId") + @JoinColumn(name = "human_id") private Person person; @Column(name = "start_timestamp") diff --git a/src/main/java/com/example/prapro2spring/model/FullPerson.java b/src/main/java/com/example/prapro2spring/model/FullPerson.java deleted file mode 100644 index de40e7b..0000000 --- a/src/main/java/com/example/prapro2spring/model/FullPerson.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.example.prapro2spring.model; - -import java.time.LocalDateTime; - -public class FullPerson { - private Integer id; - private Person parent1; - private Person parent2; - private java.time.LocalDateTime birthTimestamp; - private ActivityLog[] activityLog; - private OccupationLog[] occupationLog; - - public FullPerson(Integer id, Person parent1, Person parent2, java.time.LocalDateTime birthTimestamp, ActivityLog[] activityLog, OccupationLog[] occupationLog) { - this.id = id; - this.parent1 = parent1; - this.parent2 = parent2; - this.birthTimestamp = birthTimestamp; - this.activityLog = activityLog; - this.occupationLog = occupationLog; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Person getParent1() { - return parent1; - } - - public void setParent1(Person parent1) { - this.parent1 = parent1; - } - - public Person getParent2() { - return parent2; - } - - public void setParent2(Person parent2) { - this.parent2 = parent2; - } - - public LocalDateTime getBirthTimestamp() { - return birthTimestamp; - } - - public void setBirthTimestamp(LocalDateTime birthTimestamp) { - this.birthTimestamp = birthTimestamp; - } - - public ActivityLog[] getActivityLog() { - return activityLog; - } - - public void setActivityLog(ActivityLog[] activityLog) { - this.activityLog = activityLog; - } - - public OccupationLog[] getOccupationLog() { - return occupationLog; - } - - public void setOccupationLog(OccupationLog[] occupationLog) { - this.occupationLog = occupationLog; - } -} diff --git a/src/main/java/com/example/prapro2spring/model/HumanLogs.java b/src/main/java/com/example/prapro2spring/model/HumanLogs.java new file mode 100644 index 0000000..1ef2cee --- /dev/null +++ b/src/main/java/com/example/prapro2spring/model/HumanLogs.java @@ -0,0 +1,51 @@ +package com.example.prapro2spring.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "human_logs") +public class HumanLogs { + @Id + private Integer humanid; + @Column(name = "activity_log") + private String activityLog; + @Column(name = "occupation_log") + private String occupationLog; + + public HumanLogs(Integer id, String activityLog, String occupationLog) { + this.humanid = id; + this.activityLog = activityLog; + this.occupationLog = occupationLog; + } + + public HumanLogs() { + + } + + public Integer getHumanid() { + return humanid; + } + + public void setHumanid(Integer id) { + this.humanid = id; + } + + public String getActivityLog() { + return activityLog; + } + + public void setActivityLog(String activityLog) { + this.activityLog = activityLog; + } + + public String getOccupationLog() { + return occupationLog; + } + + public void setOccupationLog(String occupationLog) { + this.occupationLog = occupationLog; + } +} diff --git a/src/main/java/com/example/prapro2spring/model/OccupationLog.java b/src/main/java/com/example/prapro2spring/model/OccupationLog.java index e2a5073..755c1c0 100644 --- a/src/main/java/com/example/prapro2spring/model/OccupationLog.java +++ b/src/main/java/com/example/prapro2spring/model/OccupationLog.java @@ -13,11 +13,11 @@ public class OccupationLog { private Integer id; @ManyToOne - @JoinColumn(name = "occupationId") + @JoinColumn(name = "occupation_id") private Occupation occupation; @ManyToOne - @JoinColumn(name = "humanId") + @JoinColumn(name = "human_id") private Person person; @Column(name = "start_timestamp") diff --git a/src/main/java/com/example/prapro2spring/repository/HumanLogsRepository.java b/src/main/java/com/example/prapro2spring/repository/HumanLogsRepository.java new file mode 100644 index 0000000..cbee5b2 --- /dev/null +++ b/src/main/java/com/example/prapro2spring/repository/HumanLogsRepository.java @@ -0,0 +1,7 @@ +package com.example.prapro2spring.repository; + +import com.example.prapro2spring.model.HumanLogs; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface HumanLogsRepository extends JpaRepository { +} diff --git a/src/main/java/com/example/prapro2spring/service/HumanLogsService.java b/src/main/java/com/example/prapro2spring/service/HumanLogsService.java new file mode 100644 index 0000000..fa5f03e --- /dev/null +++ b/src/main/java/com/example/prapro2spring/service/HumanLogsService.java @@ -0,0 +1,25 @@ +package com.example.prapro2spring.service; + +import com.example.prapro2spring.model.HumanLogs; +import com.example.prapro2spring.repository.HumanLogsRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class HumanLogsService { + @Autowired + HumanLogsRepository humanLogsRepository; + + public List + findAll(){ + return humanLogsRepository.findAll(); + } + + public HumanLogs findById(Integer id){ + return humanLogsRepository.findById(id).orElse(null); + } + + +}