adding course year to backend

backend/app/src/main/java/com/ugent/pidgeon/model/json/CourseJson.java

@@ -8,10 +8,13 @@ public class CourseJson{
 
     private Boolean isArchived;
 
-    public CourseJson(String name, String description, Boolean isArchived) {
+    private int courseYear;
+
+    public CourseJson(String name, String description, Boolean isArchived, int courseYear) {
         this.name = name;
         this.description = description;
         this.isArchived = isArchived;
+        this.courseYear = courseYear;
     }
 
     public String getName() {
@@ -37,5 +40,13 @@ public Boolean getArchived() {
     public void setArchived(Boolean isArchived) {
         this.isArchived = isArchived;
     }
+
+    public int getCourseYear() {
+        return courseYear;
+    }
+
+    public void setCourseYear(int courseYear) {
+        this.courseYear = courseYear;
+    }
 }
 

backend/app/src/main/java/com/ugent/pidgeon/postgre/models/CourseEntity.java

@@ -1,6 +1,7 @@
 package com.ugent.pidgeon.postgre.models;
 
 import jakarta.persistence.*;
+import jakarta.persistence.criteria.CriteriaBuilder;
 
 import java.time.OffsetDateTime;
 
@@ -18,6 +19,10 @@ public class CourseEntity {
     @Column(name = "description", nullable=false)
     private String description;
 
+    @Column(name = "course_year", nullable = true)
+    private int courseYear;
+
+
     @Column(name = "created_at")
     private OffsetDateTime createdAt;
 
@@ -71,6 +76,7 @@ public void setDescription(String description) {
     }
 
 
+
     public OffsetDateTime getCreatedAt() {
         return createdAt;
     }
@@ -86,4 +92,14 @@ public OffsetDateTime getArchivedAt() {
     public void setArchivedAt(OffsetDateTime archivedAt) {
         this.archivedAt = archivedAt;
     }
+
+    public int getCourseYear() {
+        return courseYear;
+    }
+    public void setCourseYear(int courseYear){
+        this.courseYear = courseYear;
+    }
+
+
+
 }

backend/app/src/test/java/com/ugent/pidgeon/util/CourseUtilTest.java

@@ -141,7 +141,7 @@ public void testCheckJoinLink() throws Exception {
 
   @Test
   public void testCheckCourseJson() throws Exception {
-    CourseJson courseJson = new CourseJson("name", "description", null);
+    CourseJson courseJson = new CourseJson("name", "description", null,2023);
     CheckResult<Void> result = courseUtil.checkCourseJson(courseJson, user, null);
     assertEquals(HttpStatus.OK, result.getStatus());
 

backend/database/populate_database.sql

@@ -10,12 +10,12 @@ INSERT INTO users (name, surname, email, azure_id, role) VALUES
                                                              ('Charlie', 'Davis', '[email protected]', 'token_5', 'teacher');
 
 -- Inserting into `courses`
-INSERT INTO courses (course_id,course_name, description) VALUES
-                                                             (1,'Math 101', 'Introduction to Mathematics'),
-                                                             (2,'Science 101', 'Basics of Scientific Method'),
-                                                             (3,'History 101', 'World History Overview'),
-                                                             (4,'Computer Science 101', 'Introduction to Computing'),
-                                                             (5,'English 101', 'English Literature');
+INSERT INTO courses (course_id,course_name, description, coures_year) VALUES
+                                                             (1,'Math 101', 'Introduction to Mathematics',2023),
+                                                             (2,'Science 101', 'Basics of Scientific Method',2023),
+                                                             (3,'History 101', 'World History Overview',2023),
+                                                             (4,'Computer Science 101', 'Introduction to Computing',2023),
+                                                             (5,'English 101', 'English Literature',2023);
 
 -- Inserting into `course_users`
 -- Assume course_id and user_id start from 1 and match accordingly

backend/database/start_database.sql

@@ -17,6 +17,7 @@ CREATE TABLE courses (
     course_id SERIAL PRIMARY KEY,
     course_name VARCHAR(100) NOT NULL,
     description TEXT,
+    course_year INTEGER,
     created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
     archived_at TIMESTAMP WITH TIME ZONE DEFAULT NULL,
     join_key TEXT