DST-15503 Fixes for user export changes (#819)

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Build
 
 on:
+  workflow_dispatch:
   release:
     types: [published, edited]
   push:

src/main/java/uk/co/bconline/ndelius/model/ExportResult.java

@@ -45,12 +45,12 @@ public final class ExportResult {
 	private String teams;
 	@CsvBindByName(column = "LAU")
 	@CsvBindByPosition(position = 14)
-	private String lau;
+	private String localAdminUnit;
 	@CsvBindByName(column = "PDU")
 	@CsvBindByPosition(position = 15)
-	private String pdu;
+	private String probationDeliveryUnit;
 	@CsvBindByPosition(position = 16)
 	private String provider;
 	@CsvBindByPosition(position = 17)
-	private String roleDescriptions;
+	private String roleNames;
 }

src/main/java/uk/co/bconline/ndelius/model/entity/export/BoroughExportEntity.java

@@ -3,26 +3,17 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import uk.co.bconline.ndelius.model.entity.converter.YNConverter;
+
+import javax.persistence.*;
 import java.io.Serializable;
-import java.time.LocalDate;
 
 @Getter
 @Entity
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "BOROUGH")
-public class BoroughExportEntity implements Serializable
-{
+public class BoroughExportEntity implements Serializable {
 	@Id
 	@Column(name = "BOROUGH_ID")
 	@GeneratedValue(generator = "BOROUGH_ID_SEQ")
@@ -35,11 +26,15 @@ public class BoroughExportEntity implements Serializable
 	@Column(name = "DESCRIPTION")
 	private String description;
 
+	@Column(name = "SELECTABLE")
+	@Convert(converter = YNConverter.class)
+	private boolean selectable;
+
 	@ManyToOne
 	@JoinColumn(name = "PROBATION_AREA_ID")
 	private ProbationAreaExportEntity probationArea;
 
-	@Column(name = "END_DATE")
-	@Type(type = "java.time.LocalDate")
-	private LocalDate endDate;
+	public String getExportDescription() {
+		return description + " (" + code + ")" + (isSelectable() ? "" : " [Inactive]");
+	}
 }

src/main/java/uk/co/bconline/ndelius/model/entity/export/DistrictExportEntity.java

@@ -0,0 +1,41 @@
+package uk.co.bconline.ndelius.model.entity.export;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import uk.co.bconline.ndelius.model.entity.converter.YNConverter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Getter
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "DISTRICT")
+public class DistrictExportEntity implements Serializable
+{
+	@Id
+	@Column(name = "DISTRICT_ID")
+	@GeneratedValue(generator = "DISTRICT_ID_SEQ")
+	@SequenceGenerator(name = "DISTRICT_ID_SEQ", sequenceName = "DISTRICT_ID_SEQ", allocationSize = 1)
+	private Long id;
+
+	@Column(name = "CODE")
+	private String code;
+
+	@Column(name = "DESCRIPTION")
+	private String description;
+
+	@Column(name = "SELECTABLE")
+	@Convert(converter = YNConverter.class)
+	private boolean selectable;
+
+	@ManyToOne
+	@JoinColumn(name = "BOROUGH_ID")
+	private BoroughExportEntity borough;
+
+	public String getExportDescription() {
+		return description + " (" + code + ")" + (isSelectable() ? "" : " [Inactive]");
+	}
+}

src/main/java/uk/co/bconline/ndelius/model/entity/export/ProbationAreaExportEntity.java

@@ -3,15 +3,13 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
 
 import static java.time.LocalDate.now;
-import static org.hibernate.annotations.CacheConcurrencyStrategy.READ_ONLY;
 
 @Entity
 @Getter
@@ -37,6 +35,6 @@ public class ProbationAreaExportEntity implements Serializable {
 
 	public String getExportDescription()
 	{
-		return description + " (" + code + ") " + ((getEndDate() != null && getEndDate().isBefore(now())) ? " [Inactive]" : " [Active]");
+		return description + " (" + code + ")" + ((getEndDate() != null && getEndDate().isBefore(now())) ? " [Inactive]" : "");
 	}
 }

src/main/java/uk/co/bconline/ndelius/model/entity/export/TeamExportEntity.java

@@ -29,40 +29,15 @@ public class TeamExportEntity implements Serializable {
 	@Column(name = "DESCRIPTION")
 	private String description;
 
-	@ManyToOne
-	@JoinColumn(name = "LOCAL_DELIVERY_UNIT_ID")
-	private LDUExportEntity localDeliveryUnit;
-
 	@ManyToOne
 	@JoinColumn(name = "DISTRICT_ID")
-	private BoroughExportEntity borough;
+	private DistrictExportEntity district;
 
 	@Column(name = "END_DATE")
 	@Type(type = "java.time.LocalDate")
 	private LocalDate endDate;
 
-	public String getExportDescription()
-	{
-		return description + " (" + code + ") " + ((getEndDate() != null && getEndDate().isBefore(now())) ? " [Inactive]" : " [Active]");
-	}
-
-	public String getLDUDescription()
-	{
-		if (localDeliveryUnit != null)
-		{
-			return localDeliveryUnit.getDescription() + " (" + localDeliveryUnit.getCode() + ") " + ((localDeliveryUnit.getEndDate() != null && localDeliveryUnit.getEndDate().isBefore(now())) ? " [Inactive]" : " [Active]");
-		} else {
-			return null;
-		}
-	}
-
-	public String getBoroughDescription()
-	{
-		if (borough != null)
-		{
-			return borough.getDescription() + " (" + borough.getCode() + ") " + ((borough.getEndDate() != null && borough.getEndDate().isBefore(now())) ? " [Inactive]" : " [Active]");
-		} else {
-			return null;
-		}
+	public String getExportDescription() {
+		return description + " (" + code + ")" + ((getEndDate() != null && getEndDate().isBefore(now())) ? " [Inactive]" : "");
 	}
 }

src/main/java/uk/co/bconline/ndelius/service/UserRoleService.java

@@ -1,6 +1,5 @@
 package uk.co.bconline.ndelius.service;
 
-import uk.co.bconline.ndelius.model.entry.RoleAssociationEntry;
 import uk.co.bconline.ndelius.model.entry.RoleEntry;
 
 import java.util.List;
@@ -10,6 +9,7 @@ public interface UserRoleService
 {
 	Set<RoleEntry> getRolesICanAssign();
 	Set<RoleEntry> getUserRoles(String username);
+	Set<String> getUserRoleNames(String username);
 	List<String> getAllUsersWithRole(String role);
 	Set<RoleEntry> getClientRoles(String clientId);
 	Set<String> getUserInteractions(String username);

src/main/java/uk/co/bconline/ndelius/service/impl/UserRoleServiceImpl.java

@@ -90,6 +90,13 @@ public Set<RoleEntry> getUserRoles(String username) {
 		return getAssignedRoles(username, usersBase);
 	}
 
+	@Override
+	public Set<String> getUserRoleNames(String username) {
+		return stream(getAssignedRoleAssociations(username, usersBase).spliterator(), false)
+				.map(RoleAssociationEntry::getCn)
+				.collect(toSet());
+	}
+
 	@Override
 	public Set<RoleEntry> getClientRoles(String clientId) {
 		return getAssignedRoles(clientId, clientsBase);