@@ -1,4 +1,5 @@
|
||||
package ru.soune.nocopy.dto.violation;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -11,6 +12,7 @@ public class ViolationNotionResponse {
|
||||
private LocalDateTime createdAt;
|
||||
private LocalDateTime updatedAt;
|
||||
private UserInfo user;
|
||||
@JsonIgnore
|
||||
private FileInfo file;
|
||||
|
||||
@Data
|
||||
|
||||
@@ -120,6 +120,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
||||
notionRequest.getFileId(), userId);
|
||||
return BaseResponse.builder()
|
||||
.msgId(request.getMsgId())
|
||||
.messageCode(MessageCode.SUCCESS.getCode())
|
||||
.messageBody(notions)
|
||||
.build();
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -145,6 +146,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
||||
notionRequest.getNotionId(), userId);
|
||||
return BaseResponse.builder()
|
||||
.msgId(request.getMsgId())
|
||||
.messageCode(MessageCode.SUCCESS.getCode())
|
||||
.messageBody(notion)
|
||||
.build();
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -178,6 +180,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
||||
notionRequest.getFileId(), userId, notionRequest.getMessage());
|
||||
return BaseResponse.builder()
|
||||
.msgId(request.getMsgId())
|
||||
.messageCode(MessageCode.SUCCESS.getCode())
|
||||
.messageBody(created)
|
||||
.build();
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -211,6 +214,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
||||
notionRequest.getNotionId(), userId, notionRequest.getMessage());
|
||||
return BaseResponse.builder()
|
||||
.msgId(request.getMsgId())
|
||||
.messageCode(MessageCode.SUCCESS.getCode())
|
||||
.messageBody(updated)
|
||||
.build();
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -246,6 +250,7 @@ public class ViolationNotionHandler implements RequestHandler {
|
||||
.build();
|
||||
return BaseResponse.builder()
|
||||
.msgId(request.getMsgId())
|
||||
.messageCode(MessageCode.SUCCESS.getCode())
|
||||
.messageBody(deleteResponse)
|
||||
.build();
|
||||
} catch (IllegalArgumentException e) {
|
||||
|
||||
@@ -128,7 +128,7 @@ public class ViolationNotionService {
|
||||
.stream()
|
||||
.map(User::getId)
|
||||
.toList();
|
||||
if (companyUsers.contains(userId)) {
|
||||
if (!companyUsers.contains(userId)) {
|
||||
throw new SecurityException("User does not have access to this file");
|
||||
}
|
||||
} else if (!file.getUserId().equals(userId)) {
|
||||
|
||||
Reference in New Issue
Block a user