From a2419a06ded2f4fd7788da12b5eeba34cf0b65fb Mon Sep 17 00:00:00 2001 From: MD rahil Date: Sun, 23 Aug 2026 12:20:39 -0700 Subject: [PATCH 01/13] fix: resolve backend JWT configuration --- backend/.gitignore | 1 + backend/src/main/resources/application.yml | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/backend/.gitignore b/backend/.gitignore index 8252ca8..166c53c 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -33,3 +33,4 @@ build/ ### Environment ### .env +.env diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 7c388de..aa66be2 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -1,5 +1,3 @@ -spring: - application: name: studentos-backend datasource: url: ${DATABASE_URL:jdbc:postgresql://localhost:5432/studentos} @@ -20,12 +18,8 @@ spring: host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} -server: - port: 8080 -app: - jwt: - secret: ${JWT_SECRET:change-me-to-a-long-random-secret-at-least-256-bits} + secret: ${JWT_SECRET:change-me-to-a-long-random-secret-at-least-256-bits} access-expiration-ms: ${JWT_ACCESS_EXPIRATION_MS:900000} refresh-expiration-ms: ${JWT_REFRESH_EXPIRATION_MS:604800000} cors: From 27b486529a988782572444684e11e78922a45350 Mon Sep 17 00:00:00 2001 From: MD rahil Date: Sun, 23 Aug 2026 12:44:43 -0700 Subject: [PATCH 02/13] ci: update workflow for Java 21 Maven build --- .github/workflows/ant.yml | 25 ------------------------- .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/ant.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml deleted file mode 100644 index 06fc807..0000000 --- a/.github/workflows/ant.yml +++ /dev/null @@ -1,25 +0,0 @@ -# This workflow will build a Java project with Ant -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant - -name: Java CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - java-version: '11' - distribution: 'temurin' - - name: Build with Ant - run: ant -noinput -buildfile build.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..8ea9e84 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: Java CI + +on: + push: + branches: ["main"] + pull_request: + branches: ["main"] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v5 + with: + java-version: "21" + distribution: "temurin" + cache: "maven" + + - name: Build backend + working-directory: backend + run: ./mvnw clean test From 7d5b4ac14079bec9699e85443568c8e6d4b0b8fd Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:40:16 -0700 Subject: [PATCH 03/13] Update AuthResponse.java From b4557def2e057c93b4a7720268e01676e90fc8e1 Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:50:50 -0700 Subject: [PATCH 04/13] Update next.config.ts From 35554a8f507235bc04dea384bd211d46f3b6db0e Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:51:43 -0700 Subject: [PATCH 05/13] Update AuthResponse.java From 966f2239e56ceec57ef6a66d045dcb304234b6dd Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:52:54 -0700 Subject: [PATCH 06/13] Update RegisterRequest.java From 1907b8083135ed5d10d68ba77f72e08b23621d18 Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:54:17 -0700 Subject: [PATCH 07/13] Remove unnecessary blank line in StudentProfileResponse --- .../src/main/java/com/studentos/dto/StudentProfileResponse.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/com/studentos/dto/StudentProfileResponse.java b/backend/src/main/java/com/studentos/dto/StudentProfileResponse.java index 09c6077..3352929 100644 --- a/backend/src/main/java/com/studentos/dto/StudentProfileResponse.java +++ b/backend/src/main/java/com/studentos/dto/StudentProfileResponse.java @@ -4,7 +4,6 @@ import java.time.Instant; import java.util.List; import java.util.UUID; - public record StudentProfileResponse( UUID id, String college, From 956537b8ec1cb3ab23873538b96fdbf356ba7649 Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:55:09 -0700 Subject: [PATCH 08/13] Remove unused Size import in UpdateProfileRequest Removed unused import for Size validation annotation. --- .../src/main/java/com/studentos/dto/UpdateProfileRequest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java index cb7e1f1..c7274ad 100644 --- a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java +++ b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java @@ -2,8 +2,6 @@ import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.Size; - import java.math.BigDecimal; public record UpdateProfileRequest( From e06e9f26a5570e5966df331e9042d55d7dea2119 Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:56:32 -0700 Subject: [PATCH 09/13] Update UserMapper.java --- backend/src/main/java/com/studentos/dto/UserMapper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/main/java/com/studentos/dto/UserMapper.java b/backend/src/main/java/com/studentos/dto/UserMapper.java index ab675ba..c4e21d7 100644 --- a/backend/src/main/java/com/studentos/dto/UserMapper.java +++ b/backend/src/main/java/com/studentos/dto/UserMapper.java @@ -4,8 +4,7 @@ import com.studentos.entity.User; import java.util.Comparator; -import java.util.List; - +import javva.util.List; public final class UserMapper { private UserMapper() { From ad047b355664112acd028b191c8737f008ea43a0 Mon Sep 17 00:00:00 2001 From: glitchcraft-Rahil Date: Thu, 13 Aug 2026 11:58:38 -0700 Subject: [PATCH 10/13] Update UserResponse.java From 14a056812188d9c6de6c296d2eeffa90a4228669 Mon Sep 17 00:00:00 2001 From: MD rahil Date: Sun, 23 Aug 2026 12:51:36 -0700 Subject: [PATCH 11/13] fix: resolve DTO compilation errors --- .../src/main/java/com/studentos/dto/UpdateProfileRequest.java | 1 + backend/src/main/java/com/studentos/dto/UserMapper.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java index c7274ad..1b0fa02 100644 --- a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java +++ b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java @@ -1,6 +1,7 @@ package com.studentos.dto; import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Min; import java.math.BigDecimal; diff --git a/backend/src/main/java/com/studentos/dto/UserMapper.java b/backend/src/main/java/com/studentos/dto/UserMapper.java index c4e21d7..fd1888d 100644 --- a/backend/src/main/java/com/studentos/dto/UserMapper.java +++ b/backend/src/main/java/com/studentos/dto/UserMapper.java @@ -4,7 +4,7 @@ import com.studentos.entity.User; import java.util.Comparator; -import javva.util.List; +import java.util.List; public final class UserMapper { private UserMapper() { From 9d5ad6ed9a95807318ac3885a3cb7eae5baec31c Mon Sep 17 00:00:00 2001 From: MD rahil Date: Sun, 23 Aug 2026 12:53:51 -0700 Subject: [PATCH 12/13] fix: correct DTO imports --- .../src/main/java/com/studentos/dto/UpdateProfileRequest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java index 1b0fa02..db410d8 100644 --- a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java +++ b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java @@ -2,6 +2,7 @@ import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Min; import java.math.BigDecimal; From cc614b698cfc58a2e808aa7a9365c6018cc4397c Mon Sep 17 00:00:00 2001 From: MD rahil Date: Sun, 23 Aug 2026 13:05:49 -0700 Subject: [PATCH 13/13] fix: correct DTO imports --- .../src/main/java/com/studentos/dto/UpdateProfileRequest.java | 4 ++-- backend/src/main/java/com/studentos/dto/UserMapper.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java index db410d8..cb7e1f1 100644 --- a/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java +++ b/backend/src/main/java/com/studentos/dto/UpdateProfileRequest.java @@ -1,9 +1,9 @@ package com.studentos.dto; import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Size; -import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; + import java.math.BigDecimal; public record UpdateProfileRequest( diff --git a/backend/src/main/java/com/studentos/dto/UserMapper.java b/backend/src/main/java/com/studentos/dto/UserMapper.java index fd1888d..a53d0e5 100644 --- a/backend/src/main/java/com/studentos/dto/UserMapper.java +++ b/backend/src/main/java/com/studentos/dto/UserMapper.java @@ -5,6 +5,7 @@ import java.util.Comparator; import java.util.List; + public final class UserMapper { private UserMapper() { @@ -12,6 +13,7 @@ private UserMapper() { public static UserResponse toResponse(User user) { StudentProfile profile = user.getStudentProfile(); + StudentProfileResponse profileResponse = profile == null ? null : new StudentProfileResponse( profile.getId(), profile.getCollege(),