admin management

pom.xml

@@ -26,7 +26,7 @@
         <keycloak.version>26.7.2</keycloak.version>
         <schedlock.version>7.7.0</schedlock.version>
         <swag.organizations.version>1.38-8c9b968</swag.organizations.version>
-        <damsel.version>1.685-5c25c2e</damsel.version>
+        <damsel.version>1.699-7280b62</damsel.version>
         <shared-resources.version>5.0.0</shared-resources.version>
         <woody.version>3.0.0</woody.version>
     </properties>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>org-management-proto</artifactId>
-            <version>1.18-6b1eb95</version>
+            <version>1.19-e5d3e5f</version>
             <exclusions>
                 <exclusion>
                     <groupId>dev.vality</groupId>

src/main/java/dev/vality/orgmanager/converter/AdminManagementConverter.java

@@ -0,0 +1,196 @@
+package dev.vality.orgmanager.converter;
+
+import dev.vality.orgmanagement.Invitation;
+import dev.vality.orgmanagement.InvitationStatus;
+import dev.vality.orgmanagement.Member;
+import dev.vality.orgmanagement.MemberRole;
+import dev.vality.orgmanagement.Organization;
+import dev.vality.orgmanagement.OrganizationRole;
+import dev.vality.orgmanagement.OrganizationStatus;
+import dev.vality.orgmanagement.RoleAssignment;
+import dev.vality.orgmanagement.RoleScope;
+import dev.vality.orgmanager.entity.InvitationEntity;
+import dev.vality.orgmanager.entity.MemberEntity;
+import dev.vality.orgmanager.entity.MemberRoleEntity;
+import dev.vality.orgmanager.entity.OrganizationEntity;
+import dev.vality.orgmanager.entity.OrganizationRoleEntity;
+import dev.vality.orgmanager.entity.StoredInvitationStatus;
+import dev.vality.orgmanager.service.dto.MemberWithRoleDto;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+
+@Component
+public class AdminManagementConverter {
+
+    private static final String NULL_METADATA = "null";
+
+    public Organization toOrganization(OrganizationEntity entity) {
+        Organization organization = new Organization(
+                entity.getId(),
+                entity.getParty(),
+                entity.getOwner(),
+                entity.getName(),
+                formatDateTime(entity.getCreatedAt()),
+                toOrganizationStatus(entity.getStatus()));
+        String metadata = metadataOrNull(entity.getMetadata());
+        if (metadata != null) {
+            organization.setMetadata(metadata);
+        }
+        return organization;
+    }
+
+    public Member toMember(MemberEntity entity, String organizationId) {
+        List<MemberRole> roles = collectionOrEmpty(entity.getRoles()).stream()
+                .filter(MemberRoleEntity::isActive)
+                .filter(role -> organizationId.equals(role.getOrganizationId()))
+                .sorted(Comparator.comparing(MemberRoleEntity::getId))
+                .map(this::toMemberRole)
+                .toList();
+        Member member = new Member(entity.getId(), roles);
+        if (entity.getEmail() != null) {
+            member.setEmail(entity.getEmail());
+        }
+        return member;
+    }
+
+    /**
+     * Собирает участников из плоской выборки {@code member x member_role}. Строки без
+     * memberRoleId — участники без активных ролей в организации, у них список ролей пустой.
+     */
+    public List<Member> toMembers(List<MemberWithRoleDto> rows) {
+        Map<String, Member> members = new LinkedHashMap<>();
+        for (MemberWithRoleDto row : collectionOrEmpty(rows)) {
+            Member member = members.computeIfAbsent(row.getId(), id -> {
+                Member created = new Member(id, new ArrayList<>());
+                if (row.getEmail() != null) {
+                    created.setEmail(row.getEmail());
+                }
+                return created;
+            });
+            if (row.getMemberRoleId() != null) {
+                member.getRoles().add(toMemberRole(row));
+            }
+        }
+        return List.copyOf(members.values());
+    }
+
+    public MemberRole toMemberRole(MemberRoleEntity entity) {
+        MemberRole role = new MemberRole(entity.getId(), entity.getRoleId());
+        if (entity.getScopeId() != null) {
+            role.setScope(toRoleScope(entity.getScopeId(), entity.getResourceId()));
+        }
+        return role;
+    }
+
+    private MemberRole toMemberRole(MemberWithRoleDto row) {
+        MemberRole role = new MemberRole(row.getMemberRoleId(), row.getRoleId());
+        if (row.getScopeId() != null) {
+            role.setScope(toRoleScope(row.getScopeId(), row.getResourceId()));
+        }
+        return role;
+    }
+
+    public RoleAssignment toRoleAssignment(MemberRoleEntity entity) {
+        RoleAssignment assignment = new RoleAssignment(entity.getRoleId());
+        if (entity.getScopeId() != null) {
+            assignment.setScope(toRoleScope(entity.getScopeId(), entity.getResourceId()));
+        }
+        return assignment;
+    }
+
+    public Invitation toInvitation(InvitationEntity entity) {
+        List<RoleAssignment> roles = collectionOrEmpty(entity.getInviteeRoles()).stream()
+                .sorted(Comparator.comparing(MemberRoleEntity::getId))
+                .map(this::toRoleAssignment)
+                .toList();
+        Invitation invitation = new Invitation(
+                entity.getId(),
+                entity.getOrganizationId(),
+                formatDateTime(entity.getCreatedAt()),
+                formatDateTime(entity.getExpiresAt()),
+                entity.getInviteeContactEmail(),
+                roles,
+                effectiveInvitationStatus(entity));
+        String metadata = metadataOrNull(entity.getMetadata());
+        if (metadata != null) {
+            invitation.setMetadata(metadata);
+        }
+        if (entity.getAcceptedAt() != null) {
+            invitation.setAcceptedAt(formatDateTime(entity.getAcceptedAt()));
+        }
+        if (entity.getAcceptedMemberId() != null) {
+            invitation.setAcceptedMemberId(entity.getAcceptedMemberId());
+        }
+        if (entity.getRevokedAt() != null) {
+            invitation.setRevokedAt(formatDateTime(entity.getRevokedAt()));
+        }
+        if (entity.getRevocationReason() != null) {
+            invitation.setRevocationReason(entity.getRevocationReason());
+        }
+        return invitation;
+    }
+
+    public InvitationStatus effectiveInvitationStatus(InvitationEntity entity) {
+        InvitationStatus storedStatus = toInvitationStatus(entity.getStatus());
+        if (storedStatus == InvitationStatus.pending && entity.isExpired()) {
+            return InvitationStatus.expired;
+        }
+        return storedStatus;
+    }
+
+    public OrganizationRole toOrganizationRole(OrganizationRoleEntity entity) {
+        List<String> scopeIds = collectionOrEmpty(entity.getPossibleScopes()).stream()
+                .map(scope -> scope.getId())
+                .filter(Objects::nonNull)
+                .sorted()
+                .toList();
+        return new OrganizationRole(entity.getRoleId(), entity.getName(), scopeIds);
+    }
+
+    private RoleScope toRoleScope(String scopeId, String resourceId) {
+        RoleScope scope = new RoleScope(scopeId);
+        if (resourceId != null) {
+            scope.setResourceId(resourceId);
+        }
+        return scope;
+    }
+
+    private OrganizationStatus toOrganizationStatus(String status) {
+        if (status == null) {
+            return OrganizationStatus.active;
+        }
+        return OrganizationStatus.valueOf(status.toLowerCase(Locale.ROOT));
+    }
+
+    private InvitationStatus toInvitationStatus(String status) {
+        return switch (StoredInvitationStatus.fromValue(status)) {
+            case PENDING -> InvitationStatus.pending;
+            case ACCEPTED -> InvitationStatus.accepted;
+            case EXPIRED -> InvitationStatus.expired;
+            case REVOKED -> InvitationStatus.revoked;
+        };
+    }
+
+
+    private String metadataOrNull(String metadata) {
+        return metadata == null || NULL_METADATA.equals(metadata.strip()) ? null : metadata;
+    }
+
+    private String formatDateTime(LocalDateTime dateTime) {
+        return dateTime == null ? null : dateTime.atOffset(ZoneOffset.UTC).toString();
+    }
+
+    private <T> Collection<T> collectionOrEmpty(Collection<T> collection) {
+        return collection == null ? List.of() : collection;
+    }
+}

