Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
28c85be
test commit
fanden Aug 27, 2025
786d1a5
Update README.md
magnusgit1 Aug 27, 2025
3578fd7
Added checks for password and email
Richard-Persson Sep 3, 2025
03fc428
created profileController, added mobile field to Profile
fanden Sep 3, 2025
7536b5f
Changed logic for if statements
Richard-Persson Sep 3, 2025
136e3c5
createProfile now correctly handles errors
fanden Sep 3, 2025
dae7c7d
Added error message for name validation
fanden Sep 3, 2025
a7b6174
Fixed login
Sep 5, 2025
797a1d7
Merge pull request #6 from emazau/POST-LOGIN
magnusgit1 Sep 5, 2025
db42e07
Merge pull request #5 from boolean-uk/1-api--post--register-new-user
magnusgit1 Sep 5, 2025
3b67eeb
Updated Profile class, ProfileController and test profiles in Main to…
fanden Sep 8, 2025
4281e1b
Fixed Profile class
fanden Sep 8, 2025
3d24685
Merge pull request #8 from boolean-uk/4-api---post---endpoint-for-pro…
magnusgit1 Sep 8, 2025
1091f04
Class diagram
emazau Sep 10, 2025
37e04c9
added patchmapping to ProfileController
magnusgit1 Sep 10, 2025
1453e98
Added a course model, and a link between Cohort and courses
Richard-Persson Sep 11, 2025
c5da59d
fixed patch, added foreign keys to profile and user
magnusgit1 Sep 11, 2025
500226d
Added new Comments table and added GET POST PUT AND DELETE to COMMENTs
Sep 11, 2025
d38a217
fixed foreign-keys in profile and added cohort as part of the user-patch
magnusgit1 Sep 11, 2025
0cbba95
Added Like attribute and post and delete mapping for increase and dec…
Sep 11, 2025
2676ee6
Merge pull request #16 from boolean-uk/12-api---create-course-model-a…
magnusgit1 Sep 11, 2025
c820147
Changed cohort and user model, + cohortController
Richard-Persson Sep 11, 2025
a2f0e8b
fixed name-issue in userId and fixed order of arguments in profile-co…
magnusgit1 Sep 12, 2025
6c4f00f
updated if statement
Richard-Persson Sep 12, 2025
5f0cbc0
Merge pull request #19 from boolean-uk/FIX/update-data-and-endpoint-f…
magnusgit1 Sep 12, 2025
d1c3402
Merge pull request #18 from boolean-uk/COMMENT-GETPUTPOSTDELETE
magnusgit1 Sep 12, 2025
4bc215d
Merge pull request #23 from boolean-uk/ADD-LIKE-ATTRIBUTE
magnusgit1 Sep 12, 2025
dd5ee43
Merge branch 'main' into 7-api---get-cohorts-page---student
Richard-Persson Sep 12, 2025
55acadc
Updated JsonIgnoreProperties typo to avoid infinite loop
Richard-Persson Sep 12, 2025
50ed2ce
Merge pull request #22 from boolean-uk/7-api---get-cohorts-page---stu…
magnusgit1 Sep 12, 2025
09e7319
Fixed bugs
Sep 12, 2025
c85230d
added get cohorts to cohortsController
fanden Sep 15, 2025
6b63b4f
Fixed json ignore properties
Richard-Persson Sep 15, 2025
c2b7eb9
Merge pull request #24 from boolean-uk/quick_fix
emazau Sep 16, 2025
3565f74
minor changes made in ProfileController to give correct data in DB
moueedAli Sep 16, 2025
cbad252
Merge pull request #25 from boolean-uk/FIX/minor-changes-in-profileCo…
emazau Sep 16, 2025
f7d67ca
fixed variables in record class
magnusgit1 Sep 16, 2025
ff8f2dc
Merge pull request #28 from boolean-uk/FIX/minor-change-in-profile-co…
emazau Sep 16, 2025
dfd1960
Added Endpoint for courses
Sep 16, 2025
9658d96
Merge pull request #33 from boolean-uk/27-api---endpoint-course
Richard-Persson Sep 16, 2025
f5809a8
small update
fanden Sep 16, 2025
c65247e
added get cohorts to cohortsController
fanden Sep 15, 2025
63a20f2
small update
fanden Sep 16, 2025
950f9b6
Added Endpoint for Student profile
Sep 16, 2025
5d9384c
Added encoder for password
Sep 16, 2025
f9b2db8
Added check for student-role
Sep 16, 2025
c4a8d2d
added delete in userController, fixed mappings in models to ensure ca…
magnusgit1 Sep 16, 2025
b7f61fd
Fixed hard coded postst and posts
Sep 16, 2025
191d91f
Merge branch 'main' into fixed-hardcoded-posts
emazau Sep 16, 2025
e890269
Merge pull request #34 from boolean-uk/31-api---patch---endpoint-student
emazau Sep 16, 2025
786b40d
Merge pull request #37 from boolean-uk/fixed-hardcoded-posts
emazau Sep 16, 2025
c2bd63a
working
fanden Sep 16, 2025
d47a65c
working
fanden Sep 16, 2025
5f23464
added getmappings to retrieve profiles
magnusgit1 Sep 16, 2025
e5140b1
changed cohort to contain profiles and not users
Richard-Persson Sep 16, 2025
ef0596f
Merge pull request #42 from boolean-uk/fix_Cohort
Richard-Persson Sep 16, 2025
86d501d
Merge branch 'main' into FIX/make-users-and-profiles-deletable
Richard-Persson Sep 16, 2025
fd2961c
Merge pull request #38 from boolean-uk/FIX/make-users-and-profiles-de…
Richard-Persson Sep 16, 2025
3cefb15
Merge pull request #41 from boolean-uk/API/getmapping-for-profile-con…
Richard-Persson Sep 16, 2025
ca8c475
Made the posts to work
Sep 16, 2025
130ca1b
Merge pull request #40 from boolean-uk/9-api---get---cohorts-endpoint…
Richard-Persson Sep 16, 2025
c042724
Merge pull request #44 from boolean-uk/POSTS-made-it-work
emazau Sep 16, 2025
f63ecdd
Merge pull request #15 from boolean-uk/classdiagram
emazau Sep 16, 2025
d8f2dfa
remove postrequest
Sep 16, 2025
1020d0f
first
magnusgit1 Sep 16, 2025
737d823
fixed bio length in profile
magnusgit1 Sep 17, 2025
1f2cba2
Added student to a Cohort
Sep 17, 2025
5c9e92d
added comments, posts and likedposts to user and fixed json-loops
magnusgit1 Sep 17, 2025
e392411
added search endoint for profiles
fanden Sep 17, 2025
571fdc5
Added get students
Sep 17, 2025
140ceef
added templates
magnusgit1 Sep 17, 2025
c67f402
added md bodies
magnusgit1 Sep 17, 2025
68dd4a3
Merge pull request #56 from boolean-uk/36-api---search
fanden Sep 17, 2025
36db025
added deletemapping to postController
magnusgit1 Sep 17, 2025
031d071
Added patch for teachers editing student profiles
Richard-Persson Sep 17, 2025
e39fda1
added patchmapping
magnusgit1 Sep 17, 2025
08f3d8c
I created it so that name and lastname gets from the token when loggi…
Sep 17, 2025
18b6739
Merge pull request #49 from boolean-uk/API/make-bio-length-300-in-pro…
emazau Sep 17, 2025
96e993c
Merge pull request #51 from boolean-uk/45-api---post---add-student-to…
emazau Sep 17, 2025
5420fd1
Merge pull request #52 from boolean-uk/API/add-one-to-many-relation-i…
emazau Sep 17, 2025
e192475
Merge pull request #58 from boolean-uk/53-api---get---all-students
emazau Sep 17, 2025
1088796
Merge pull request #59 from boolean-uk/FEAT/issue-templates
emazau Sep 17, 2025
437d7bd
Merge pull request #61 from boolean-uk/API/add-deletemapping-to-postc…
emazau Sep 17, 2025
5b09941
Merge pull request #62 from boolean-uk/50-api---patch---teacher-updat…
emazau Sep 17, 2025
d5feb02
Added new endpoint and nullpointexception
Sep 17, 2025
927ec79
Merge pull request #64 from boolean-uk/FEAT/add-patchmapping-in-userc…
emazau Sep 17, 2025
a364f6f
Merge pull request #65 from boolean-uk/sorry-wrong-format
emazau Sep 17, 2025
1b9147f
Merge branch 'main' into 53-api---get---all-students
Isabelltran Sep 17, 2025
e5e653c
Merge pull request #66 from boolean-uk/53-api---get---all-students
emazau Sep 17, 2025
e9b1814
added Cohort Request
Sep 17, 2025
23cc06f
Fix merge bugs
Sep 17, 2025
7efe5a4
fixed bugs merge
Sep 17, 2025
8019cfb
Creating gradle build script
fanden Sep 17, 2025
6c81d2a
Update gradle.yml
fanden Sep 17, 2025
d4795b0
Update gradle.yml
fanden Sep 17, 2025
0468014
Update gradle.yml
fanden Sep 17, 2025
97eb648
removed template yml
magnusgit1 Sep 18, 2025
97d513e
fixed .md-files
magnusgit1 Sep 18, 2025
ba4d5cf
added start_date and end_date, started on edit Course
Sep 18, 2025
973541f
fix jsonignore loops
Sep 18, 2025
2977a05
Added GET all teachers
Sep 18, 2025
5185932
Merge pull request #67 from boolean-uk/54-api---get---all-teachers
Richard-Persson Sep 18, 2025
d61f858
fixed infinite loops again
Sep 18, 2025
dcd0a1c
Merge branch 'main' of https://github.com/boolean-uk/java-team-dev-se…
Sep 18, 2025
519cea9
Added Get teachers by Cohort ID
Sep 18, 2025
cb3155e
Merge branch 'main' into 60-api---get---all-teacher-in-cohort
Isabelltran Sep 18, 2025
d8cc0ae
Fixed so fields that are not included are overwritten with null
Sep 18, 2025
db9dba3
Merge pull request #72 from boolean-uk/71-fix-preserve-existing-value…
Richard-Persson Sep 18, 2025
a28e298
added note model, controller, repo and request
Richard-Persson Sep 18, 2025
03cb7f1
Fixed bugs and added unique email
Sep 18, 2025
4a261aa
Merge pull request #73 from boolean-uk/71-fix-preserve-existing-value…
Richard-Persson Sep 18, 2025
d06fe5a
added new classes
fanden Sep 18, 2025
c13dfec
Merge branch 'main' of github.com:boolean-uk/java-team-dev-server-250…
fanden Sep 18, 2025
62a614f
added patch to cohortController
magnusgit1 Sep 18, 2025
d7692e5
Updated post to actually save to the repository
Richard-Persson Sep 18, 2025
ad92a4e
Merge branch 'main' into 47-api---patch---edit-cohort
magnusgit1 Sep 18, 2025
221e9e1
Merge branch '69-api---notes' of github.com:boolean-uk/java-team-dev-…
Richard-Persson Sep 18, 2025
df382aa
Got an example test working
fanden Sep 18, 2025
f04fb7a
fixed brackets
magnusgit1 Sep 18, 2025
7e44f2b
Merge pull request #68 from boolean-uk/60-api---get---all-teacher-in-…
Richard-Persson Sep 18, 2025
5a1d044
Merge pull request #75 from boolean-uk/69-api---notes
emazau Sep 18, 2025
1a11bdc
Merge pull request #74 from boolean-uk/47-api---patch---edit-cohort
Richard-Persson Sep 18, 2025
86f4bc9
minor fix in user/profile
Richard-Persson Sep 18, 2025
3cc2fe4
Merge pull request #76 from boolean-uk/minor_fix_to_user_profile_role
emazau Sep 18, 2025
f170584
New features to posts pages
Sep 18, 2025
8597f1f
Merge pull request #77 from boolean-uk/Posts-pages-new-features
emazau Sep 18, 2025
ed2d1fc
Added user role to token
Sep 19, 2025
02b00ac
Merge pull request #80 from boolean-uk/79-feature-create-role-id-into…
emazau Sep 19, 2025
3d13acb
Fixed relations
magnusgit1 Sep 19, 2025
63b4d4f
fixed everything!
magnusgit1 Sep 19, 2025
3af0b63
minor fix in getStudents
magnusgit1 Sep 19, 2025
233c2ef
Merge pull request #81 from boolean-uk/API/change-cohort-course-relat…
emazau Sep 19, 2025
a79ac15
fixed users
Sep 19, 2025
eb7640d
written tests for ProfileController and SearchController
fanden Sep 19, 2025
c9d11e8
bug fixes
Sep 19, 2025
6838624
Deleted date from profile, cohort and related files. added date to co…
Richard-Persson Sep 22, 2025
366e7cf
Increased the length the photo attribute can have in the db
Richard-Persson Sep 22, 2025
a806d58
Added tests for ProfileController and UserController
fanden Sep 22, 2025
ffdac48
fixed refresh of tokens, and added fields to JWT token
Sep 22, 2025
334259c
Merge pull request #84 from boolean-uk/92_REFRESH_of_Token_and_new_fi…
emazau Sep 22, 2025
595a14b
Merge pull request #83 from boolean-uk/82-api---endpoint---profile-co…
emazau Sep 22, 2025
574d1c6
fix bug for merge
Sep 22, 2025
73c1f7c
merge bug
Sep 22, 2025
f9aa8cb
Delete .github/workflows directory
emazau Sep 22, 2025
ae52ba1
please work
Sep 22, 2025
a287b6c
Merge branch 'main' of https://github.com/boolean-uk/java-team-dev-se…
Sep 22, 2025
3f6edc2
Merge branch 'main' of https://github.com/boolean-uk/java-team-dev-se…
Sep 22, 2025
02fa1e0
fixed enddate and stratdate
Sep 23, 2025
34e848e
Fixed delete logic for users
magnusgit1 Sep 23, 2025
89ecea9
Merge branch 'main' into FIX/delete-fix
magnusgit1 Sep 23, 2025
ebf7493
small change in StudentController
moueedAli Sep 23, 2025
65c326f
added PATCH in TeacherController
moueedAli Sep 23, 2025
557aa13
Merge pull request #85 from boolean-uk/FIX/delete-fix
emazau Sep 23, 2025
611db90
Merge pull request #87 from boolean-uk/feat/added-PATCH-for-teacher-p…
emazau Sep 23, 2025
6379ab2
fixed deletion in user/posts
magnusgit1 Sep 23, 2025
0980390
fixed delete
magnusgit1 Sep 23, 2025
aa31523
Merge pull request #89 from boolean-uk/FIX/fix-deletion
moueedAli Sep 24, 2025
4f85673
Fixed add new student
Sep 24, 2025
66187b3
Merge pull request #90 from boolean-uk/quick_fix_add_student
emazau Sep 24, 2025
b585bbc
added tests
fanden Sep 24, 2025
3957470
added workflow for building back
fanden Sep 24, 2025
98637a9
updated gradle workflow from JDK 17 to 22
fanden Sep 24, 2025
470583b
written tests for ProfileController and SearchController
fanden Sep 19, 2025
9060b98
Added tests for ProfileController and UserController
fanden Sep 22, 2025
179cc31
added tests
fanden Sep 24, 2025
d0e35fe
added deletemapping to CohortController
magnusgit1 Sep 24, 2025
00e8a64
Merge pull request #92 from boolean-uk/API/delete-cohort
emazau Sep 24, 2025
72715bb
added dates to cohort
Richard-Persson Sep 24, 2025
fcca06c
removed unused imports
Richard-Persson Sep 24, 2025
da30a71
Merge pull request #93 from boolean-uk/add_dates_to_cohort
emazau Sep 24, 2025
135c3ed
done with more than 50% test coverage
fanden Sep 24, 2025
cf1958b
done
fanden Sep 24, 2025
628b807
Update gradle.yml
fanden Sep 24, 2025
504944c
Update gradle.yml
fanden Sep 24, 2025
6bd923e
Merge pull request #94 from boolean-uk/70-api---automated-testing
fanden Sep 24, 2025
ea735a5
tokenrefresh bug fix
Sep 24, 2025
3d43c01
Merge branch 'main' of https://github.com/boolean-uk/java-team-dev-se…
Sep 24, 2025
3600d07
fix main
Sep 24, 2025
ef36b36
removed formatting
Richard-Persson Sep 24, 2025
e94c271
Merge pull request #95 from boolean-uk/format_date
Richard-Persson Sep 24, 2025
3b226af
changed if statement to make edit cohort work
Richard-Persson Sep 25, 2025
eed1c0b
removed printstatement
Richard-Persson Sep 25, 2025
cb4819c
Merge pull request #96 from boolean-uk/edit_post_cohort_if_statement
Richard-Persson Sep 25, 2025
b2f3f40
updated patch studentController
Richard-Persson Sep 25, 2025
94cb8bf
Merge pull request #97 from boolean-uk/update_patch_student_controller
Richard-Persson Sep 25, 2025
d30fdf4
updated logic in patch studentController
Richard-Persson Sep 25, 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
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: "🐞 Bug Fix"
about: "Report a bug or something that is not working as expected"
title: "[FIX] "
labels: bug
assignees: ""
---

