diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/MissionDao.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/MissionDao.java new file mode 100644 index 0000000000000000000000000000000000000000..9024ae1e04a8228ad4281517989618140758dd6e --- /dev/null +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/dao/MissionDao.java @@ -0,0 +1,7 @@ +package cz.fi.muni.pa165.seminar4.group7.secretservice.dao; + +import cz.fi.muni.pa165.seminar4.group7.secretservice.entity.Mission; +import org.springframework.data.repository.CrudRepository; + +public interface MissionDao extends CrudRepository { +} diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Mission.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Mission.java new file mode 100644 index 0000000000000000000000000000000000000000..e36a1e475681901aa845184cfc8642297bc68ba5 --- /dev/null +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Mission.java @@ -0,0 +1,67 @@ +package cz.fi.muni.pa165.seminar4.group7.secretservice.entity; + +import com.sun.istack.NotNull; +import lombok.Getter; +import lombok.Setter; + +import javax.persistence.*; +import java.sql.Date; +import java.util.List; + +/** + * @author Tomáš Biloš + */ +@Entity +public class Mission { + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Getter + @Setter + private Long id; + + @NotNull + @Column(nullable = false) + @Getter + @Setter + private Date start; + + @NotNull + @Column(nullable = false) + @Getter + @Setter + private int duration; + + @NotNull + @Column(nullable = false) + @Getter + @Setter + private String objective; + + @OneToMany(mappedBy = "mission") + private List resources; + + // TODO + // @ManyToOne ? + // private Country country; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Mission mission = (Mission) o; + + if (duration != mission.duration) return false; + if (!start.equals(mission.start)) return false; + return objective.equals(mission.objective); + } + + @Override + public int hashCode() { + int result = start.hashCode(); + result = 31 * result + duration; + result = 31 * result + objective.hashCode(); + return result; + } +} diff --git a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Resource.java b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Resource.java index 69071604e9b94efcdc96cd297473692b874cbe73..eb5e568d8b566b398c2dbce35ec17f7a29ed6d72 100644 --- a/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Resource.java +++ b/src/main/java/cz/fi/muni/pa165/seminar4/group7/secretservice/entity/Resource.java @@ -4,8 +4,13 @@ import com.sun.istack.NotNull; import lombok.Getter; import lombok.Setter; + import javax.persistence.*; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; /** * @author Tomáš Biloš */ @@ -23,11 +28,11 @@ public class Resource { @Setter private String name; -// @ManyToOne -// @JoinColumn(name = "mission_id") -// @Getter -// @Setter -// private Mission mission; + @ManyToOne + @JoinColumn(name = "mission_id") + @Getter + @Setter + private Mission mission; public Resource() { } diff --git a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/SecretServiceAppApplicationTests.java b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/SecretServiceAppApplicationTests.java index e782f10709c00bc5be821e927a7cbc564cd34c62..6c10731494066fcca7ec2badc613a11fb4ff90fe 100644 --- a/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/SecretServiceAppApplicationTests.java +++ b/src/test/java/cz/fi/muni/pa165/seminar4/group7/secretservice/SecretServiceAppApplicationTests.java @@ -19,6 +19,5 @@ class SecretServiceAppApplicationTests { resourceDao.save(new Resource(1L, "Milk")); assertThat(resourceDao.findByName("Milk").getName()).isEqualTo("Milk"); assertThat(resourceDao.findByName("Milk").getId()).isEqualTo(1L); - } }