From fc6c60ad0c146329f28ea6769fb8031ef12ae2f9 Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Mon, 25 Aug 2025 19:25:28 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kayashov/bar/controller/dto/VisitorResponseDto.java | 2 ++ src/main/java/ru/kayashov/bar/model/entity/Visitor.java | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/kayashov/bar/controller/dto/VisitorResponseDto.java b/src/main/java/ru/kayashov/bar/controller/dto/VisitorResponseDto.java index 4eadc7c..af1f162 100644 --- a/src/main/java/ru/kayashov/bar/controller/dto/VisitorResponseDto.java +++ b/src/main/java/ru/kayashov/bar/controller/dto/VisitorResponseDto.java @@ -13,6 +13,7 @@ public class VisitorResponseDto { private String lastName; private Boolean invited; private Boolean isActive; + private String image; private String role; public static VisitorResponseDto mapToDto(Visitor e) { @@ -22,6 +23,7 @@ public class VisitorResponseDto { d.setName(e.getName()); d.setLastName(e.getLastName()); d.setRole(e.getRole().toString()); + d.setImage(e.getImage()); return d; } diff --git a/src/main/java/ru/kayashov/bar/model/entity/Visitor.java b/src/main/java/ru/kayashov/bar/model/entity/Visitor.java index f81b82b..a7bf0cc 100644 --- a/src/main/java/ru/kayashov/bar/model/entity/Visitor.java +++ b/src/main/java/ru/kayashov/bar/model/entity/Visitor.java @@ -26,6 +26,7 @@ public class Visitor implements UserDetails { @Enumerated(EnumType.STRING) private UserRole role; private Integer code; + private String image; private String login; private String password; private LocalDateTime expired; @@ -33,13 +34,6 @@ public class Visitor implements UserDetails { @Override public Collection getAuthorities() { return role.getAuthorities(); -// return UserRole.ADMIN.getAuthorities(); -// return residents.stream() -// .filter(BarResident::getActive) -// .map(BarResident::getRole) -// .map(UserRole::getAuthorities) -// .flatMap(Collection::stream) -// .collect(Collectors.toSet()); } @Override