Frontend

MainService/src/main/java/ru/espada/ep/iptip/course/CourseController.java

@@ -54,7 +54,8 @@ public ResponseEntity<CourseEntityDto> getCourse(@PathVariable Long id) {
     public ResponseEntity<?> attachUserToCourse(@Valid @RequestBody UserCourseModel attachUserToCourseModel) {
         courseService.attachUserToCourse(
                 attachUserToCourseModel.getCourseId(),
-                attachUserToCourseModel.getUserId()
+                attachUserToCourseModel.getUserId(),
+                attachUserToCourseModel.getSemester()
         );
         return ResponseEntity.ok().build();
     }

MainService/src/main/java/ru/espada/ep/iptip/course/CourseService.java

@@ -81,13 +81,14 @@ public List<CourseLearningResourceCategoryEntityDto> getCourseLearningResourceCa
     }
 
     @Transactional
-    public UserCourseEntity attachUserToCourse(Long courseId, Long userId) {
+    public UserCourseEntity attachUserToCourse(Long courseId, Long userId, int semester) {
         UserEntity userEntity = userRepository.findById(userId).orElseThrow(() -> new RuntimeException("User not found"));
         CourseEntity courseEntity = courseRepository.findById(courseId).orElseThrow(() -> new RuntimeException("Course not found"));
 
         return userCourseRepository.save(UserCourseEntity.builder()
                 .courseId(courseEntity.getId())
                 .userId(userEntity.getId())
+                .semester(semester)
                 .build());
     }
 

MainService/src/main/java/ru/espada/ep/iptip/course/model/UserCourseModel.java

@@ -13,5 +13,6 @@ public class UserCourseModel {
 
     private Long courseId;
     private Long userId;
+    private int semester;
 
 }

MainService/src/main/java/ru/espada/ep/iptip/course/test/question/QuestionEntity.java

@@ -31,7 +31,7 @@ public class QuestionEntity {
     @Column(nullable = false)
     @FieldPermission
     private QuestionType questionType;
-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "TEXT")
     @FieldPermission
     private String content;
     @ManyToOne

MainService/src/main/java/ru/espada/ep/iptip/event/EventEntity.java

@@ -7,6 +7,7 @@
 import lombok.NoArgsConstructor;
 import ru.espada.ep.iptip.audit.Auditable;
 import ru.espada.ep.iptip.study_groups.StudyGroupEntity;
+import ru.espada.ep.iptip.user.UserEntity;
 import ru.espada.ep.iptip.user.permission.annotation.FieldPermission;
 import ru.espada.ep.iptip.user.permission.annotation.Permission;
 
@@ -33,14 +34,21 @@ public class EventEntity extends Auditable {
     @FieldPermission
     private int weekday;
     @FieldPermission
-    private boolean is_week_event;
+    private Boolean is_week_even;
     @FieldPermission
     private Long begin_date;
     @FieldPermission
     private Long end_date;
     @Column(nullable = false)
     @FieldPermission
     private Long duration;
+    @Column(length = 128)
+    private String type;
+    @OneToOne
+    @JoinColumn(name = "teacher_id")
+    private UserEntity teacher;
+    @Column(columnDefinition = "TEXT")
+    private String location;
 
     @ManyToMany(fetch = FetchType.LAZY)
     @JoinTable(name = "study_group_event",

MainService/src/main/java/ru/espada/ep/iptip/event/EventServiceImpl.java

@@ -33,7 +33,7 @@ public EventEntity createEvent(Principal principal, CreateEventRequest request)
                 .name(request.getName())
                 .date(request.getDate())
                 .weekday(request.getWeekday())
-                .is_week_event(request.is_week_event())
+                .is_week_even(request.is_week_event())
                 .begin_date(request.getBegin_date())
                 .end_date(request.getEnd_date())
                 .duration(request.getDuration())
@@ -50,7 +50,7 @@ public EventEntity createEventForStudyGroups(Principal principal, CreateEventFor
                 .name(request.getName())
                 .date(request.getDate())
                 .weekday(request.getWeekday())
-                .is_week_event(request.is_week_event())
+                .is_week_even(request.is_week_event())
                 .begin_date(request.getBegin_date())
                 .end_date(request.getEnd_date())
                 .duration(request.getDuration())
@@ -76,7 +76,7 @@ public EventEntity modifyEvent(Principal principal, ModifyEventRequest request)
         eventEntity.setDate(Optional.ofNullable(request.getDate()).orElse(eventEntity.getDate()));
         // FIXME: i am not sure, can bools be null in java? what will happen down here?
         eventEntity.setWeekday(Optional.ofNullable(request.getWeekday()).orElse(eventEntity.getWeekday()));
-        eventEntity.set_week_event(Optional.ofNullable(request.is_week_event()).orElse(eventEntity.is_week_event()));
+        eventEntity.setIs_week_even(Optional.ofNullable(request.is_week_event()).orElse(eventEntity.getIs_week_even()));
         eventEntity.setBegin_date(Optional.ofNullable(request.getBegin_date()).orElse(eventEntity.getBegin_date()));
         eventEntity.setEnd_date(Optional.ofNullable(request.getEnd_date()).orElse(eventEntity.getEnd_date()));
         eventEntity.setDuration(Optional.ofNullable(request.getDuration()).orElse(eventEntity.getDuration()));

MainService/src/main/java/ru/espada/ep/iptip/event/models/requests/CreateEventForStudyGroupsRequest.java

@@ -13,7 +13,6 @@
 @NoArgsConstructor
 @Builder
 public class CreateEventForStudyGroupsRequest {
-    // TODO: implement request model
     @NotNull
     private String name;
     @NotNull

MainService/src/main/java/ru/espada/ep/iptip/localization/LocalizationService.java

@@ -19,7 +19,11 @@ public class LocalizationService {
 
     public LocalizationService(@Autowired LocalizationYAMLReader localizationYAMLReader) {
         localizedMessages = new HashMap<>();
-        readAllLocalizationFiles(localizationYAMLReader);
+        try {
+            readAllLocalizationFiles(localizationYAMLReader);
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     public String getLocalizedMessage(String code) {

MainService/src/main/java/ru/espada/ep/iptip/security/premission_elevators/PermissionElevator.java

@@ -20,11 +20,12 @@ public PermissionElevator(UserPermissionService userPermissionService) {
 
     @Override
     public boolean hasPermission(Authentication authentication, Object targetDomainObject, Object permission) {
-        if (targetDomainObject.getClass().equals(Long.class)) {
-            return userPermissionService.hasPermission(authentication.getName(), permission.toString().replace("{" + "long" + "}", targetDomainObject.toString()));
-        }
         String permissionName = permission.toString();
         if (targetDomainObject != null) {
+            if (targetDomainObject.getClass().equals(Long.class)) {
+                return userPermissionService.hasPermission(authentication.getName(), permission.toString().replace("{" + "long" + "}", targetDomainObject.toString()));
+            }
+
             for (Field field : targetDomainObject.getClass().getDeclaredFields()) {
                 field.setAccessible(true);
                 try {

MainService/src/main/java/ru/espada/ep/iptip/study_groups/StudyGroupController.java

@@ -1,6 +1,8 @@
 package ru.espada.ep.iptip.study_groups;
 
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -14,66 +16,63 @@
 @RequestMapping("/studyGroup")
 public class StudyGroupController {
 
-    private StudyGroupRepository studyGroupRepository;
+    private StudyGroupService studyGroupService;
 
-    // TODO: add methods: create, add users, remove users, get users, set semester
     @PostMapping("/studyGroup")
-    public ResponseEntity<?> createStudyGroup(Principal principal, @Valid @RequestBody CreateStudyGroupRequest createStudyGroupRequest) {
-        // TODO: implementation
-        return null;
+    public ResponseEntity<Long> createStudyGroup(Principal principal, @Valid @RequestBody CreateStudyGroupRequest createStudyGroupRequest) {
+        Long id = studyGroupService.createStudyGroup(principal, createStudyGroupRequest).getId();
+        return ResponseEntity.ok(id);
     }
 
     @PostMapping("/studyGroupWithUsers")
-    public ResponseEntity<?> createStudyGroupWithUsers(Principal principal, @Valid @RequestBody CreateStudyGroupWithUsersRequest createStudyGroupWithUsersRequest) {
-        // TODO: implementation
-        return null;
+    public ResponseEntity<Long> createStudyGroupWithUsers(Principal principal, @Valid @RequestBody CreateStudyGroupWithUsersRequest createStudyGroupWithUsersRequest) {
+        Long id = studyGroupService.createStudyGroupWithUsers(principal, createStudyGroupWithUsersRequest).getId();
+        return ResponseEntity.ok(id);
     }
 
     @PatchMapping("/studyGroup")
     public ResponseEntity<?> modifyStudyGroup(Principal principal, @Valid @RequestBody ModifyStudyGroupRequest modifyStudyGroupRequest) {
-        // TODO: implementation
+        studyGroupService.modifyStudyGroup(principal, modifyStudyGroupRequest);
         return null;
     }
 
     @DeleteMapping("/studyGroup")
     public ResponseEntity<?> deleteStudyGroup(Principal principal, Long studyGroupId) {
-        // TODO: implementation
-        return null;
+        studyGroupService.deleteStudyGroup(principal, studyGroupId);
+        return ResponseEntity.ok().build();
     }
 
     @GetMapping("/studyGroup")
-    public ResponseEntity<?> getStudyGroup(Principal principal, Long studyGroupId) {
-        // TODO: implementation
-        return null;
+    public ResponseEntity<StudyGroupEntity> getStudyGroup(Principal principal, Long studyGroupId) {
+        return ResponseEntity.ok().body(studyGroupService.getStudyGroup(principal, studyGroupId));
     }
 
     @PostMapping("/attachUser")
-    public ResponseEntity<?> attachUserToStudyGroup(Principal principal, @Valid @RequestBody AttachUserToStudyGroupRequest attachUserToStudyGroupRequest) {
-        // TODO: implementation
-        return null;
+    public ResponseEntity<?> attachUserToStudyGroup(Principal principal, @Valid @RequestBody AttachUsersToStudyGroupRequest attachUsersToStudyGroupRequest) {
+        studyGroupService.attachUserToStudyGroup(principal, attachUsersToStudyGroupRequest);
+        return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/detachUser")
     public ResponseEntity<?> detachUserFromStudyGroup(Principal principal, @Valid @RequestBody DetachUserFromStudyGroupRequest detachUserFromStudyGroupRequest) {
-        // TODO: implementation
-        return null;
+        studyGroupService.detachUserFromStudyGroup(principal, detachUserFromStudyGroupRequest);
+        return ResponseEntity.ok().build();
     }
 
     @PutMapping("/setStudyGroupSemester")
     public ResponseEntity<?> setStudyGroupSemester(Principal principal, @Valid @RequestBody SetStudyGroupMembersSemesterRequest setStudyGroupMembersSemesterRequest) {
-        // TODO: implementation
-        return null;
+        studyGroupService.setStudyGroupMembersSemester(principal, setStudyGroupMembersSemesterRequest);
+        return ResponseEntity.ok().build();
     }
 
     @GetMapping("/getStudyGroupMembers")
     public ResponseEntity<?> getStudyGroupMembers(Principal principal, Long studyGroupId) {
-        // TODO: implementation
-        return null;
+        return ResponseEntity.ok().body(studyGroupService.getStudyGroupMembers(principal, studyGroupId));
     }
 
     @Autowired
-    public void setStudyGroupRepository(StudyGroupRepository studyGroupRepository) {
-        this.studyGroupRepository = studyGroupRepository;
+    public void setStudyGroupService(StudyGroupService studyGroupService) {
+        this.studyGroupService = studyGroupService;
     }
 }
 

MainService/src/main/java/ru/espada/ep/iptip/study_groups/StudyGroupService.java

@@ -14,7 +14,7 @@ public interface StudyGroupService {
     StudyGroupEntity getStudyGroup(Principal principal, Long studyGroupId);
     void deleteStudyGroup(Principal principal, Long studyGroupId);
 
-    void attachUserToStudyGroup(Principal principal, AttachUserToStudyGroupRequest request);
+    void attachUserToStudyGroup(Principal principal, AttachUsersToStudyGroupRequest request);
     void detachUserFromStudyGroup(Principal principal, DetachUserFromStudyGroupRequest request);
     void setStudyGroupMembersSemester(Principal principal, SetStudyGroupMembersSemesterRequest request);
     List<Long> getStudyGroupMembers(Principal principal, Long studyGroupId);