## 🐛 Bug Description
A clear and concise description of what the bug is.

## 🔄 Steps to Reproduce
Steps to reproduce the behavior:
1. Go to ...
2. Click on ...
3. See error ...

## ✅ Expected Behavior
What should have happened instead?

## 📸 Screenshots / Logs
If applicable, add screenshots or error messages.

## 🖥️ Environment
- OS:
- Version:
- Other relevant info:
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: "✨ Feature Request"
about: "Suggest a new feature or improvement"
title: "[FEATURE] "
labels: enhancement
assignees: ""
---

## ✨ Description
What would you like to add or improve?

## 🎯 Use Case
Why is this useful? Who benefits from it?

## 💡 Proposed Solution
How could this be implemented? (optional)

## 📎 Additional Info
Anything else you’d like to share? (related issues, links, references, etc.)
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "📌 Other"
about: "Questions, discussions, or anything else"
title: "[OTHER] "
labels: question
assignees: ""
---

## 📌 Description
What is this about?

## 🌍 Context
Why is this relevant?

## 📎 Additional Info
Anything else that might be useful.
43 changes: 43 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle

name: Java CI with Gradle

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read

steps:
- uses: actions/checkout@v4
- name: Set up JDK 22
uses: actions/setup-java@v4
with:
java-version: '22'
distribution: 'temurin'

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
- name: Setup Gradle
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: Build with Gradle Wrapper
run: ./gradlew build --exclude-task test

- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
name: Package
path: build/libs
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ out/
### VS Code ###
.vscode/

### Project specific
application.yml
build
.DS_Store
application-azuread.yml
Maincopy.md
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ Once you are fully up to speed and working on the project it is perfectly accept

Once you have your teams set up, enjoy working on the code.

We look forward to seeing what you manage to produce from it!
We look forward to seeing what you manage to produce from it!

----Test access Magnus-----
10 changes: 10 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ dependencies {
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

// https://mvnrepository.com/artifact/org.springframework/spring-test
testImplementation 'org.springframework:spring-test'
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testImplementation 'org.junit.jupiter:junit-jupiter-api'
// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testImplementation 'org.junit.jupiter:junit-jupiter-engine'
// https://mvnrepository.com/artifact/com.h2database/h2
testImplementation 'com.h2database:h2'


// https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api
implementation 'jakarta.validation:jakarta.validation-api:3.1.1'
}
Expand Down
Binary file added image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading