Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
}

group = 'uk.gov.hmcts'
version = '0.3.0'
version = '0.3.1'

java {
toolchain {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package uk.gov.hmcts.opal.common.user.authorisation.client.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class DomainDto {

@JsonProperty("business_unit_users")
private List<BusinessUnitUserDto> businessUnitUsers;
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ public class UserStateDto implements Versioned, ToJsonString {
@JsonProperty("username")
private String username;

//Obtained from the Access Token (via Spring Security) until stored in the Database under
// TDIA: User Service - Matching Key and JIT Provisioning, and only applies when id is 0 (zero) until then.
@JsonProperty("name")
private String name;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package uk.gov.hmcts.opal.common.user.authorisation.client.dto;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import uk.gov.hmcts.opal.common.dto.ToJsonString;
import uk.gov.hmcts.opal.common.dto.Versioned;

import java.math.BigInteger;
import java.util.Map;
import java.util.Optional;

@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class UserStateV2Dto implements Versioned, ToJsonString {

@JsonProperty("user_id")
private Long userId;

//users.username
@JsonProperty("username")
private String username;

@JsonProperty("name")
private String name;

@JsonProperty("status")
private String status;

@JsonProperty("version")
private Long version;

@JsonProperty("cache_name")
private String cacheName;

@JsonProperty("domains")
private Map<String, DomainDto> domains;

@Override
public BigInteger getVersion() {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please can you add some quick Unit tests for this

return Optional.ofNullable(version).map(BigInteger::valueOf).orElse(null);
}
}
Loading