src/main/java/dev/vality/orgmanager/converter/InvitationConverter.java

@@ -2,6 +2,7 @@
 
 import dev.vality.orgmanager.config.properties.InviteTokenProperties;
 import dev.vality.orgmanager.entity.InvitationEntity;
+import dev.vality.orgmanager.entity.StoredInvitationStatus;
 import dev.vality.orgmanager.util.JsonCodec;
 import dev.vality.swag.organizations.model.*;
 import lombok.RequiredArgsConstructor;
@@ -49,7 +50,7 @@ public InvitationEntity toEntity(InvitationRequest invitation, String orgId) {
                         .map(role -> memberRoleConverter.toEntity(role, orgId))
                         .collect(toSet()))
                 .metadata(jsonCodec.toJson(invitation.getMetadata()))
-                .status(InvitationStatusName.PENDING.getValue())
+                .status(StoredInvitationStatus.PENDING.getValue())
                 .acceptToken(UUID.randomUUID().toString()) // TODO [a.romanov]: token
                 .build();
     }

src/main/java/dev/vality/orgmanager/entity/OrganizationEntity.java

@@ -42,4 +42,6 @@ public class OrganizationEntity implements Serializable {
     private String owner;
     private String party;
     private String metadata;
+    @Builder.Default
+    private String status = "active";
 }

