Setup Authorization and Set Roles to Funtions

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/controller/AuthController.java

@@ -0,0 +1,116 @@
+package pl.dmcs.eldarmuk.backend_springboot.controller;
+
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.bind.annotation.*;
+import pl.dmcs.eldarmuk.backend_springboot.message.request.LoginForm;
+import pl.dmcs.eldarmuk.backend_springboot.message.request.SignUpForm;
+import pl.dmcs.eldarmuk.backend_springboot.message.response.JwtResponse;
+import pl.dmcs.eldarmuk.backend_springboot.message.response.ResponseMessage;
+import pl.dmcs.eldarmuk.backend_springboot.model.*;
+import pl.dmcs.eldarmuk.backend_springboot.repository.*;
+import pl.dmcs.eldarmuk.backend_springboot.security.jwt.JwtProvider;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@RestController
+@CrossOrigin(origins = "http://localhost:4200")
+@RequestMapping("/auth")
+public class AuthController {
+    private DaoAuthenticationProvider daoAuthenticationProvider;
+    private AccountRepository accountRepository;
+    private StudentRepository studentRepository;
+    private TeacherRepository teacherRepository;
+    private RoleRepository roleRepository;
+    private PasswordEncoder passwordEncoder;
+    private JwtProvider jwtProvider;
+
+    @Autowired
+    public AuthController(DaoAuthenticationProvider daoAuthenticationProvider, AccountRepository accountRepository, StudentRepository studentRepository, TeacherRepository teacherRepository, RoleRepository roleRepository, PasswordEncoder passwordEncoder, JwtProvider jwtProvider) {
+        this.daoAuthenticationProvider = daoAuthenticationProvider;
+        this.accountRepository = accountRepository;
+        this.studentRepository = studentRepository;
+        this.teacherRepository = teacherRepository;
+        this.roleRepository = roleRepository;
+        this.passwordEncoder = passwordEncoder;
+        this.jwtProvider = jwtProvider;
+    }
+
+    @PostMapping("/signin")
+    public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginForm loginRequest) {
+        Authentication authentication = daoAuthenticationProvider.authenticate(
+                new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getPassword()));
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+        String jwt = jwtProvider.generateJwtToken(authentication);
+        UserDetails userDetails = (UserDetails) authentication.getPrincipal();
+        return ResponseEntity.ok(new JwtResponse(jwt, userDetails.getUsername(), userDetails.getAuthorities()));
+    }
+
+    @PostMapping("/signup")
+    public ResponseEntity<?> registerUser(@Valid @RequestBody SignUpForm signUpRequest) {
+        if (accountRepository.existsByUsername(signUpRequest.getUsername())) {
+            return new ResponseEntity<>(new ResponseMessage("Fail -> Username is already taken."), HttpStatus.BAD_REQUEST);
+        }
+        Account user = new Account(signUpRequest.getUsername(), passwordEncoder.encode(signUpRequest.getPassword()));
+        Set<String> strRoles = signUpRequest.getRole();
+        Set<Role> roles = new HashSet<>();
+        strRoles.forEach(role -> {
+            switch (role) {
+                case "admin":
+                    Role adminRole = roleRepository.findByName(RoleName.ROLE_ADMIN)
+                            .orElseThrow(() -> new RuntimeException("Fail -> Cause: Admin Role not found."));
+                    roles.add(adminRole);
+                    break;
+                case "teacher":
+                    Role teacherRole = roleRepository.findByName(RoleName.ROLE_TEACHER)
+                            .orElseThrow(() -> new RuntimeException("Fail -> Cause: Teacher Role not found."));
+                    roles.add(teacherRole);
+                    break;
+                case "student":
+                    Role studentRole = roleRepository.findByName(RoleName.ROLE_STUDENT)
+                            .orElseThrow(() -> new RuntimeException("Fail -> Cause: Student Role not found."));
+                    roles.add(studentRole);
+                    break;
+                default:
+                    throw new RuntimeException("Fail -> Cause: Role not found.");
+            }
+        });
+        user.setRoles(roles);
+        accountRepository.save(user);
+        Set<Role> accountRoles = user.getRoles();
+        for (Role role : accountRoles) {
+            if (role.getName().equals(RoleName.ROLE_STUDENT)) {
+                Student student = new Student();
+                student.setFirstname(signUpRequest.getFirstname());
+                student.setLastname(signUpRequest.getLastname());
+                student.setAccount(user);
+                studentRepository.save(student);
+            } else if (role.getName().equals(RoleName.ROLE_TEACHER)) {
+                Teacher teacher = new Teacher();
+                teacher.setFirstname(signUpRequest.getFirstname());
+                teacher.setLastname(signUpRequest.getLastname());
+                teacher.setAccount(user);
+                teacherRepository.save(teacher);
+            }
+        }
+
+        return new ResponseEntity<>(new ResponseMessage("User registered successfully."), HttpStatus.OK);
+    }
+
+    @DeleteMapping("/{id}")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<?> deleteAccount(@PathVariable Long id) {
+        accountRepository.deleteById(id);
+        return new ResponseEntity<>(new ResponseMessage("Account deleted successfully."), HttpStatus.OK);
+    }
+}

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/controller/GradeController.java

