Deleted Extra Files

src/main/java/com/school/project/controller/TeacherController.java

 package com.school.project.controller;
 
-import com.school.project.dto.teacher.TeacherUploadStudentMarksDTO;
 import com.school.project.dto.teacher.TeacherViewCoursesDTO;
 import com.school.project.dto.teacher.TeacherViewDataDTO;
 import com.school.project.service.teacher.TeacherServiceImpl;
-import com.school.project.service.teacher.UploadMarksService;
-import com.school.project.service.teacher.UploadMarksServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,8 +15,6 @@ public class TeacherController {
     @Autowired
     TeacherServiceImpl teacherService;
 
-    @Autowired
-    UploadMarksServiceImpl uploadMarksService;
 
     @GetMapping("")
     public TeacherViewDataDTO getTeacherData(Principal principal) {
@@ -30,10 +25,4 @@ public class TeacherController {
     public TeacherViewCoursesDTO getTeacherCourses(Principal principal) {
         return teacherService.getTeacherCourses(principal.getName());
     }
-
-    @PostMapping("/upload/marks")
-    public void uploadStudentMarks(@RequestBody TeacherUploadStudentMarksDTO studentMarks) {
-        uploadMarksService.uploadStudentMarks(studentMarks);
-    }
-
 }

src/main/java/com/school/project/dto/teacher/TeacherUploadStudentMarksDTO.java

-package com.school.project.dto.teacher;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-public class TeacherUploadStudentMarksDTO {
-
-    private String assessmentType;
-    private Long assessmentNumber;
-    private Long weightage;
-    private Long totalMarks;
-    private Long obtainedMarks;
-    private String studentRollNumber;
-    private String courseName;
-}

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

-package com.school.project.mapper;
-
-import com.school.project.model.Course;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-public class SingleCourseToListOfCourseMapper {
-
-    public List<Course> modelToList(Course course) {
-        List<Course> courseList = new ArrayList<>();
-        courseList.add(course);
-        return courseList;
-    }
-}

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

-package com.school.project.mapper;
-
-import com.school.project.model.Student;
-import org.mapstruct.Mapper;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-public class SingleStudentToListOfStudentMapper {
-
-    public List<Student> modelToList(Student student) {
-        List<Student> studentList = new ArrayList<>();
-
-        studentList.add(student);
-
-        return studentList;
-    }
-
-}

src/main/java/com/school/project/model/AssessmentType.java

-package com.school.project.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.sun.istack.NotNull;
-import lombok.*;
-import org.hibernate.annotations.Fetch;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@RequiredArgsConstructor
-@Entity
-@Table(name = "assessment_type")
-public class AssessmentType {
-
-    public static enum TYPES {
-        ASSIGNMENT,
-        QUIZ,
-        MIDTERM,
-        FINAL,
-        PROJECT,
-        PRESENTATION,
-        REPORT,
-        PARTICIPATION,
-        LABWORK,
-        LABTASK,
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    @Column(name = "assessment_id")
-    private Long assessmentId;
-
-    @NotNull
-    @Column(name = "assessment_name")
-    private String assessmentName;
-
-    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "assessmentType")
-    @JsonIgnore
-    private List<Grade> gradeAssessment;
-}

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

@@ -39,8 +39,4 @@ public class Course {
     @JsonIgnore
     private Set<Teacher> teacherList;
 
-    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "courseGrades",cascade = CascadeType.ALL)
-    @JsonIgnore
-    private List<Grade> gradeCourses;
-
 }

src/main/java/com/school/project/model/Grade.java

-package com.school.project.model;
-
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.sun.istack.NotNull;
-import lombok.*;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-@RequiredArgsConstructor
-@Entity
-@Table(name = "grade")
-public class Grade {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    @Column(name = "grade_id")
-    private Long gradeId;
-
-
-    @NotNull
-    @Column(name = "assessment_number")
-    private Long assessmentNumber;
-
-    @ManyToMany(fetch = FetchType.LAZY,cascade = CascadeType.MERGE)
-    @JoinTable(name = "assessment_grade_type",
-            joinColumns = {@JoinColumn(name = "grade_id")},
-            inverseJoinColumns = {@JoinColumn(name = "assessment_id")}
-    )
-    @JsonIgnore
-    @NotNull
-    private List<AssessmentType> assessmentType;
-
-    @ManyToMany(fetch = FetchType.LAZY,cascade = CascadeType.ALL)
-    @JoinTable(name = "student_grade",
-            joinColumns = {@JoinColumn(name = "grade_id")},
-            inverseJoinColumns = {@JoinColumn(name = "student_id")}
-    )
-    @JsonIgnore
-    @NotNull
-    private List<Student> studentGrades;
-
-    @ManyToMany(fetch = FetchType.LAZY,cascade = CascadeType.ALL)
-    @JoinTable(name = "course_grade",
-            joinColumns = {@JoinColumn(name = "grade_id")},
-            inverseJoinColumns = {@JoinColumn(name = "course_id")}
-    )
-    @JsonIgnore
-    @NotNull
-    private List<Course> courseGrades;
-
-    @Column(name = "weightage")
-    @NotNull
-    private Long weightage;
-
-    @Column(name = "total_marks")
-    @NotNull
-    private Long totalMarks;
-
-    @Column(name = "obtained_marks")
-    @NotNull
-    private Long obtainedMarks;
-
-}

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

@@ -48,10 +48,6 @@ public class Student {
     )
     private Set<Course> courseLists;
 
-    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "studentGrades",cascade = CascadeType.ALL)
-    @JsonIgnore
-    private List<Grade> gradeStudent;
-
     @OneToOne(fetch = FetchType.LAZY)
     @MapsId
     @JoinColumn(name = "student_id")

