Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
304b9e2
endpoints schema
Jul 10, 2025
f4e1844
add javadocs to endpoints and small fix
Jul 11, 2025
43f0090
merge from main
Jul 31, 2025
72635d8
another merge from main
Jul 31, 2025
2649274
update project structure + addExam implementation
PatMaz999 Jul 31, 2025
3d10cce
fix everything
PatMaz999 Aug 1, 2025
9739267
modify exam + javadoc
PatMaz999 Aug 1, 2025
194b575
implement get exam
PatMaz999 Aug 2, 2025
81928b9
javadoc
PatMaz999 Aug 2, 2025
f37edb5
simple mapper tests
PatMaz999 Aug 4, 2025
8a4630d
data validation in Exam builder
PatMaz999 Aug 4, 2025
0df238f
Add full tests for ExamDtoMapper and move some validation to controller
PatMaz999 Aug 5, 2025
881cf79
Add tests for most of ExamService methods
PatMaz999 Aug 6, 2025
48a983d
implement integration tests for ExamRepository (with h2 database in t…
PatMaz999 Aug 6, 2025
24592a2
optimizing getExamByGroup method
PatMaz999 Aug 6, 2025
b4d5ea7
add custom exception in mapper
PatMaz999 Aug 6, 2025
a59143b
Fix N+1 query problem by adding fetch join
PatMaz999 Aug 7, 2025
8224356
add javadoc for ExamRepository
PatMaz999 Aug 7, 2025
490a059
complete ExamService tests
PatMaz999 Aug 7, 2025
2de511d
add new exception type for non-existing items
PatMaz999 Aug 7, 2025
29e5bac
add endpoint for fetching groupTypes
PatMaz999 Aug 7, 2025
75d962a
test data validation in ExamDto
PatMaz999 Aug 11, 2025
8218574
exception handling
PatMaz999 Aug 11, 2025
8600c01
fix tests
PatMaz999 Aug 12, 2025
466b651
addExam tests
PatMaz999 Aug 13, 2025
1c7d59d
modifyExam integration tests
PatMaz999 Aug 13, 2025
dfc389d
refactor modifyExam tests
PatMaz999 Aug 13, 2025
50f9077
refactor addExam tests
PatMaz999 Aug 13, 2025
bdc7180
integration tests of deleteExam
PatMaz999 Aug 13, 2025
69333ab
integration tests of getExamById
PatMaz999 Aug 13, 2025
339a856
integration tests of getExamTypes
PatMaz999 Aug 13, 2025
27120fd
javadoc for helper methods
PatMaz999 Aug 13, 2025
2eb3b96
Resolve conficlts
florczaq Aug 18, 2025
097c199
Revert "Resolve conficlts"
florczaq Aug 18, 2025
999608c
import new database
PatMaz999 Aug 19, 2025
97329c6
merge from main
PatMaz999 Aug 19, 2025
936578b
adapting classes to new database
PatMaz999 Aug 19, 2025
bf3fdc2
implement getExamByGroups with variable number of arguments
PatMaz999 Aug 20, 2025
2179a23
fix some tests
PatMaz999 Aug 20, 2025
e59a1e2
move verification from mapper to service
PatMaz999 Aug 20, 2025
923da72
add examGroups verification
PatMaz999 Aug 20, 2025
2d8b163
fix examRepository tests
PatMaz999 Aug 20, 2025
86c9bb4
fix tables and columns names mapping
PatMaz999 Aug 21, 2025
e69770d
fix addExam test
PatMaz999 Aug 22, 2025
5d5d516
fix add exceptions in ExamService
PatMaz999 Aug 23, 2025
cf52d2b
expose bug in ExamService
PatMaz999 Aug 24, 2025
a2558b0
feat(auth): add JWT token generation
Michal-Piotrkowski Aug 24, 2025
2cd2aa3
fix: remove unused imports and improve JwtUtils class
Michal-Piotrkowski Aug 24, 2025
84bddb0
fix: fields names
Michal-Piotrkowski Aug 24, 2025
7ce53f4
Merge branch 'main' into feat/jwt-token-generate
Michal-Piotrkowski Aug 24, 2025
0702118
Fallback to default JWT secret if env var missing
Michal-Piotrkowski Aug 24, 2025
4ff3ccb
fix: critical bug in examService
PatMaz999 Aug 25, 2025
29634a5
change group identifiers format
PatMaz999 Aug 26, 2025
cda6694
refactor examService
PatMaz999 Aug 26, 2025
1b512ed
implement getExams by groups with unlimited count of arguments
PatMaz999 Aug 27, 2025
b4d5572
adapt ExamDtoMapper to new Exam Entity
PatMaz999 Aug 27, 2025
19e96ec
tests for ExamDto with bug fixes
PatMaz999 Aug 27, 2025
38d2374
test Exam builder + fix NullPointerException
PatMaz999 Aug 27, 2025
45aab92
remove SQL keyword from table name
PatMaz999 Aug 27, 2025
1d092fb
tests of new implementation of examRepository
PatMaz999 Aug 27, 2025
e8b5034
feat(auth): update authentication args and improve UserDTO initializa…
Michal-Piotrkowski Aug 29, 2025
4067cb9
test addExam with correct data
PatMaz999 Aug 28, 2025
f45093e
define testService specification
PatMaz999 Aug 29, 2025
d2953c1
refactor ExamServiceTest
PatMaz999 Aug 29, 2025
e5e4069
refactor ExamServiceTest
PatMaz999 Aug 29, 2025
548f78e
Merge pull request #51 from PKTTTeam/feat/jwt-token-generate
florczaq Aug 29, 2025
6b4f2ea
tests of ExamService with correct data
PatMaz999 Aug 29, 2025
194fa51
add more detailed exception messages for invalid generalGroup identif…
PatMaz999 Aug 29, 2025
67bfadd
tests for invalid group identifiers in ExamService
PatMaz999 Aug 29, 2025
e2ba552
tests addExam in ExamService
PatMaz999 Aug 29, 2025
3671cf9
tests getExams in ExamService
PatMaz999 Aug 29, 2025
fb1ef5d
resolve issue with some tests from ExamController
PatMaz999 Aug 29, 2025
12ca37f
modify old examController tests for new implementation
PatMaz999 Aug 30, 2025
86d1dbf
add InvalidGroupIdentifierException handling
PatMaz999 Aug 30, 2025
4003b73
fix bug with swapping generalGroups with subgroups
PatMaz999 Aug 30, 2025
67a222a
complete integration tests for ExamCalendar
PatMaz999 Aug 30, 2025
0f593a5
add generalGroups format verification in addExam
PatMaz999 Aug 30, 2025
cd229ee
refactor ExamControllerAdvice
PatMaz999 Sep 1, 2025
8044f28
change verify groups to use regex
PatMaz999 Sep 1, 2025
f481029
allow using whole year of study as generalGroup identifier
PatMaz999 Sep 1, 2025
636949e
override equals() and hashcode in Exam class
PatMaz999 Sep 2, 2025
9f6a895
Merge remote-tracking branch 'origin/main' into examCalendar
florczaq Sep 3, 2025
85ba074
Revert "Merge remote-tracking branch 'origin/main' into examCalendar"
florczaq Sep 3, 2025
37d4f22
Add exam callendar
florczaq Sep 3, 2025
79fafce
Delete old paths
florczaq Sep 3, 2025
2362211
log
PatMaz999 Sep 3, 2025
74bf8a6
Fixes after structure change
florczaq Sep 3, 2025
6ebae4b
Merge pull request #56 from PKTTTeam/fix/structure
florczaq Sep 3, 2025
eafd99f
Otp files
florczaq Sep 3, 2025
873194e
Missing exceptions files
florczaq Sep 3, 2025
240797c
Fix exception
florczaq Sep 3, 2025
b7bfa4a
Fix packages errors
florczaq Sep 3, 2025
3996585
Merge pull request #57 from PKTTTeam/feat/otp-service
florczaq Sep 3, 2025
c50709a
Merge remote-tracking branch 'refs/remotes/origin/main' into examCale…
PatMaz999 Sep 3, 2025
8173cbb
delete status package
PatMaz999 Sep 3, 2025
326a002
update test database configuration
PatMaz999 Sep 3, 2025
68a13ea
update application properties
PatMaz999 Sep 3, 2025
5e5a2fd
revert update application properties
PatMaz999 Sep 3, 2025
780b7d3
application properties profiles
PatMaz999 Sep 3, 2025
a1f031c
replace timetableService with mock in ExamControllerTests
PatMaz999 Sep 4, 2025
a97e205
Generate and return token; Delete structure package; Check if provide…
florczaq Sep 4, 2025
b70fd3b
Generate and return token; Delete structure package; Check if provide…
florczaq Sep 4, 2025
9cd182b
Merge pull request #59 from PKTTTeam/feat/otp-get-token
florczaq Sep 4, 2025
82e697e
separate tests profiles
PatMaz999 Sep 4, 2025
19062c0
Merge branch 'main' into examCalendar
PatMaz999 Sep 4, 2025
c2d0f48
merge from main
PatMaz999 Sep 4, 2025
21709a8
Merge pull request #58 from PKTTTeam/examCalendar
florczaq Sep 4, 2025
9904a3b
Fix: exception condition
florczaq Sep 4, 2025
48375d5
Merge remote-tracking branch 'origin/main'
florczaq Sep 4, 2025
7814013
Code optimization
florczaq Sep 5, 2025
773d619
code optimization
PatMaz999 Sep 5, 2025
21e9dce
fix: examMapper
PatMaz999 Sep 5, 2025
3b62a92
Merge pull request #60 from PKTTTeam/fixes
florczaq Sep 5, 2025
fd279a4
Created OTP exceptions tests
florczaq Sep 5, 2025
65abc70
Merge branch 'main' into feat/otp-test
florczaq Sep 5, 2025
59c7ac9
Merge pull request #61 from PKTTTeam/feat/otp-test
florczaq Sep 6, 2025
2d519f2
Applied apiPrefix vairable to Request mapping
florczaq Sep 6, 2025
6f45f46
Merge branch 'main' into feat/api-prefix
florczaq Sep 6, 2025
fa41a46
Merge pull request #62 from PKTTTeam/feat/api-prefix
florczaq Sep 6, 2025
6302636
Crete mail tests with Green mail
florczaq Sep 6, 2025
a069153
Update docker-image.yml
florczaq Sep 6, 2025
aba7954
Merge pull request #63 from PKTTTeam/feat/otp-mail-tests
florczaq Sep 6, 2025
b3764d5
API Key logic
florczaq Sep 6, 2025
d531b0d
API Key logic
florczaq Sep 6, 2025
a4e3e0a
Admin key validation
florczaq Sep 6, 2025
d25991f
Admin Key logic
florczaq Sep 6, 2025
abee2b5
Merge branch 'main' into feat/api-key
florczaq Sep 6, 2025
22ad740
Fix: missing env variable
florczaq Sep 6, 2025
bea2504
Merge remote-tracking branch 'origin/feat/api-key' into feat/api-key
florczaq Sep 6, 2025
92411a9
Merge pull request #64 from PKTTTeam/feat/api-key
florczaq Sep 6, 2025
3751132
Delete logs directory
florczaq Sep 6, 2025
f1f0814
Add endpoint: list of subjects
florczaq Sep 7, 2025
0e2fd89
Merge pull request #65 from PKTTTeam/feat/timetable-subject-list
florczaq Sep 7, 2025
5098ab3
feat: added filter for validating token
Michal-Piotrkowski Sep 7, 2025
b2ffd23
feat: add token validation logic and comments
Michal-Piotrkowski Sep 7, 2025
a1a3944
feat: add tests
Michal-Piotrkowski Sep 8, 2025
9b760b4
fix: tests
Michal-Piotrkowski Sep 8, 2025
f8e4e08
Merge pull request #66 from PKTTTeam/feat/validate-jwt-token
florczaq Sep 8, 2025
7752be4
fix: changed docker compose to automatically build backend and run al…
Michal-Piotrkowski Sep 8, 2025
53a5df2
fix: take profile from .env
Michal-Piotrkowski Sep 8, 2025
5132503
fix: remove error with copy
Michal-Piotrkowski Sep 8, 2025
c173dcb
Merge pull request #67 from PKTTTeam/fix/docker-improve
florczaq Sep 8, 2025
95d030b
Merge branch 'deploy' into main
florczaq Sep 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
SPRING_PROFILES_ACTIVE: ${{ secrets.SPRING_PROFILES_ACTIVE }}
EMAIL_USERNAME: ${{ secrets.EMAIL_USERNAME }}
EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
JWT_SECRET_KEY: ${{secrets.JWT_SECRET_KEY}}

steps:
- name: Checkout code
Expand Down Expand Up @@ -112,4 +113,4 @@ jobs:
cache-to: type=gha,mode=max
build-args: |
EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }}
EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}
EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target/
.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
logs/*

### STS ###
.apt_generated
Expand Down
10 changes: 10 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
version: "3.9"
services:
app:
build:
context: .
dockerfile: Dockerfile
container_name: pkwmtt-backend
ports:
- "8080:8080"
restart: always
environment:
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}
db:
image: mysql
environment:
Expand Down
Loading