31-api--patch---endpoint-student

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 
+### Project specific
 application.yml

README.md

@@ -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-----

src/main/java/com/booleanuk/Main.java

@@ -8,6 +8,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -69,7 +70,20 @@ public void run(String... args) {
         }
         Profile studentProfile;
         if (!this.profileRepository.existsById(1)) {
-            studentProfile = this.profileRepository.save(new Profile(studentUser, "Joe", "Bloggs", "Hello world!", "student1"));
+            studentProfile = this.profileRepository.save(new Profile(studentUser,
+                    "Joe",
+                    "Bloggs",
+                    "usrname",
+                    "mygit",
+                    "95555",
+                    "Hello world!",
+                    studentRole,
+                    "Backend Development",
+                    cohort,
+                    LocalDate.of(2025, 9, 8),
+                    LocalDate.of(2026, 9, 8),
+                    "fnwjkdnfj32.,."
+            ));
         } else {
             studentProfile = this.profileRepository.findById(1).orElse(null);
         }
@@ -84,7 +98,20 @@ public void run(String... args) {
         }
         Profile teacherProfile;
         if (!this.profileRepository.existsById(2)) {
-            teacherProfile = this.profileRepository.save(new Profile(teacherUser, "Rick", "Sanchez", "Hello there!", "teacher1"));
+            teacherProfile = this.profileRepository.save(new Profile(teacherUser,
+                    "Joe",
+                    "Bloggs",
+                    "usrname",
+                    "mygit",
+                    "95555",
+                    "Hello world!",
+                    teacherRole,
+                    "Backend Development",
+                    cohort,
+                    LocalDate.of(2025, 9, 8),
+                    LocalDate.of(2026, 9, 8),
+                    "fnwjkdnfj32.,."
+            ));
         } else {
             teacherProfile = this.profileRepository.findById(2).orElse(null);
         }

src/main/java/com/booleanuk/cohorts/controllers/AuthController.java

@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+//fixed issue with login.
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 @RequestMapping
@@ -69,6 +70,17 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signupRe
         if (userRepository.existsByEmail(signupRequest.getEmail())) {
             return ResponseEntity.badRequest().body(new MessageResponse("Error: Email is already in use!"));
         }
+
+
+        String emailRegex = "^\\w+([.-]?\\w+)*@\\w+([.-]?\\w+)*(\\.\\w{2,3})+$";
+        String passwordRegex = "^(?=.*[A-Z])(?=.*[0-9])(?=.*[#?!@$%^&-]).{8,}$";
+
+        if(!signupRequest.getEmail().matches(emailRegex))
+            return ResponseEntity.badRequest().body(new MessageResponse("Email is incorrectly formatted"));
+
+        if(!signupRequest.getPassword().matches(passwordRegex))
+            return  ResponseEntity.badRequest().body(new MessageResponse("Password is incorrectly formatted"));
+
         // Create a new user add salt here if using one
         User user = new User(signupRequest.getEmail(), encoder.encode(signupRequest.getPassword()));
         if (signupRequest.getCohort() != null) {

src/main/java/com/booleanuk/cohorts/controllers/CohortController.java

@@ -1,10 +1,7 @@
 package com.booleanuk.cohorts.controllers;
 
-import com.booleanuk.cohorts.models.Cohort;
-import com.booleanuk.cohorts.payload.response.CohortListResponse;
-import com.booleanuk.cohorts.payload.response.CohortResponse;
-import com.booleanuk.cohorts.payload.response.ErrorResponse;
-import com.booleanuk.cohorts.payload.response.Response;
+import com.booleanuk.cohorts.models.*;
+import com.booleanuk.cohorts.payload.response.*;
 import com.booleanuk.cohorts.repository.CohortRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -28,7 +25,7 @@ public ResponseEntity<CohortListResponse> getAllCohorts() {
     @GetMapping("{id}")
     public ResponseEntity<Response> getCohortById(@PathVariable int id) {
         Cohort cohort = this.cohortRepository.findById(id).orElse(null);
-        if (cohort == null) {
+        if (cohort == null || cohort.getUsers().isEmpty()) {
             ErrorResponse error = new ErrorResponse();
             error.set("not found");
             return new ResponseEntity<>(error, HttpStatus.NOT_FOUND);