@@ -3,7 +3,10 @@ package pl.dmcs.eldarmuk.backend_springboot.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletRequest;
 import pl.dmcs.eldarmuk.backend_springboot.model.Account;
 import pl.dmcs.eldarmuk.backend_springboot.model.Grade;
 import pl.dmcs.eldarmuk.backend_springboot.model.Student;
@@ -11,6 +14,7 @@ import pl.dmcs.eldarmuk.backend_springboot.repository.AccountRepository;
 import pl.dmcs.eldarmuk.backend_springboot.repository.GradeRepository;
 import pl.dmcs.eldarmuk.backend_springboot.repository.StudentRepository;
 
+import java.security.Principal;
 import java.util.List;
 
 @RestController
@@ -29,24 +33,23 @@ public class GradeController {
     }
 
     @GetMapping(value = "/subject/{id}")
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
     public List<Grade> findGradesBySubject(@PathVariable("id") long id){
         return gradeRepository.findGradesBySubjectId(id);
     }
 
-    @GetMapping(value = "/student/{username}")
-    public ResponseEntity<List<Grade>> findGradesByStudent(@PathVariable("username") String username){
-        try {
-            Account account = accountRepository.findByUsername(username)
-                    .orElseThrow(() -> new RuntimeException("Error: User not found!"));
-            Student student = studentRepository.findByAccountUsername(account.getUsername());
-            List<Grade> grades = gradeRepository.findGradesByStudentId(student.getId());
-            return new ResponseEntity<>(grades, HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-        }
+    @GetMapping(value = "/student")
+    @PreAuthorize("hasRole('ROLE_STUDENT')")
+    public List<Grade> findGradesByStudent(HttpServletRequest request){
+        Principal principal = request.getUserPrincipal();
+        Account account = accountRepository.findByUsername(principal.getName()).orElseThrow(() 
+                -> new RuntimeException("Error: User is not logged in or not found!"));
+        Student student = studentRepository.findByAccountUsername(account.getUsername());
+        return gradeRepository.findGradesByStudentId(student.getId());
     }
 
     @PostMapping
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
     public ResponseEntity<Grade> addGrade(@RequestBody Grade grade){
         try {
             gradeRepository.save(grade);
@@ -57,6 +60,7 @@ public class GradeController {
     }
 
     @PatchMapping(value = "/edit/{id}")
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
     public ResponseEntity<Grade> editGrade(@PathVariable("id") long id, @RequestBody java.util.Map<String, Double> body){
         try {
             Grade currentGrade = gradeRepository.findById(id);

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/controller/StudentController.java

@@ -1,7 +1,6 @@
 package pl.dmcs.eldarmuk.backend_springboot.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,16 +25,6 @@ public class StudentController {
         return studentRepository.findAll();
     }
 
-    @PostMapping
-    public ResponseEntity<Student> createStudent(@RequestBody Student student) {
-        try {
-            Student savedStudent = studentRepository.save(student);
-            return new ResponseEntity<>(savedStudent, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
     @DeleteMapping("/{id}")
     public ResponseEntity<?> deleteStudent(@PathVariable("id") long id) {
         try {

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/controller/SubjectController.java

@@ -3,13 +3,19 @@ package pl.dmcs.eldarmuk.backend_springboot.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletRequest;
+import pl.dmcs.eldarmuk.backend_springboot.message.response.ResponseMessage;
+import pl.dmcs.eldarmuk.backend_springboot.model.Account;
 import pl.dmcs.eldarmuk.backend_springboot.model.Subject;
 import pl.dmcs.eldarmuk.backend_springboot.model.Teacher;
 import pl.dmcs.eldarmuk.backend_springboot.repository.AccountRepository;
 import pl.dmcs.eldarmuk.backend_springboot.repository.SubjectRepository;
 import pl.dmcs.eldarmuk.backend_springboot.repository.TeacherRepository;
 
+import java.security.Principal;
 import java.util.List;
 
 @RestController
@@ -33,6 +39,7 @@ public class SubjectController {
     }
 
     @GetMapping(value = "/{id}")
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
     public ResponseEntity<Subject> findSubject(@PathVariable("id") long id){
         try {
             Subject subject = subjectRepository.findById(id);
@@ -47,14 +54,32 @@ public class SubjectController {
         }
     }
 
+    @GetMapping(value = "/teacher")
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
+    public List<Subject> findSubjectsByTeacher(HttpServletRequest request){
+        Principal principal = request.getUserPrincipal();
+        Account account = accountRepository.findByUsername(principal.getName()).orElseThrow(() 
+                -> new RuntimeException("Error: User is not logged in or not found!"));
+        Teacher teacher = teacherRepository.findByAccountUsername(account.getUsername());
+        return teacher.getSubjects();
+    }
+
     @PostMapping
-    public ResponseEntity<?> addSubject(@RequestBody Subject subject){
+    @PreAuthorize("hasRole('ROLE_TEACHER')")
+    public ResponseEntity<?> addSubject(@RequestBody Subject subject, HttpServletRequest request){
         try {
             if(subjectRepository.existsByName(subject.getName())){
-                return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+                return new ResponseEntity<>(new ResponseMessage("Fail -> This subject already exists"), 
+                    HttpStatus.BAD_REQUEST);
             }
+            Principal principal = request.getUserPrincipal();
+            Account account = accountRepository.findByUsername(principal.getName()).orElseThrow(() -> new RuntimeException("Error: User is not logged in or not found!"));
+            System.out.println(account.getUsername());
+            System.out.println(subject);
+            Teacher teacher = teacherRepository.findByAccountUsername(account.getUsername());
+            subject.setTeacher(teacher);
             subjectRepository.save(subject);
-            return new ResponseEntity<>(subject, HttpStatus.CREATED);
+            return new ResponseEntity<Subject>(subject, HttpStatus.CREATED);
         } catch (Exception e) {
             System.out.println("Error adding subject: " + e.getMessage());
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/controller/TeacherController.java

@@ -4,8 +4,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
+import pl.dmcs.eldarmuk.backend_springboot.model.Grade;
+import pl.dmcs.eldarmuk.backend_springboot.model.Subject;
 import pl.dmcs.eldarmuk.backend_springboot.model.Teacher;
+import pl.dmcs.eldarmuk.backend_springboot.repository.GradeRepository;
 import pl.dmcs.eldarmuk.backend_springboot.repository.TeacherRepository;
+import pl.dmcs.eldarmuk.backend_springboot.repository.SubjectRepository;
 
 import java.util.List;
 
@@ -13,11 +18,15 @@ import java.util.List;
 @CrossOrigin(origins = "http://localhost:4200")
 @RequestMapping("/teachers")
 public class TeacherController {
-    private final TeacherRepository teacherRepository;
+    private TeacherRepository teacherRepository;
+    private GradeRepository gradeRepository;
+    private SubjectRepository subjectRepository;
 
     @Autowired
-    public TeacherController(TeacherRepository teacherRepository) {
+    public TeacherController(TeacherRepository teacherRepository, GradeRepository gradeRepository, SubjectRepository subjectRepository) {
         this.teacherRepository = teacherRepository;
+        this.gradeRepository = gradeRepository;
+        this.subjectRepository = subjectRepository;
     }
 
     @GetMapping
@@ -37,16 +46,6 @@ public class TeacherController {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
-    
-    @PostMapping
-    public ResponseEntity<Teacher> createTeacher(@RequestBody Teacher teacher) {
-        try {
-            Teacher savedTeacher = teacherRepository.save(teacher);
-            return new ResponseEntity<>(savedTeacher, HttpStatus.CREATED);
-        } catch (Exception e) {
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
 
     @DeleteMapping("/{id}")
     public ResponseEntity<?> deleteTeacher(@PathVariable("id") long id) {
@@ -55,6 +54,13 @@ public class TeacherController {
             if (teacher == null) {
                 return ResponseEntity.notFound().build();
             }
+            List<Subject> subjects = teacher.getSubjects();
+            List<Grade> grades;
+            for (Subject subject : subjects){
+                grades = gradeRepository.findGradesBySubjectId(subject.getId());
+                gradeRepository.deleteAll(grades);
+                subjectRepository.delete(subject);
+            }
             teacherRepository.deleteById(id);
             return ResponseEntity.ok(teacher);
         } catch (Exception e) {

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/model/Student.java

@@ -37,19 +37,19 @@ public class Student {
         this.id = id;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstname;
     }
 
-    public void setFirstName(String firstname) {
+    public void setFirstname(String firstname) {
         this.firstname = firstname;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastname;
     }
 
-    public void setLastName(String lastname) {
+    public void setLastname(String lastname) {
         this.lastname = lastname;
     }
 

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/model/Teacher.java

@@ -37,19 +37,19 @@ public class Teacher {
         this.id = id;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstname;
     }
 
-    public void setFirstName(String firstname) {
+    public void setFirstname(String firstname) {
         this.firstname = firstname;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastname;
     }
 
-    public void setLastName(String lastname) {
+    public void setLastname(String lastname) {
         this.lastname = lastname;
     }
 

project/backend_springboot/src/main/java/pl/dmcs/eldarmuk/backend_springboot/security/WebSecurityConfig.java

@@ -1,6 +1,5 @@
 package pl.dmcs.eldarmuk.backend_springboot.security;
 
-import jakarta.servlet.DispatcherType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -72,9 +71,4 @@ public class WebSecurityConfig {
         http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class);
         return http.build();
     }
-}
-
-
-
-
-
+}

project/backend_springboot/src/main/resources/application.properties

@@ -31,8 +31,8 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialec
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
 #To change logging levels in the app
- logging.level.org.springframework.web = trace
- logging.level.org.hibernate = trace
+# logging.level.org.springframework.web = trace
+# logging.level.org.hibernate = trace
 
 # IMPORTANT: to use data.sql file has to be uncommented
 #spring.sql.init.mode = always

tasks/task_2_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentController.java

@@ -20,7 +20,7 @@ public class StudentController {
 
     @RequestMapping(value = "/addStudent.html", method = RequestMethod.POST)
     public String addStudent(@ModelAttribute("student") Student student) {
-        System.out.println(student.getFirstName() + " " + student.getLastName() + " " +
+        System.out.println(student.getFirstname() + " " + student.getLastname() + " " +
                 student.getEmail() + " " + student.getPhoneNumber());
         return "redirect:student";
     }

tasks/task_2_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/model/Student.java

@@ -22,19 +22,19 @@ public class Student {
         this.email = email;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastname(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstname(String firstName) {
         this.firstName = firstName;
     }
 }

tasks/task_3_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentController.java

@@ -20,7 +20,7 @@ public class StudentController {
 
     @RequestMapping(value = "/addStudent.html", method = RequestMethod.POST)
     public String addStudent(@ModelAttribute("student") Student student) {
-        System.out.println(student.getFirstName() + " " + student.getLastName() + " " +
+        System.out.println(student.getFirstname() + " " + student.getLastname() + " " +
                 student.getEmail() + " " + student.getPhoneNumber());
         return "redirect:student";
     }

tasks/task_3_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentRESTController.java

@@ -94,10 +94,10 @@ public class StudentRESTController {
 
     private void partialUpdate(Student student, Map<String, Object> updates) {
         if (updates.containsKey("firstName")) {
-            student.setFirstName((String) updates.get("firstName"));
+            student.setFirstname((String) updates.get("firstName"));
         }
         if (updates.containsKey("lastName")) {
-            student.setLastName((String) updates.get("lastName"));
+            student.setLastname((String) updates.get("lastName"));
         }
         if (updates.containsKey("email")) {
             student.setEmail((String) updates.get("email"));

tasks/task_3_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/model/Student.java

@@ -31,19 +31,19 @@ public class Student {
         this.email = email;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastname(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstname(String firstName) {
         this.firstName = firstName;
     }
 

tasks/task_4_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentController.java

@@ -20,7 +20,7 @@ public class StudentController {
 
     @RequestMapping(value = "/addStudent.html", method = RequestMethod.POST)
     public String addStudent(@ModelAttribute("student") Student student) {
-        System.out.println(student.getFirstName() + " " + student.getLastName() + " " +
+        System.out.println(student.getFirstname() + " " + student.getLastname() + " " +
                 student.getEmail() + " " + student.getPhoneNumber());
         return "redirect:student";
     }

tasks/task_4_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentRESTController.java

@@ -361,10 +361,10 @@ public class StudentRESTController {
 
     private void partialUpdate(Student student, Map<String, Object> updates) {
         if (updates.containsKey("firstName")) {
-            student.setFirstName((String) updates.get("firstName"));
+            student.setFirstname((String) updates.get("firstName"));
         }
         if (updates.containsKey("lastName")) {
-            student.setLastName((String) updates.get("lastName"));
+            student.setLastname((String) updates.get("lastName"));
         }
         if (updates.containsKey("email")) {
             student.setEmail((String) updates.get("email"));

tasks/task_4_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/model/Student.java

@@ -42,19 +42,19 @@ public class Student {
         this.email = email;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastname(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstname(String firstName) {
         this.firstName = firstName;
     }
 

tasks/task_6_7_angular_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentController.java

@@ -20,7 +20,7 @@ public class StudentController {
 
     @RequestMapping(value = "/addStudent.html", method = RequestMethod.POST)
     public String addStudent(@ModelAttribute("student") Student student) {
-        System.out.println(student.getFirstName() + " " + student.getLastName() + " " +
+        System.out.println(student.getFirstname() + " " + student.getLastname() + " " +
                 student.getEmail() + " " + student.getPhoneNumber());
         return "redirect:student";
     }

tasks/task_6_7_angular_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentRESTController.java

@@ -377,10 +377,10 @@ public class StudentRESTController {
 
     private void partialUpdate(Student student, Map<String, Object> updates) {
         if (updates.containsKey("firstName")) {
-            student.setFirstName((String) updates.get("firstName"));
+            student.setFirstname((String) updates.get("firstName"));
         }
         if (updates.containsKey("lastName")) {
-            student.setLastName((String) updates.get("lastName"));
+            student.setLastname((String) updates.get("lastName"));
         }
         if (updates.containsKey("email")) {
             student.setEmail((String) updates.get("email"));

tasks/task_6_7_angular_springboot/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/model/Student.java

@@ -42,19 +42,19 @@ public class Student {
         this.email = email;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastname(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstname(String firstName) {
         this.firstName = firstName;
     }
 

tasks/task_8_springboot_JWT/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentController.java

@@ -20,7 +20,7 @@ public class StudentController {
 
     @RequestMapping(value = "/addStudent.html", method = RequestMethod.POST)
     public String addStudent(@ModelAttribute("student") Student student) {
-        System.out.println(student.getFirstName() + " " + student.getLastName() + " " +
+        System.out.println(student.getFirstname() + " " + student.getLastname() + " " +
                 student.getEmail() + " " + student.getPhoneNumber());
         return "redirect:student";
     }

tasks/task_8_springboot_JWT/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/controller/StudentRESTController.java

@@ -377,10 +377,10 @@ public class StudentRESTController {
 
     private void partialUpdate(Student student, Map<String, Object> updates) {
         if (updates.containsKey("firstName")) {
-            student.setFirstName((String) updates.get("firstName"));
+            student.setFirstname((String) updates.get("firstName"));
         }
         if (updates.containsKey("lastName")) {
-            student.setLastName((String) updates.get("lastName"));
+            student.setLastname((String) updates.get("lastName"));
         }
         if (updates.containsKey("email")) {
             student.setEmail((String) updates.get("email"));

tasks/task_8_springboot_JWT/SpringBootJSP_IWA2025/src/main/java/pl/dmcs/eldarmuk/springbootjsp_iwa2025/model/Student.java

@@ -42,19 +42,19 @@ public class Student {
         this.email = email;
     }
 
-    public String getLastName() {
+    public String getLastname() {
         return lastName;
     }
 
-    public void setLastName(String lastName) {
+    public void setLastname(String lastName) {
         this.lastName = lastName;
     }
 
-    public String getFirstName() {
+    public String getFirstname() {
         return firstName;
     }
 
-    public void setFirstName(String firstName) {
+    public void setFirstname(String firstName) {
         this.firstName = firstName;
     }