- All issues sorted

- verifying task is valid or not on request
- Meeting cant be done on past start date

Author: ivikashgorai

src/main/java/com/hrms/backend/services/commentService/CommentServiceImpl.java

@@ -2,10 +2,13 @@
 
 import com.hrms.backend.dtos.entityDtos.Comment.CommentRequestDto;
 import com.hrms.backend.dtos.entityDtos.Comment.CommentResponseDto;
+import com.hrms.backend.dtos.entityDtos.Task.TaskResponseDto;
 import com.hrms.backend.dtos.entityDtos.User.UserInfo;
 import com.hrms.backend.dtos.entityDtos.User.response.UserResponseDto;
 import com.hrms.backend.models.Comment;
 import com.hrms.backend.repositories.CommentRepository;
+import com.hrms.backend.repositories.CompanyRepository;
+import com.hrms.backend.services.taskService.TaskServiceInterface;
 import com.hrms.backend.services.userService.UserServiceInterface;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,9 +23,14 @@ public class CommentServiceImpl implements CommentService {
     private CommentRepository commentRepository;
     @Autowired
     private UserServiceInterface userServiceInterface;
+    @Autowired
+    private TaskServiceInterface taskServiceInterface;
+    @Autowired
+    private CompanyRepository companyRepository;
 
     @Override
     public CommentResponseDto addComment(String userId, CommentRequestDto dto) {
+        TaskResponseDto taskResponseDto = taskServiceInterface.getTaskById(dto.getTaskId());
         Comment comment = Comment.builder()
             .taskId(dto.getTaskId())
             .userId(userId)

src/main/java/com/hrms/backend/services/meetingService/MeetingServiceImpl.java

@@ -42,6 +42,20 @@ public class MeetingServiceImpl implements MeetingServiceInterface {
     //HR
     public MeetingResponseDto scheduleMeeting(String hrId,MeetingRequestDto dto) {
         User user = userRepository.findById(hrId).orElseThrow(() -> new BadApiRequestException("Not authorized to create meetings"));
+
+        LocalDateTime startTime = LocalDateTime.parse(dto.getStartTime());
+        LocalDateTime endTime   = LocalDateTime.parse(dto.getEndTime());
+
+        // Checking if meeting is in the past
+        if (startTime.isBefore(LocalDateTime.now())) {
+            throw new BadApiRequestException("Cannot schedule a meeting in the past");
+        }
+
+        // validating endTime > startTime
+        if (!endTime.isAfter(startTime)) {
+            throw new BadApiRequestException("Meeting end time must be after start time");
+        }
+
         for (String participant : dto.getParticipants()) {
             boolean conflict = meetingRepository.existsByCompanyCodeAndParticipantsContainsAndStartTimeLessThanEqualAndEndTimeGreaterThanEqual(
                     user.getCompanyCode(), participant, LocalDateTime.parse(dto.getEndTime()), LocalDateTime.parse(dto.getStartTime())
@@ -145,7 +159,20 @@ public MeetingResponseDto editMeetingDetails(MeetingRequestDto meetingRequestDto
         if (!meeting.getOrganizer().equals(userId)) {
             throw new BadApiRequestException("Unauthorized to edit this meeting.");
         }
+        LocalDateTime startTime = LocalDateTime.parse(meetingRequestDto.getStartTime());
+        LocalDateTime endTime   = LocalDateTime.parse(meetingRequestDto.getEndTime());
+
+        // Checking if meeting is in the past
+        if (startTime.isBefore(LocalDateTime.now())) {
+            throw new BadApiRequestException("Cannot schedule a meeting in the past");
+        }
+
+        // validating endTime > startTime
+        if (!endTime.isAfter(startTime)) {
+            throw new BadApiRequestException("Meeting end time must be after start time");
+        }
         mapper.map(meetingRequestDto,meeting);
+        meetingRepository.save(meeting);
         return mapper.map(meeting, MeetingResponseDto.class);
     }
 

src/main/java/com/hrms/backend/services/userService/UserServiceImplementation.java

@@ -203,59 +203,4 @@ public SuccessApiResponseMessage retrieveFromWaitlistCompany(String userId) {
         return new SuccessApiResponseMessage("Successfully retrieved from waiting company");
     }
 
-
-//    @Override
-//    public void deleteUser(String userId) {
-//        User user = userRepository.findById(userId).orElseThrow(()-> new ResourceNotFoundException("User not found"));
-//        //deleting user image
-//        String imageName = user.getImageName();
-//        String fullImagePath = imagePath+ File.separator+imageName;
-//        try { //  below deleting image of user
-//            // sometimes it give file cant be access error
-//            // but when we will upload in server this error will be gone
-//            Path path = Paths.get(fullImagePath);
-//            Files.delete(path);
-//        }
-//        catch (Exception e){ // if file does not exist
-//            System.out.println(e.getMessage()+" No Such File exist");
-//        }
-//        //deleting user
-//        userRepository.deleteById(userId);
-//    }
-
-//    @Override
-//    public PageableResponse<UserDto> getAllUser(int pageNumber, int pageSize, String sortBy, String sortDir) {
-//
-//        //Sorting
-//        Sort sort = sortDir.equalsIgnoreCase("desc")? Sort.by(sortBy).descending():Sort.by(sortBy).ascending();
-//        //Pagination
-//        Pageable pageable = PageRequest.of(pageNumber, pageSize,sort);
-//        Page<User> page = userRepository.findAll(pageable);
-//        PageableResponse<UserDto> pagableResponse = Helper.getPagableResponse(page, UserDto.class);
-//
-//        return pagableResponse;
-//    }
-
-//    @Override
-//    public UserDto getUserById(String userId) {
-//        User user = userRepository.findById(userId).orElseThrow(()-> new ResourceNotFoundException("User not found"));
-//        return entityToDto(user);
-//    }
-
-//    @Override
-//    public UserDto getUserByEmail(String email) {
-//        User user = userRepository.findByEmail(email).orElseThrow(()-> new ResourceNotFoundException("Email not found"));
-//        return entityToDto(user);
-//    }
-
-//    @Override
-//    public List<UserDto> getUserByKeyword(String keyword) {
-//        List<User> user = userRepository.findByNameContaining(keyword);
-//        List<UserDto> userDto = new ArrayList<>();
-//        for(User u : user){
-//            userDto.add(entityToDto(u));
-//        }
-//        return userDto;
-//    }
-
 }