Skip to content
Snippets Groups Projects
Commit d5ed9154 authored by Joshua Gill's avatar Joshua Gill
Browse files

Merge branch 'issueThirtyNine' into 'develop'

Quick fix for broken entities "Logs" and "Events" due to duplicate attributes

See merge request !102
parents 3ba4e288 75623d97
No related branches found
No related tags found
3 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!104Branch Update,!102Quick fix for broken entities "Logs" and "Events" due to duplicate attributes
......@@ -20,8 +20,4 @@ public class Events {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private long eventId;
private String eventName;
@OneToMany(cascade=CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name="Event_Id", nullable = false)
private Set<Logs> logs;
}
......@@ -92,10 +92,6 @@ public class Users {
)
private List<Tags> favouriteTags;
@OneToMany(cascade=CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name="User_Id", nullable=false)
private Set<Logs> logs;
public String toString(){
return "User:" + this.getUserFirstName();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment