Changed File Structure

src/main/java/com/school/project/controller/other/CourseController.java → src/main/java/com/school/project/controller/CourseController.java

-package com.school.project.controller.other;
+package com.school.project.controller;
 
-import com.school.project.dto.modelDTO.CourseDTO;
+import com.school.project.dto.CourseDTO;
 import com.school.project.service.course.CourseServiceImp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;

src/main/java/com/school/project/controller/other/DepartmentController.java → src/main/java/com/school/project/controller/DepartmentController.java

-package com.school.project.controller.other;
+package com.school.project.controller;
 
-import com.school.project.dto.modelDTO.DepartmentDTO;
+import com.school.project.dto.DepartmentDTO;
 import com.school.project.service.department.DepartmentServiceImp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;

src/main/java/com/school/project/dto/modelDTO/CourseDTO.java → src/main/java/com/school/project/dto/CourseDTO.java

-package com.school.project.dto.modelDTO;
+package com.school.project.dto;
 
-import com.school.project.model.userRegistration.Student;
-import com.school.project.model.userRegistration.Teacher;
+import com.school.project.model.Student;
+import com.school.project.model.Teacher;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/school/project/dto/modelDTO/DepartmentDTO.java → src/main/java/com/school/project/dto/DepartmentDTO.java

-package com.school.project.dto.modelDTO;
+package com.school.project.dto;
 
 import lombok.Data;
 

src/main/java/com/school/project/mapper/CourseMapper.java

 package com.school.project.mapper;
 
 
-import com.school.project.dto.modelDTO.CourseDTO;
-import com.school.project.model.school.Course;
+import com.school.project.dto.CourseDTO;
+import com.school.project.model.Course;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/com/school/project/mapper/DepartmentMapper.java

 package com.school.project.mapper;
 
-import com.school.project.dto.modelDTO.DepartmentDTO;
-import com.school.project.model.school.Department;
+import com.school.project.dto.DepartmentDTO;
+import com.school.project.model.Department;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

src/main/java/com/school/project/model/school/Course.java → src/main/java/com/school/project/model/Course.java

-package com.school.project.model.school;
+package com.school.project.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.school.project.model.userRegistration.Student;
-import com.school.project.model.userRegistration.Teacher;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/com/school/project/model/school/Department.java → src/main/java/com/school/project/model/Department.java

-package com.school.project.model.school;
+package com.school.project.model;
 
 import lombok.Data;
 

src/main/java/com/school/project/model/userRegistration/Student.java → src/main/java/com/school/project/model/Student.java

-package com.school.project.model.userRegistration;
+package com.school.project.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.school.project.model.school.Course;
+import com.school.project.model.Course;
+import com.school.project.model.userRegistration.User;
 import com.sun.istack.NotNull;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/school/project/model/userRegistration/Teacher.java → src/main/java/com/school/project/model/Teacher.java

-package com.school.project.model.userRegistration;
+package com.school.project.model;
 
-import com.school.project.model.school.Course;
-import com.school.project.model.school.Department;
+import com.school.project.model.Course;
+import com.school.project.model.Department;
+import com.school.project.model.userRegistration.User;
 import com.sun.istack.NotNull;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/school/project/model/userRegistration/User.java

 package com.school.project.model.userRegistration;
 
 
+import com.school.project.model.Student;
+import com.school.project.model.Teacher;
 import com.sun.istack.NotNull;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/school/project/repository/modelRepositery/CourseRepository.java

 package com.school.project.repository.modelRepositery;
 
