Added Upload Marks

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

@@ -5,8 +5,6 @@ import com.school.project.service.admin.TeacherFunctionsForAdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Set;
-
 @RestController
 @RequestMapping("/admin")
 public class AdminController {

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.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.security.Principal;
 
@@ -18,6 +18,9 @@ public class TeacherController {
     @Autowired
     TeacherServiceImpl teacherService;
 
+    @Autowired
+    UploadMarksServiceImpl uploadMarksService;
+
     @GetMapping("")
     public TeacherViewDataDTO getTeacherData(Principal principal) {
         return teacherService.getTeacherData(principal.getName());
@@ -28,4 +31,9 @@ public class TeacherController {
         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/TeacherCourseAssignDTO.java

 package com.school.project.dto.teacher;
 
 import com.school.project.model.Course;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Set;
 
 @Getter
 @Setter
-@RequiredArgsConstructor
 public class TeacherCourseAssignDTO {
 
     private String teacherNumber;
     private Set<String> courseList;
+
 }

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/dto/teacher/TeacherViewCoursesDTO.java

@@ -8,8 +8,8 @@ import org.springframework.stereotype.Component;
 
 import java.util.Set;
 
-@Getter @Setter
-@RequiredArgsConstructor
+@Getter
+@Setter
 public class TeacherViewCoursesDTO {
 
     private String name;

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

@@ -3,8 +3,8 @@ package com.school.project.dto.teacher;
 import com.school.project.model.Department;
 import lombok.*;
 
-@Getter @Setter
-@RequiredArgsConstructor
+@Getter
+@Setter
 public class TeacherViewDataDTO {
 
     private String name;

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/mapper/StudentCoursesMapper.java

@@ -10,7 +10,7 @@ public class StudentCoursesMapper {
     public StudentCoursesDTO modelToDto(Student student) {
         StudentCoursesDTO coursesDTO = new StudentCoursesDTO();
 
-        coursesDTO.setStudentName(student.getName());
+        coursesDTO.setStudentName(student.getStudentName());
         coursesDTO.setStudentRollNumber(student.getRollNumber());
         coursesDTO.setCourseList(student.getCourseLists());
 

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

@@ -12,7 +12,7 @@ public class StudentViewDataMapper {
 
         StudentViewDataDTO studentViewDataDTO = new StudentViewDataDTO();
 
-        studentViewDataDTO.setName(student.getName());
+        studentViewDataDTO.setName(student.getStudentName());
         studentViewDataDTO.setRollNumber(student.getRollNumber());
         studentViewDataDTO.setAge(student.getAge());
 

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

-package com.school.project.model.userRegistration;
+package com.school.project.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.school.project.model.userRegistration.User;
 import com.sun.istack.NotNull;
 import lombok.*;
 import org.springframework.context.annotation.Lazy;
 
 import javax.persistence.*;
 
-@Data
-@Entity(name = "admin")
+@Getter
+@Setter
+@AllArgsConstructor
 @NoArgsConstructor
+@RequiredArgsConstructor
+@Entity
+@Table(name = "admin")
 public class Admin {
 
     @Id
@@ -24,7 +29,6 @@ public class Admin {
     @OneToOne(fetch = FetchType.LAZY)
     @MapsId
     @JoinColumn(name = "admin_id")
-    @ToString.Exclude
     @JsonIgnore
     private User adminAppUser;
 }

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

@@ -8,32 +8,39 @@ import javax.persistence.*;
 import java.util.List;
 import java.util.Set;
 
-@Data
-@Entity()
+
+@Getter
+@Setter
 @NoArgsConstructor
-@Table(name = "Course")
-@EqualsAndHashCode(exclude = {"studentList","teacherList"})
-@ToString(exclude = {"studentList","teacherList"})
+@AllArgsConstructor
+@RequiredArgsConstructor
+@Entity
+@Table(name = "course")
 public class Course {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
+    @Column(name = "course_id")
+    private Long courseId;
 
     @NotNull
     @Column(name = "name", unique = true)
     private String courseName;
 
     @NotNull
-    @Column(name = "courseCode",unique = true)
+    @Column(name = "course_code",unique = true)
     private String courseCode;
 
-    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "courseLists",cascade = CascadeType.MERGE)
+    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "courseLists",cascade = CascadeType.ALL)
     @JsonIgnore
     private Set<Student> studentList;
 
-    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "courseList")
+    @ManyToMany(fetch = FetchType.LAZY, mappedBy = "courseList",cascade = CascadeType.ALL)
     @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/Department.java

 package com.school.project.model;
 
 import com.sun.istack.NotNull;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 import java.util.List;
 
-@Data
-@Entity()
+@Getter
+@Setter
+@AllArgsConstructor
 @NoArgsConstructor
-@Table(name = "Department")
+@RequiredArgsConstructor
+@Entity
+@Table(name = "department")
 public class Department {
 
     @Id

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

@@ -3,22 +3,22 @@ package com.school.project.model;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.school.project.model.userRegistration.User;
 import com.sun.istack.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
 import javax.persistence.*;
+import java.util.List;
 import java.util.Set;
 
-@Data
-@Entity()
+
+@Getter
+@Setter
 @NoArgsConstructor
-@Table(name = "Student")
-@EqualsAndHashCode(exclude = {"courseLists"})
-@ToString(exclude = {"courseLists","studentAppUser"})
+@AllArgsConstructor
+@RequiredArgsConstructor
+@Entity
+@Table(name = "student")
 public class Student {
 
     @Id
@@ -32,7 +32,7 @@ public class Student {
 
     @NotNull
     @Column(name = "name")
-    private String name;
+    private String studentName;
 
     @NotNull
     @Column(name = "age")
@@ -48,6 +48,10 @@ 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/model/Teacher.java

@@ -4,9 +4,7 @@ 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;
-import lombok.ToString;
+import lombok.*;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.context.annotation.Lazy;
 
@@ -14,9 +12,12 @@ import javax.persistence.*;
 import java.util.List;
 import java.util.Set;
 
-@Data
-@Entity
+@Getter
+@Setter
 @NoArgsConstructor
+@AllArgsConstructor
+@RequiredArgsConstructor
+@Entity
 @Table(name = "Teacher")
 public class Teacher {
 
@@ -56,7 +57,6 @@ public class Teacher {
     @MapsId
     @JoinColumn(name = "teacher_id")
     @JsonIgnore
-    @ToString.Exclude
     private User teacherAppUser;
 
 

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

 package com.school.project.model.userRegistration;
 
 import com.sun.istack.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 
-@Data
-@Entity
+@Getter
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @RequiredArgsConstructor
+@Entity
 @Table(name = "role")
 public class Role {
 

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

@@ -2,18 +2,20 @@ package com.school.project.model.userRegistration;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.school.project.model.Admin;
 import com.school.project.model.Student;
 import com.school.project.model.Teacher;
 import com.sun.istack.NotNull;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 import javax.persistence.*;
 
-@Data
-@Entity
+@Getter
+@Setter
 @NoArgsConstructor
+@AllArgsConstructor
+@RequiredArgsConstructor
+@Entity
 @Table(name = "users")
 public class User {
 
@@ -37,19 +39,16 @@ public class User {
 
     @OneToOne(mappedBy = "studentAppUser", cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
     @PrimaryKeyJoinColumn
-    @ToString.Exclude
     @JsonIgnore
     private Student studentUser;
 
     @OneToOne(mappedBy = "teacherAppUser", cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
     @PrimaryKeyJoinColumn
-    @ToString.Exclude
     @JsonIgnore
     private Teacher teacherUser;
 
     @OneToOne(mappedBy = "adminAppUser", cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
     @PrimaryKeyJoinColumn
-    @ToString.Exclude
     @JsonIgnore
     private Admin adminUser;
 

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/modelRepositery/CourseRepository.java → src/main/java/com/school/project/repository/CourseRepository.java

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

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

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

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/repository/modelRepositery/StudentRepository.java → src/main/java/com/school/project/repository/StudentRepository.java

-package com.school.project.repository.modelRepositery;
+package com.school.project.repository;
 
 import com.school.project.model.Student;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface StudentRepository extends JpaRepository<Student,Long> {
+import java.util.List;
 
-    public Student findByStudentId(Long id);
+public interface StudentRepository extends JpaRepository<Student, Long> {
+
+     Student findByStudentId(Long id);
+
+     Student findByStudentName(String name);
+
+     Student findByRollNumber(String rollNumber);
 }

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

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

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

 package com.school.project.repository.userRegistration;
 
-import com.school.project.model.userRegistration.Admin;
-import lombok.RequiredArgsConstructor;
+import com.school.project.model.Admin;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/school/project/service/admin/TeacherFunctionsForAdminServiceImpl.java

@@ -4,8 +4,8 @@ import com.school.project.dto.teacher.TeacherCourseAssignDTO;
 import com.school.project.model.Course;
 import com.school.project.model.Teacher;
 import com.school.project.model.userRegistration.User;
-import com.school.project.repository.modelRepositery.CourseRepository;
-import com.school.project.repository.modelRepositery.TeacherRepository;
+import com.school.project.repository.CourseRepository;
+import com.school.project.repository.TeacherRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.Modifying;

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

@@ -2,7 +2,7 @@ package com.school.project.service.course;
 
 import com.school.project.dto.course.CourseRegisterDTO;
 import com.school.project.model.Course;
-import com.school.project.repository.modelRepositery.CourseRepository;
+import com.school.project.repository.CourseRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -26,6 +26,8 @@ public class CourseServiceImp implements CourseService {
             newCourse.setCourseCode(courseDTO.getCourseCode());
             newCourse.setCourseName(courseDTO.getCourseName());
 
+            courseRepository.save(newCourse);
+
             return new ResponseStatusException(HttpStatus.OK,courseMessage);
 
         } catch (Exception e) {

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

@@ -2,7 +2,7 @@ package com.school.project.service.department;
 
 import com.school.project.dto.department.DepartmentRegisterDTO;
 import com.school.project.model.Department;
-import com.school.project.repository.modelRepositery.DepartmentRepository;
+import com.school.project.repository.DepartmentRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/school/project/service/student/CourseRegistrationServiceImpl.java

@@ -3,14 +3,13 @@ package com.school.project.service.student;
 import com.school.project.dto.student.StudentCourseRegistrationDTO;
 import com.school.project.model.Course;
 import com.school.project.model.Student;
-import com.school.project.repository.modelRepositery.CourseRepository;
-import com.school.project.repository.modelRepositery.StudentRepository;
+import com.school.project.repository.CourseRepository;
+import com.school.project.repository.StudentRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
-import java.util.List;
 import java.util.Set;
 
 @Service

src/main/java/com/school/project/service/student/StudentServiceImpl.java

@@ -5,7 +5,7 @@ import com.school.project.dto.student.StudentViewDataDTO;
 import com.school.project.mapper.StudentCoursesMapper;
 import com.school.project.mapper.StudentViewDataMapper;
 import com.school.project.model.userRegistration.User;
-import com.school.project.repository.modelRepositery.StudentRepository;
+import com.school.project.repository.StudentRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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;
 
@@ -7,4 +8,5 @@ public interface TeacherService {
     TeacherViewDataDTO getTeacherData(String username);
 
     TeacherViewCoursesDTO getTeacherCourses(String username);
+
 }

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.modelRepositery.TeacherRepository;
+import com.school.project.repository.*;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,7 @@ public class TeacherServiceImpl implements TeacherService {
     @Autowired
     TeacherViewCoursesMapper teacherViewCoursesMapper;
 
+
     @Override
     public TeacherViewDataDTO getTeacherData(String username) {
 

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);
+
+    }
+}

src/main/java/com/school/project/service/userRegistration/admin/AdminRegistrationServiceImpl.java

@@ -2,7 +2,7 @@ package com.school.project.service.userRegistration.admin;
 
 import com.school.project.dto.userRegistration.AdminRegistrationDTO;
 import com.school.project.dto.userRegistration.UserRegistrationDTO;
-import com.school.project.model.userRegistration.Admin;
+import com.school.project.model.Admin;
 import com.school.project.model.userRegistration.Role;
 import com.school.project.model.userRegistration.User;
 import com.school.project.repository.userRegistration.AdminRegRepository;

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

@@ -6,7 +6,7 @@ import com.school.project.model.userRegistration.Role;
 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.modelRepositery.StudentRepository;
+import com.school.project.repository.StudentRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -43,7 +43,7 @@ public class StudentRegistrationServiceImpl implements StudentRegistrationServic
 
         Student newStudent = new Student();
 
-        newStudent.setName(studentRegistrationDTO.getName());
+        newStudent.setStudentName(studentRegistrationDTO.getName());
         newStudent.setAge(studentRegistrationDTO.getAge());
         newStudent.setStudentAppUser(newUser);
         newStudent.setRollNumber(studentRegistrationDTO.getRollNumber());

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

@@ -6,7 +6,7 @@ import com.school.project.model.userRegistration.Role;
 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.modelRepositery.TeacherRepository;
+import com.school.project.repository.TeacherRepository;
 import com.school.project.repository.userRegistration.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;

src/main/resources/data.sql

 INSERT INTO role VALUES (1, 'ADMIN');
 INSERT INTO role VALUES (2, 'STUDENT');
-INSERT INTO role VALUES (3, 'TEACHER');
\ No newline at end of file
+INSERT INTO role VALUES (3, 'TEACHER');
+
+INSERT INTO assessment_type VALUES (1,'ASSIGNMENT');
+INSERT INTO assessment_type VALUES (2,'QUIZ');
+INSERT INTO assessment_type VALUES (3,'MIDTERM');
+INSERT INTO assessment_type VALUES (4,'FINAL');
+INSERT INTO assessment_type VALUES (5,'PROJECT');
+INSERT INTO assessment_type VALUES (6,'PRESENTATION');
+INSERT INTO assessment_type VALUES (7,'REPORT');
+INSERT INTO assessment_type VALUES (8,'PARTICIPATION');
+INSERT INTO assessment_type VALUES (9,'LABWORK');
+INSERT INTO assessment_type VALUES (10,'LABTASK');
+