PGL/Clyde
3
2
Fork 3
Code Issues 13 Pull Requests Actions Projects 3 Releases 2 Wiki Activity

Max/Backend/CoursesEndpoints (#129)
All checks were successful
Build and test backend / Build-backend (push) Successful in 2m16s
Details
Build and test backend / Test-backend (push) Successful in 1m24s
Details
deploy to production / deploy-frontend (push) Successful in 26s
Details
deploy to production / deploy-backend (push) Successful in 2m22s
Details
Build and test FrontEnd / Build-frontend (push) Successful in 26s
Details

Browse Source 
PLZ FIX

Reviewed-on: #129
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
This commit is contained in:
Bartha Maxime
2024-03-16 17:17:07 +01:00
committed by Maxime
parent d5f6656e2b
commit 069466ef5f
10 changed files with 213 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/src/main/java/ovh/herisson/Clyde/Tables/Course.java
View File

@ -1,9 +1,6 @@
package ovh.herisson.Clyde.Tables;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;
@Entity
public class Course {
@ -12,12 +9,15 @@ public class Course {
private int courseID;
private int credits;
private String title;
private String faculty;
public Course(int credits, String title, String faculty){
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "Users")
private User owner;
public Course(int credits, String title, User owner){
this.credits = credits;
this.title = title;
this.faculty = faculty;
this.owner = owner;
}
public Course() {}
@ -34,14 +34,6 @@ public class Course {
this.credits = credits;
}
public String getFaculty() {
return faculty;
}
public void setFaculty(String faculty){
this.faculty = faculty;
}
public String getTitle() {
return title;
}
@ -49,4 +41,12 @@ public class Course {
public void setTitle(String title){
this.title = title;
}
public User getOwner() {
return owner;
}
public void setOwner(User owner) {
this.owner = owner;
}
}

21
backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherGivenCourse.java → backend/src/main/java/ovh/herisson/Clyde/Tables/TeacherCourse.java
View File

@ -3,30 +3,26 @@ package ovh.herisson.Clyde.Tables;
import jakarta.persistence.*;
@Entity
public class TeacherGivenCourse {
public class TeacherCourse {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private int id;
@ManyToOne(fetch = FetchType.LAZY)
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "Users")
private User user;
@ManyToOne(fetch = FetchType.LAZY)
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "Course")
private Course course;
//This flag helps make the difference between an assistant or a Teacher (who owns the course)
private boolean owned;
public TeacherGivenCourse(User user, Course course, boolean owned){
public TeacherCourse(User user, Course course){
this.user = user;
this.course = course;
this.owned = owned;
}
public TeacherGivenCourse() {}
public TeacherCourse() {}
public int getId() {
return id;
@ -48,11 +44,4 @@ public class TeacherGivenCourse {
this.course = course;
}
public boolean isOwned() {
return owned;
}
public void setOwned(boolean owned) {
this.owned = owned;
}
}