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