-import com.school.project.model.school.Course;
+import com.school.project.model.Course;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CourseRepository extends JpaRepository<Course,Long> {

src/main/java/com/school/project/repository/modelRepositery/DepartmentRepository.java

 package com.school.project.repository.modelRepositery;
 
-import com.school.project.model.school.Department;
+import com.school.project.model.Department;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/school/project/repository/modelRepositery/StudentRepository.java

+package com.school.project.repository.modelRepositery;
+
+import com.school.project.model.Student;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface StudentRepository extends JpaRepository<Student,Long> {
+}

src/main/java/com/school/project/repository/userRegistration/TeacherRegRepository.java → src/main/java/com/school/project/repository/modelRepositery/TeacherRepository.java

-package com.school.project.repository.userRegistration;
+package com.school.project.repository.modelRepositery;
 
-import com.school.project.model.userRegistration.Teacher;
+import com.school.project.model.Teacher;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface TeacherRegRepository extends JpaRepository<Teacher,Long> {
+public interface TeacherRepository extends JpaRepository<Teacher,Long> {
 
 }

src/main/java/com/school/project/repository/userRegistration/StudentRegRepository.java

-package com.school.project.repository.userRegistration;
-
-import com.school.project.model.userRegistration.Student;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface StudentRegRepository extends JpaRepository<Student,Long> {
-}

src/main/java/com/school/project/service/course/CourseService.java

 package com.school.project.service.course;
 
-import com.school.project.dto.modelDTO.CourseDTO;
+import com.school.project.dto.CourseDTO;
 
 import java.util.List;
 

src/main/java/com/school/project/service/course/CourseServiceImp.java

 package com.school.project.service.course;
 
-import com.school.project.dto.modelDTO.CourseDTO;
+import com.school.project.dto.CourseDTO;
 import com.school.project.mapper.CourseMapper;
 import com.school.project.repository.modelRepositery.CourseRepository;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/school/project/service/department/DepartmentService.java

 package com.school.project.service.department;
 
-import com.school.project.dto.modelDTO.DepartmentDTO;
+import com.school.project.dto.DepartmentDTO;
 
 import java.util.List;
 

src/main/java/com/school/project/service/department/DepartmentServiceImp.java

 package com.school.project.service.department;
 
-import com.school.project.dto.modelDTO.DepartmentDTO;
+import com.school.project.dto.DepartmentDTO;
 import com.school.project.mapper.DepartmentMapper;
 import com.school.project.repository.modelRepositery.DepartmentRepository;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/school/project/service/userRegistration/student/StudentRegistrationServiceImpl.java

@@ -3,23 +3,22 @@ package com.school.project.service.userRegistration.student;
 import com.school.project.dto.userRegistration.StudentRegistrationDTO;
 import com.school.project.dto.userRegistration.UserDTO;
 import com.school.project.model.userRegistration.Role;
-import com.school.project.model.userRegistration.Student;
+import com.school.project.model.Student;
 import com.school.project.model.userRegistration.User;
 import com.school.project.repository.userRegistration.RoleRepository;
-import com.school.project.repository.userRegistration.StudentRegRepository;
+import com.school.project.repository.modelRepositery.StudentRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
-import java.util.UUID;
 
 @Service
 public class StudentRegistrationServiceImpl implements StudentRegistrationService {
 
     @Autowired
-    private StudentRegRepository studentRegRepository;
+    private StudentRepository studentRepository;
 
     @Autowired
     private UserRepository userRepository;
@@ -51,7 +50,7 @@ public class StudentRegistrationServiceImpl implements StudentRegistrationServic
         newStudent.setStudentAppUser(newUser);
         newStudent.setRollNumber(studentRegistrationDTO.getRollNumber());
 
-        studentRegRepository.save(newStudent);
+        studentRepository.save(newStudent);
 
         return new UserDTO(newUser.getUserId(), newUser.getEmail());
 

src/main/java/com/school/project/service/userRegistration/teacher/TeacherRegistrationServiceImpl.java

@@ -3,10 +3,10 @@ package com.school.project.service.userRegistration.teacher;
 import com.school.project.dto.userRegistration.TeacherRegistrationDTO;
 import com.school.project.dto.userRegistration.UserDTO;
 import com.school.project.model.userRegistration.Role;
-import com.school.project.model.userRegistration.Teacher;
+import com.school.project.model.Teacher;
 import com.school.project.model.userRegistration.User;
 import com.school.project.repository.userRegistration.RoleRepository;
-import com.school.project.repository.userRegistration.TeacherRegRepository;
+import com.school.project.repository.modelRepositery.TeacherRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -18,7 +18,7 @@ import javax.transaction.Transactional;
 public class TeacherRegistrationServiceImpl implements TeacherRegistrationService {
 
     @Autowired
-    private TeacherRegRepository teacherRegRepository;
+    private TeacherRepository teacherRepository;
 
     @Autowired
     private UserRepository userRepository;
@@ -48,7 +48,7 @@ public class TeacherRegistrationServiceImpl implements TeacherRegistrationServic
         newTeacher.setTeacherNumber(teacherRegistrationDTO.getTeacherNumber());
         newTeacher.setTeacherAppUser(newUser);
 
-        teacherRegRepository.save(newTeacher);
+        teacherRepository.save(newTeacher);
 
         return new UserDTO(newTeacher.getTeacherId(), newUser.getEmail());