From c9a2fd793ffc11a55f4f2a62416e0d161bf154ef Mon Sep 17 00:00:00 2001 From: dizda13 Date: Fri, 24 Mar 2017 01:47:43 +0100 Subject: [PATCH] finished events and teams --- .../repository/EventTypeJpaRepository.java | 10 +++ .../ba/steleks/repository/model/Event.java | 8 ++- .../steleks/repository/model/EventType.java | 46 +++++++++++++ .../repository/ParticipantJpaRepository.java | 11 ++++ .../repository/TeamCategoryJpaRepository.java | 10 +++ .../repository/module/Participant.java | 66 +++++++++++++++++++ .../ba/steleks/repository/module/Team.java | 34 +++++++--- .../repository/module/TeamCategory.java | 37 +++++++++++ .../steleks/repository/module/TeamMedia.java | 3 - 9 files changed, 210 insertions(+), 15 deletions(-) create mode 100644 events/src/main/java/ba/steleks/repository/EventTypeJpaRepository.java create mode 100644 events/src/main/java/ba/steleks/repository/model/EventType.java create mode 100644 teams/src/main/java/ba/steleks/repository/ParticipantJpaRepository.java create mode 100644 teams/src/main/java/ba/steleks/repository/TeamCategoryJpaRepository.java create mode 100644 teams/src/main/java/ba/steleks/repository/module/Participant.java create mode 100644 teams/src/main/java/ba/steleks/repository/module/TeamCategory.java diff --git a/events/src/main/java/ba/steleks/repository/EventTypeJpaRepository.java b/events/src/main/java/ba/steleks/repository/EventTypeJpaRepository.java new file mode 100644 index 0000000..023aeb1 --- /dev/null +++ b/events/src/main/java/ba/steleks/repository/EventTypeJpaRepository.java @@ -0,0 +1,10 @@ +package ba.steleks.repository; + +import ba.steleks.repository.model.EventType; +import org.springframework.data.repository.PagingAndSortingRepository; + +/** + * Created by admin on 24/03/2017. + */ +public interface EventTypeJpaRepository extends PagingAndSortingRepository { +} diff --git a/events/src/main/java/ba/steleks/repository/model/Event.java b/events/src/main/java/ba/steleks/repository/model/Event.java index 8273c44..d1d3fc8 100644 --- a/events/src/main/java/ba/steleks/repository/model/Event.java +++ b/events/src/main/java/ba/steleks/repository/model/Event.java @@ -19,7 +19,9 @@ public class Event { private Timestamp dateTime; private int duration; private long createdById; - private String eventType; + @ManyToOne + @JoinColumn + private EventType eventType; @ManyToMany @JoinColumn @@ -83,11 +85,11 @@ public class Event { this.createdById = createdById; } - public String getEventType() { + public EventType getEventType() { return eventType; } - public void setEventType(String eventType) { + public void setEventType(EventType eventType) { this.eventType = eventType; } diff --git a/events/src/main/java/ba/steleks/repository/model/EventType.java b/events/src/main/java/ba/steleks/repository/model/EventType.java new file mode 100644 index 0000000..ce1786a --- /dev/null +++ b/events/src/main/java/ba/steleks/repository/model/EventType.java @@ -0,0 +1,46 @@ +package ba.steleks.repository.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * Created by admin on 24/03/2017. + */ +@Entity +public class EventType { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long id; + + private String category; + private String eventDescription; + + public EventType() { + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getEventDescription() { + return eventDescription; + } + + public void setEventDescription(String eventDescription) { + this.eventDescription = eventDescription; + } +} diff --git a/teams/src/main/java/ba/steleks/repository/ParticipantJpaRepository.java b/teams/src/main/java/ba/steleks/repository/ParticipantJpaRepository.java new file mode 100644 index 0000000..3a5645a --- /dev/null +++ b/teams/src/main/java/ba/steleks/repository/ParticipantJpaRepository.java @@ -0,0 +1,11 @@ +package ba.steleks.repository; + +import ba.steleks.repository.module.Participant; +import org.springframework.data.repository.PagingAndSortingRepository; + +/** + * Created by admin on 24/03/2017. + */ + +public interface ParticipantJpaRepository extends PagingAndSortingRepository { +} diff --git a/teams/src/main/java/ba/steleks/repository/TeamCategoryJpaRepository.java b/teams/src/main/java/ba/steleks/repository/TeamCategoryJpaRepository.java new file mode 100644 index 0000000..4465812 --- /dev/null +++ b/teams/src/main/java/ba/steleks/repository/TeamCategoryJpaRepository.java @@ -0,0 +1,10 @@ +package ba.steleks.repository; + +import ba.steleks.repository.module.TeamCategory; +import org.springframework.data.repository.PagingAndSortingRepository; + +/** + * Created by admin on 24/03/2017. + */ +public interface TeamCategoryJpaRepository extends PagingAndSortingRepository { +} diff --git a/teams/src/main/java/ba/steleks/repository/module/Participant.java b/teams/src/main/java/ba/steleks/repository/module/Participant.java new file mode 100644 index 0000000..2c56f88 --- /dev/null +++ b/teams/src/main/java/ba/steleks/repository/module/Participant.java @@ -0,0 +1,66 @@ +package ba.steleks.repository.module; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import java.io.Serializable; + +/** + * Created by admin on 24/03/2017. + */ +@Entity +public class Participant { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long id; + + private String firstName; + private String lastName; + private String email; + private String profilePicture; + + public Participant() { + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getProfilePicture() { + return profilePicture; + } + + public void setProfilePicture(String profilePicture) { + this.profilePicture = profilePicture; + } +} diff --git a/teams/src/main/java/ba/steleks/repository/module/Team.java b/teams/src/main/java/ba/steleks/repository/module/Team.java index 3bdd77d..5981ddd 100644 --- a/teams/src/main/java/ba/steleks/repository/module/Team.java +++ b/teams/src/main/java/ba/steleks/repository/module/Team.java @@ -1,10 +1,8 @@ package ba.steleks.repository.module; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import javax.persistence.*; import javax.security.auth.Subject; +import java.util.Set; /** * Created by admin on 23/03/2017. @@ -19,9 +17,21 @@ public class Team { private long subjectId; private int position; private double gradesOrPoints; - private long contentId; + + @ManyToOne + @JoinColumn + private TeamCategory teamCategory; + private long eventId; + @ManyToMany + @JoinColumn + private Set participantSet; + + @ManyToMany + @JoinColumn + private Set teamMediaSet; + protected Team() { } @@ -57,12 +67,12 @@ public class Team { this.gradesOrPoints = gradesOrPoints; } - public long getContentId() { - return contentId; + public TeamCategory getContentId() { + return teamCategory; } - public void setContentId(long contentId) { - this.contentId = contentId; + public void setContentId(TeamCategory contentId) { + this.teamCategory = contentId; } public long getEventId() { @@ -73,5 +83,11 @@ public class Team { this.eventId = eventId; } + public Set getParticipantSet() { + return participantSet; + } + public void setParticipantSet(Set participantSet) { + this.participantSet = participantSet; + } } diff --git a/teams/src/main/java/ba/steleks/repository/module/TeamCategory.java b/teams/src/main/java/ba/steleks/repository/module/TeamCategory.java new file mode 100644 index 0000000..56ecf02 --- /dev/null +++ b/teams/src/main/java/ba/steleks/repository/module/TeamCategory.java @@ -0,0 +1,37 @@ +package ba.steleks.repository.module; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * Created by admin on 24/03/2017. + */ +@Entity +public class TeamCategory { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long id; + + private String type; + + public TeamCategory() { + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} diff --git a/teams/src/main/java/ba/steleks/repository/module/TeamMedia.java b/teams/src/main/java/ba/steleks/repository/module/TeamMedia.java index 176e0a6..6a8dc6c 100644 --- a/teams/src/main/java/ba/steleks/repository/module/TeamMedia.java +++ b/teams/src/main/java/ba/steleks/repository/module/TeamMedia.java @@ -13,9 +13,6 @@ public class TeamMedia { private long id; private String contentUrl; - @ManyToMany - @JoinColumn - private Set teamMediaSet; protected TeamMedia() {