src/main/java/dev/vality/orgmanager/entity/StoredInvitationStatus.java

@@ -0,0 +1,35 @@
+package dev.vality.orgmanager.entity;
+
+import java.util.Arrays;
+
+/**
+ * Значения колонки {@code invitation.status}.
+ */
+public enum StoredInvitationStatus {
+
+    PENDING("Pending"),
+    ACCEPTED("Accepted"),
+    EXPIRED("Expired"),
+    REVOKED("Revoked");
+
+    private final String value;
+
+    StoredInvitationStatus(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public boolean matches(String status) {
+        return value.equalsIgnoreCase(status);
+    }
+
+    public static StoredInvitationStatus fromValue(String status) {
+        return Arrays.stream(values())
+                .filter(candidate -> candidate.matches(status))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown invitation status: " + status));
+    }
+}

src/main/java/dev/vality/orgmanager/entity/StoredInviteeContactType.java

@@ -0,0 +1,16 @@
+package dev.vality.orgmanager.entity;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Значения колонки {@code invitation.invitee_contact_type}.
+ */
+@Getter
+@RequiredArgsConstructor
+public enum StoredInviteeContactType {
+
+    EMAIL("EMail");
+
+    private final String value;
+}

src/main/java/dev/vality/orgmanager/entity/StoredOrganizationStatus.java

@@ -0,0 +1,30 @@
+package dev.vality.orgmanager.entity;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * Значения колонки {@code organization.status}.
+ */
+@Getter
+@RequiredArgsConstructor
+public enum StoredOrganizationStatus {
+
+    ACTIVE("active"),
+    DEACTIVATED("deactivated");
+
+    private final String value;
+
+    public boolean matches(String status) {
+        return value.equalsIgnoreCase(status);
+    }
+
+    public static StoredOrganizationStatus fromValue(String status) {
+        return Arrays.stream(values())
+                .filter(candidate -> candidate.matches(status))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown organization status: " + status));
+    }
+}

src/main/java/dev/vality/orgmanager/repository/MemberRepository.java

@@ -32,6 +32,32 @@ public interface MemberRepository extends JpaRepository<MemberEntity, String> {
             "     AND m.id = mtmr.member_id ")
     List<MemberWithRoleDto> getOrgMemberList(String orgId);
 
+    /**
+     * То же, что {@link #getOrgMemberList(String)}, но джойн ролей внешний: участник без активных
+     * ролей в организации тоже попадает в выдачу. Административный контракт умеет добавлять
+     * участника без роли (AddMember), и такой участник не должен пропадать из списка.
+     * У строк для участника без ролей memberRoleId == null.
+     */
+    @NativeQuery("SELECT m.id, " +
+            "              m.email, " +
+            "              mr.id as memberRoleId, " +
+            "              mr.organization_id as organizationId, " +
+            "              mr.role_id as roleId, " +
+            "              mr.scope_id as scopeId, " +
+            "              mr.resource_id as resourceId" +
+            " FROM org_manager.member_to_organization mto " +
+            "     JOIN org_manager.member m " +
+            "       ON m.id = mto.member_id " +
+            "     LEFT JOIN org_manager.member_to_member_role mtmr " +
+            "       ON mtmr.member_id = m.id " +
+            "     LEFT JOIN org_manager.member_role mr " +
+            "       ON mr.id = mtmr.member_role_id " +
+            "      AND mr.active IS TRUE " +
+            "      AND mr.organization_id = mto.organization_id " +
+            " WHERE mto.organization_id = ?1 " +
+            " ORDER BY m.id, mr.id ")
+    List<MemberWithRoleDto> getOrgMemberListWithRoles(String orgId);
+
     boolean existsById(String id);
 
 

src/main/java/dev/vality/orgmanager/repository/OrganizationRepository.java

@@ -3,6 +3,7 @@
 import dev.vality.orgmanager.entity.OrganizationEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.NativeQuery;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -36,4 +37,17 @@ public interface OrganizationRepository extends JpaRepository<OrganizationEntity
 
     Set<OrganizationEntity> findAllByOwner(String owner);
 
+    boolean existsByParty(String party);
+
+    List<OrganizationEntity> findAllByOrderByIdDesc(Pageable pageable);
+
+    List<OrganizationEntity> findByIdLessThanOrderByIdDesc(String id, Pageable pageable);
+
+    List<OrganizationEntity> findByStatusOrderByIdDesc(String status, Pageable pageable);
+
+    List<OrganizationEntity> findByStatusAndIdLessThanOrderByIdDesc(
+            String status,
+            String id,
+            Pageable pageable);
+
 }