Pull into main-preview

.github/workflows/tests.yml

@@ -14,6 +14,12 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup env.properties
+        run: |
+          echo "DB_URL=${{ secrets.DB_URL }}" >> src/main/resources/env.properties
+          echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" >> src/main/resources/env.properties
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> src/main/resources/env.properties
+
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:

pom.xml

@@ -34,11 +34,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<!-- https://mvnrepository.com/artifact/com.mysql/mysql-connector-j -->
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
-			<scope>runtime</scope>
+			<version>9.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -49,6 +49,12 @@
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.modelmapper/modelmapper -->
+		<dependency>
+			<groupId>org.modelmapper</groupId>
+			<artifactId>modelmapper</artifactId>
+			<version>3.2.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/carpi/carpibackend/Application.java

@@ -9,5 +9,4 @@ public class Application {
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
-
 }

src/main/java/com/carpi/carpibackend/ApplicationConfig.java

@@ -0,0 +1,35 @@
+package com.carpi.carpibackend;
+
+import org.modelmapper.Converter;
+import org.modelmapper.ModelMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.carpi.carpibackend.dto.CourseDto;
+import com.carpi.carpibackend.entity.CourseSearchResult;
+
+@Configuration
+public class ApplicationConfig {
+
+    private static final String[] EMPTY_LIST = new String[0];
+
+    @Bean
+    public ModelMapper modelMapper() {
+        ModelMapper modelMapper = new ModelMapper();
+        Converter<String, String[]> split =
+                ctx -> ctx.getSource() == null ? EMPTY_LIST : ctx.getSource().split(",");
+        modelMapper.typeMap(CourseSearchResult.class, CourseDto.class).addMappings(
+            mapper -> {
+                mapper.using(split).map(
+                    CourseSearchResult::getSemesterList,
+                    CourseDto::setSemesterList
+                );
+                mapper.using(split).map(
+                    CourseSearchResult::getAttributeList,
+                    CourseDto::setAttributeList
+                );
+            }
+        );
+        return modelMapper;
+    }
+}

src/main/java/com/carpi/carpibackend/controller/CourseController.java

@@ -1,26 +1,54 @@
 package com.carpi.carpibackend.controller;
 
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
-import com.carpi.carpibackend.entity.Course;
-import com.carpi.carpibackend.repository.CourseRepository;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.carpi.carpibackend.dto.CourseDto;
+import com.carpi.carpibackend.entity.CourseSearchResult;
+import com.carpi.carpibackend.service.CourseSearchService;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/api/v1/course")
 public class CourseController {
 
     @Autowired
-    private CourseRepository courseRepository;
+    private CourseSearchService courseSearchService;
+
+    @Autowired
+    private ModelMapper modelMapper;
 
-    @ResponseBody
-    @GetMapping
-    public ResponseEntity<List<Course>> getAll() {
-        return ResponseEntity.ok(courseRepository.findAll());
+    @GetMapping("/all")
+    public ResponseEntity<List<CourseDto>> getAll() {
+        return searchCourses(null, null, null, null);
     }
 
+    @GetMapping("/search")
+    public ResponseEntity<List<CourseDto>> searchCourses(
+            @RequestParam(required = false) String searchPrompt,
+            @RequestParam(required = false) String[] deptFilters,
+            @RequestParam(required = false) String[] attrFilters,
+            @RequestParam(required = false) String[] semFilters
+    ) {
+        List<CourseSearchResult> searchResults = courseSearchService.searchCourses(
+                searchPrompt,
+                deptFilters,
+                attrFilters,
+                semFilters
+        );
+        List<CourseDto> courseDtos = searchResults.stream().map(
+                                        result -> modelMapper.map(result, CourseDto.class)
+                                    ).collect(Collectors.toList());
+        return ResponseEntity.ok(courseDtos);
+    }
 }

src/main/java/com/carpi/carpibackend/dto/CourseDto.java

@@ -0,0 +1,26 @@
+package com.carpi.carpibackend.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+
+public class CourseDto {
+
+    private String department;
+
+    private int code;
+
+    private String title;
+
+    private String description;
+
+    private short creditMin;
+
+    private short creditMax;
+
+    private String[] semesterList;
+
+    private String[] attributeList;
+}

src/main/java/com/carpi/carpibackend/entity/Course.java

@@ -6,7 +6,6 @@
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-
 import lombok.Getter;
 import lombok.Setter;
 

src/main/java/com/carpi/carpibackend/entity/CourseSearchResult.java

@@ -0,0 +1,61 @@
+package com.carpi.carpibackend.entity;
+
+import com.carpi.carpibackend.keys.CourseKey;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+
+@Entity
+public class CourseSearchResult {
+
+    @EmbeddedId
+    private CourseKey pkCourses;
+
+    @Column(name = "dept", nullable = false)
+    private String department;
+
+    @Column(name = "code_num", nullable = false)
+    private int code;
+
+    @Column(name = "title", nullable = false)
+    private String title;
+
+    @Column(name = "desc_text", nullable = false)
+    private String description;
+
+    @Column(name = "credit_min", nullable = false)
+    private short creditMin;
+
+    @Column(name = "credit_max", nullable = false)
+    private short creditMax;
+
+    @Column(name = "sem_list", nullable = false)
+    private String semesterList;
+
+    @Column(name = "attr_list", nullable = true)
+    private String attributeList;
+
+    @Column(name = "code_match", nullable = false)
+    private boolean codeMatch;
+
+    @Column(name = "title_exact_match", nullable = false)
+    private boolean titleExactMatch;
+
+    @Column(name = "title_start_match", nullable = false)
+    private boolean titleStartMatch;
+
+    @Column(name = "title_match", nullable = false)
+    private boolean titleMatch;
+
+    @Column(name = "title_acronym", nullable = false)
+    private boolean titleAcronym;
+
+    @Column(name = "title_abbrev", nullable = false)
+    private boolean titleAbbrev;
+}

src/main/java/com/carpi/carpibackend/keys/CourseKey.java

@@ -1,12 +1,11 @@
 package com.carpi.carpibackend.keys;
 
+import java.io.Serializable;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
-
-import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
-
-import java.io.Serializable;
+import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
 @AllArgsConstructor
@@ -20,4 +19,22 @@ public class CourseKey implements Serializable {
     @Column(name = "code_num", insertable = false, updatable = false, nullable = false)
     private int code;
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof CourseKey) {
+            CourseKey other = (CourseKey) obj;
+            return department.equals(other.department) && code == other.code;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = department.hashCode();
+        result = 31 * result + Integer.hashCode(code);
+        return result;
+    }
 }