src/main/java/com/school/project/repository/AssessmentTypeRepository.java

-package com.school.project.repository;
-
-
-import com.school.project.model.AssessmentType;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface AssessmentTypeRepository extends JpaRepository<AssessmentType,Long> {
-
-    List<AssessmentType> findByAssessmentName(String name);
-}

src/main/java/com/school/project/repository/GradeRepository.java

-package com.school.project.repository;
-
-import com.school.project.model.Grade;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface GradeRepository extends JpaRepository<Grade,Long> {
-}

src/main/java/com/school/project/service/teacher/TeacherService.java

 package com.school.project.service.teacher;
 
-import com.school.project.dto.teacher.TeacherUploadStudentMarksDTO;
 import com.school.project.dto.teacher.TeacherViewCoursesDTO;
 import com.school.project.dto.teacher.TeacherViewDataDTO;
 

src/main/java/com/school/project/service/teacher/TeacherServiceImpl.java

 package com.school.project.service.teacher;
 
-import com.school.project.dto.teacher.TeacherUploadStudentMarksDTO;
 import com.school.project.dto.teacher.TeacherViewCoursesDTO;
 import com.school.project.dto.teacher.TeacherViewDataDTO;
 import com.school.project.mapper.TeacherViewCoursesMapper;
 import com.school.project.mapper.TeacherViewDataMapper;
-import com.school.project.model.AssessmentType;
-import com.school.project.model.Course;
-import com.school.project.model.Grade;
 import com.school.project.model.userRegistration.User;
 import com.school.project.repository.*;
 import com.school.project.repository.userRegistration.UserRepository;

src/main/java/com/school/project/service/teacher/UploadMarksService.java

-package com.school.project.service.teacher;
-
-import com.school.project.dto.teacher.TeacherUploadStudentMarksDTO;
-
-public interface UploadMarksService {
-
-    void uploadStudentMarks(TeacherUploadStudentMarksDTO studentAndMarks);
-}

src/main/java/com/school/project/service/teacher/UploadMarksServiceImpl.java

-package com.school.project.service.teacher;
-
-import com.school.project.dto.teacher.TeacherUploadStudentMarksDTO;
-import com.school.project.mapper.SingleCourseToListOfCourseMapper;
-import com.school.project.mapper.SingleStudentToListOfStudentMapper;
-import com.school.project.model.Grade;
-import com.school.project.repository.AssessmentTypeRepository;
-import com.school.project.repository.CourseRepository;
-import com.school.project.repository.GradeRepository;
-import com.school.project.repository.StudentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-
-@Service
-public class UploadMarksServiceImpl implements UploadMarksService {
-
-    @Autowired
-    AssessmentTypeRepository assessmentTypeRepository;
-
-    @Autowired
-    GradeRepository gradeRepository;
-
-    @Autowired
-    StudentRepository studentRepository;
-
-    @Autowired
-    CourseRepository courseRepository;
-
-    @Autowired
-    SingleStudentToListOfStudentMapper studentMapper;
-
-    @Autowired
-    SingleCourseToListOfCourseMapper courseMapper;
-
-    @Override
-    @Transactional
-    public void uploadStudentMarks(TeacherUploadStudentMarksDTO studentAndMarks) {
-        Grade studentGrade = new Grade();
-
-        studentGrade.setAssessmentNumber(studentAndMarks.getAssessmentNumber());
-
-        studentGrade.setAssessmentType(assessmentTypeRepository.findByAssessmentName(
-                studentAndMarks.getAssessmentType()));
-
-        studentGrade.setStudentGrades(studentMapper.modelToList(
-                studentRepository.findByRollNumber(
-                        studentAndMarks.getStudentRollNumber())));
-
-        studentGrade.setCourseGrades(courseMapper.modelToList(
-                courseRepository.findByCourseName(
-                        studentAndMarks.getCourseName())));
-
-        studentGrade.setWeightage(studentAndMarks.getWeightage());
-        studentGrade.setTotalMarks(studentAndMarks.getTotalMarks());
-        studentGrade.setObtainedMarks(studentAndMarks.getObtainedMarks());
-
-        gradeRepository.save(studentGrade);
-
-    }
-}