Skip to content

Commit

Permalink
Added delete/update/partialUpdate User-Message
Browse files Browse the repository at this point in the history
  • Loading branch information
@ramueSVA
ramueSVA committed Dec 4, 2024
1 parent 3d3f7e1 commit 80e638f
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 26 deletions.
7 changes: 4 additions & 3 deletions src/main/java/org/highmed/numportal/domain/dto/MessageDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
@AllArgsConstructor
public class MessageDto {

@NotNull
Long id;

private String title;

@NotNull
@NotEmpty
private String title;

private String text;

@NotNull
private LocalDateTime startDate;

@NotNull
private LocalDateTime endDate;

@NotNull
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/highmed/numportal/domain/repository/MessageRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import org.highmed.numportal.domain.model.Message;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface MessageRepository extends JpaRepository<Message, Long>, CustomProjectRepository {
public interface MessageRepository extends JpaRepository<Message, Long>, PagingAndSortingRepository<Message, Long> {

Page<Message> findMessages(Pageable pageable);
}
2 changes: 2 additions & 0 deletions src/main/java/org/highmed/numportal/domain/templates/ExceptionsTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public class ExceptionsTemplate {
public static final String CANNOT_DELETE_PROJECT_INVALID_STATUS = "Cannot delete project: %s, invalid status: %s";
public static final String CANNOT_UPDATE_PROJECT_INVALID_PROJECT_STATUS = "Cannot update project: %s, invalid project status: %s";
public static final String CANNOT_UPDATE_MESSAGE_INVALID = "Cannot update message: %s, invalid: %s";
public static final String CANNOT_HANDLE_DATE = "Cannot handle date: %s";
public static final String CANNOT_DELETE_MESSAGE = "Cannot delete this message: %s";
public static final String NO_PERMISSIONS_TO_EDIT_THIS_PROJECT = "No permissions to edit this project";
public static final String CANNOT_ACCESS_THIS_RESOURCE_USER_IS_NOT_OWNER = "Cannot access this resource. User is not owner.";
public static final String DATA_EXPLORER_AVAILABLE_FOR_PUBLISHED_PROJECTS_ONLY = "Data explorer available for published projects only";
Expand Down
92 changes: 72 additions & 20 deletions src/main/java/org/highmed/numportal/service/MessageService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;

import static org.highmed.numportal.domain.templates.ExceptionsTemplate.CANNOT_DELETE_MESSAGE;
import static org.highmed.numportal.domain.templates.ExceptionsTemplate.CANNOT_HANDLE_DATE;
import static org.highmed.numportal.domain.templates.ExceptionsTemplate.CANNOT_UPDATE_MESSAGE_INVALID;
import static org.highmed.numportal.domain.templates.ExceptionsTemplate.MESSAGE_NOT_FOUND;

Expand All @@ -30,45 +34,93 @@ public class MessageService {
public MessageDto createUserMessage(MessageDto messageDto, String userId) {
Message message = messageMapper.convertToEntity(messageDto);
userDetailsService.checkIsUserApproved(userId);
validateDates(message.getStartDate(), message.getEndDate());
validateDates(message.getStartDate(), message.getEndDate(), LocalDateTime.now().minusMinutes(5));
Message savedMessage = messageRepository.save(message);

return messageMapper.convertToDTO(savedMessage);
}

public MessageDto updateUserMessage(Long id, MessageDto messageDto, String userId) {
public Page<MessageDto> getMessages(String userId, Pageable pageable) {
userDetailsService.checkIsUserApproved(userId);
Page<Message> messagePage = messageRepository.findMessages(pageable);
return messagePage.map(message -> messageMapper.convertToDTO(message));
}

public MessageDto updateUserMessage(Long id, MessageDto messageDto, String userId) {
userDetailsService.checkIsUserApproved(userId);
LocalDateTime now = LocalDateTime.now().minusMinutes(5);
Message messageToUpdate = messageRepository.findById(id)
.orElseThrow(() -> new ResourceNotFound(MessageService.class, MESSAGE_NOT_FOUND,
String.format(MESSAGE_NOT_FOUND, id)));
validateDates(messageDto.getStartDate(), messageDto.getEndDate());

//Todo: Gibt es neben dem Datum weitere Einschränkungen, wann eine Message geupdated werden kann
messageToUpdate.setTitle(messageDto.getTitle());
messageToUpdate.setText(messageDto.getText());
messageToUpdate.setStartDate(messageDto.getStartDate());
messageToUpdate.setEndDate(messageDto.getEndDate());
messageToUpdate.setType(messageDto.getType());
if (isInactiveMessage(messageToUpdate, now)) {
throw new BadRequestException(MessageService.class, CANNOT_UPDATE_MESSAGE_INVALID,
String.format(CANNOT_UPDATE_MESSAGE_INVALID, messageToUpdate.getId(), "message is not shown anymore"));
}
if (isActiveMessage(messageDto, messageToUpdate, now)) {
messageToUpdate.setEndDate(messageDto.getEndDate());
} else {
validateDates(messageDto.getStartDate(), messageDto.getEndDate(), now);

messageToUpdate.setTitle(messageDto.getTitle());
messageToUpdate.setText(messageDto.getText());
messageToUpdate.setStartDate(messageDto.getStartDate());
messageToUpdate.setEndDate(messageDto.getEndDate());
messageToUpdate.setType(messageDto.getType());

}
Message savedMessage = messageRepository.save(messageToUpdate);
return messageMapper.convertToDTO(savedMessage);
}

private void validateDates(LocalDateTime startDate, LocalDateTime endDate) {
if (startDate == null && endDate == null) {
return;
public MessageDto partialUpdateUserMessage(Long id, LocalDateTime endDate, String userId) {
userDetailsService.checkIsUserApproved(userId);
LocalDateTime now = LocalDateTime.now().minusMinutes(5);
Message messageToUpdate = messageRepository.findById(id)
.orElseThrow(() -> new ResourceNotFound(MessageService.class, MESSAGE_NOT_FOUND,
String.format(MESSAGE_NOT_FOUND, id)));
if (isInactiveMessage(messageToUpdate, now) && isPlannedMessage(messageToUpdate, now)) {
throw new BadRequestException(MessageService.class, CANNOT_UPDATE_MESSAGE_INVALID,
String.format(CANNOT_UPDATE_MESSAGE_INVALID, messageToUpdate, "Message is not active"));
}
LocalDateTime now = LocalDateTime.now();
if (startDate != null && startDate.isBefore(now)) {
throw new BadRequestException(MessageService.class, CANNOT_UPDATE_MESSAGE_INVALID);
messageToUpdate.setEndDate(endDate);
Message savedMessage = messageRepository.save(messageToUpdate);
return messageMapper.convertToDTO(savedMessage);
}

public void deleteUserMessage(Long id, String userId) {
LocalDateTime now = LocalDateTime.now().minusMinutes(5);
userDetailsService.checkIsUserApproved(userId);
Message messageToDelete = messageRepository.findById(id)
.orElseThrow(() -> new ResourceNotFound(MessageService.class, MESSAGE_NOT_FOUND,
String.format(MESSAGE_NOT_FOUND, id)));
if (messageToDelete.getStartDate().isBefore(now) || messageToDelete.getEndDate().isAfter(now)) {
throw new BadRequestException(MessageService.class, CANNOT_DELETE_MESSAGE,
String.format(CANNOT_DELETE_MESSAGE, messageToDelete.getId()));
}
if (endDate != null && endDate.isBefore(now)) {
throw new BadRequestException(MessageService.class, CANNOT_UPDATE_MESSAGE_INVALID);
messageRepository.deleteById(id);
}

private static boolean isInactiveMessage(Message messageToUpdate, LocalDateTime now) {
return messageToUpdate.getEndDate().isBefore(now);
}

private static boolean isActiveMessage(MessageDto messageDto, Message messageToUpdate, LocalDateTime now) {
return messageToUpdate.getStartDate().isBefore(now) && messageDto.getEndDate().isAfter(now);
}

private static boolean isPlannedMessage(Message messageToUpdate, LocalDateTime now) {
return messageToUpdate.getStartDate().isAfter(now);
}

private void validateDates(LocalDateTime startDate, LocalDateTime endDate, LocalDateTime now) {
if (startDate.isBefore(now)) {
throw new BadRequestException(MessageService.class, CANNOT_HANDLE_DATE,
String.format(CANNOT_HANDLE_DATE, startDate));
}
if (startDate != null && endDate != null
&& (startDate.isAfter(endDate) || startDate.isEqual(endDate))) {
throw new BadRequestException(MessageService.class, CANNOT_UPDATE_MESSAGE_INVALID);
if (startDate.isAfter(endDate) || startDate.isEqual(endDate)) {
throw new BadRequestException(MessageService.class, CANNOT_HANDLE_DATE,
String.format(CANNOT_HANDLE_DATE, endDate));
}
}
}
52 changes: 50 additions & 2 deletions src/main/java/org/highmed/numportal/web/controller/MessageController.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.highmed.numportal.web.controller;

import org.highmed.numportal.domain.dto.MessageDto;
import org.highmed.numportal.mapper.MessageMapper;
import org.highmed.numportal.service.MessageService;
import org.highmed.numportal.service.logger.ContextLog;
import org.highmed.numportal.web.config.Role;
Expand All @@ -10,24 +11,35 @@
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDateTime;

@RestController
@AllArgsConstructor
@RequestMapping(value = "/message", produces = "application/json")
@SecurityRequirement(name = "security_auth")
public class MessageController {

private final MessageService messageService;
private final MessageMapper messageMapper;

@ContextLog(type = "MessageManagement", description = "Create user message")
@PostMapping()
Expand All @@ -40,15 +52,51 @@ public ResponseEntity<MessageDto> createUserMessage(
return ResponseEntity.ok(messageService.createUserMessage(messageDto, principal.getSubject()));
}

@ContextLog(type = "MessageManagement", description = "Update a message")
@GetMapping()
@Operation(
description = "Get list of all pageable user messages sorted default by startdate")
@PreAuthorize(Role.CONTENT_ADMIN)
public ResponseEntity<Page<MessageDto>> getUserMessages(
@AuthenticationPrincipal @NotNull Jwt principal,
@PageableDefault(size = 100, sort = "startDate") Pageable pageable) {
return ResponseEntity.ok(messageService.getMessages(principal.getSubject(), pageable));
}

@ContextLog(type = "MessageManagement", description = "Update a user message")
@PutMapping(value = "/{id}")
@Operation(
description = "Update a message")
description = "Update a user message")
@PreAuthorize(Role.CONTENT_ADMIN)
public ResponseEntity<MessageDto> updateUserMessage(
@PathVariable("id") Long id,
@AuthenticationPrincipal @NotNull Jwt principal,
@Valid @NotNull @RequestBody MessageDto messageDto) {
return ResponseEntity.ok(messageService.updateUserMessage(id, messageDto, principal.getSubject()));
}

@ContextLog(type = "MessageManagement", description = "Extend End date of a user message")
@PatchMapping(value = "/{id}")
@Operation(
description = "Extend End date of a user message")
@PreAuthorize(Role.CONTENT_ADMIN)
public ResponseEntity<MessageDto> partialUpdateUserMessage(
@PathVariable("id") Long id,
@AuthenticationPrincipal @NotNull Jwt principal,
@Valid @NotNull @RequestParam LocalDateTime endDate) {
return ResponseEntity.ok(messageService.partialUpdateUserMessage(id, endDate, principal.getSubject()));
}

@ContextLog(type = "MessageManagement", description = "Delete a user message")
@DeleteMapping(value = "/{id}")
@Operation(
description = "Delete a user message")
@PreAuthorize(Role.CONTENT_ADMIN)
public ResponseEntity<Void> deleteUserMessage(
@PathVariable("id") Long id,
@AuthenticationPrincipal @NotNull Jwt principal) {
messageService.deleteUserMessage(id, principal.getSubject());
return ResponseEntity.ok().build();
}
}


0 comments on commit 80e638f

Please sign in to comment.