src/main/java/com/carpi/carpibackend/repository/CourseRepository.java

@@ -1,10 +1,12 @@
 package com.carpi.carpibackend.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
-import com.carpi.carpibackend.keys.CourseKey;
 import com.carpi.carpibackend.entity.Course;
+import com.carpi.carpibackend.keys.CourseKey;
 
+@Repository
 public interface CourseRepository extends JpaRepository<Course, CourseKey> {
 
 }

src/main/java/com/carpi/carpibackend/repository/CourseSearchResultRepository.java

@@ -0,0 +1,86 @@
+package com.carpi.carpibackend.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.carpi.carpibackend.entity.CourseSearchResult;
+import com.carpi.carpibackend.keys.CourseKey;
+
+@Repository
+public interface CourseSearchResultRepository extends JpaRepository<CourseSearchResult, CourseKey> {
+
+    @Query(
+        value = """
+            SELECT
+                course.dept AS dept,
+                course.code_num AS code_num,
+                course.title AS title,
+                course.desc_text AS desc_text,
+                course.credit_min AS credit_min,
+                course.credit_max AS credit_max,
+                GROUP_CONCAT(DISTINCT CONCAT(course_seats.semester, ' ', course_seats.sem_year)) AS sem_list,
+                GROUP_CONCAT(DISTINCT course_attribute.attr ORDER BY course_attribute.attr ASC) AS attr_list,
+                REGEXP_LIKE(CONCAT(course.dept, ' ', course.code_num), ?1, 'i') AS code_match,
+                REGEXP_LIKE(course.title, ?2, 'i') AS title_exact_match,
+                REGEXP_LIKE(course.title, ?3, 'i') AS title_start_match,
+                REGEXP_LIKE(course.title, ?4, 'i') AS title_match,
+                REGEXP_LIKE(course.title, ?5, 'i') AS title_acronym,
+                REGEXP_LIKE(course.title, ?6, 'i') AS title_abbrev
+            FROM
+                course
+                INNER JOIN course_seats USING(dept, code_num)
+                LEFT JOIN course_attribute USING(dept, code_num)
+            WHERE
+                REGEXP_LIKE(dept, ?7, 'i') > 0
+            GROUP BY
+                dept,
+                code_num,
+                title,
+                desc_text,
+                credit_min,
+                credit_max,
+                code_match,
+                title_exact_match,
+                title_start_match,
+                title_match,
+                title_acronym,
+                title_abbrev
+            HAVING
+                ( 
+                    code_match > 0
+                    OR title_exact_match > 0
+                    OR title_start_match > 0
+                    OR title_match > 0
+                    OR title_acronym > 0
+                    OR title_abbrev > 0
+                )
+                AND REGEXP_LIKE(IFNULL(attr_list, ''), ?8, 'i') > 0
+                AND REGEXP_LIKE(sem_list, ?9, 'i') > 0
+            ORDER BY
+                code_match DESC,
+                title_exact_match DESC,
+                title_start_match DESC,
+                title_match DESC,
+                title_acronym DESC,
+                title_abbrev DESC,
+                code_num ASC,
+                dept ASC
+            ;
+        """,
+        nativeQuery = true
+    )
+    public List<CourseSearchResult> searchCourses(
+        String searchCodeRegex,
+        String searchFullRegex,
+        String searchStartRegex,
+        String searchAnyRegex,
+        String searchAcronymRegex,
+        String searchAbbrevRegex,
+        String deptFilterRegex,
+        String attrFilterRegex,
+        String semFilterRegex
+    );
+}