Fix missing package properties

SendSafely · Jan 16, 2020 · 7e098b0 · 7e098b0
1 parent 31e99ec
commit 7e098b0
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/SendSafelyAPI/src/com/sendsafely/dto/response/PackageInformationResponse.java b/SendSafelyAPI/src/com/sendsafely/dto/response/PackageInformationResponse.java
@@ -1,5 +1,6 @@
 package com.sendsafely.dto.response;
 
+import java.util.Date;
 import java.util.List;
 
 import com.sendsafely.ContactGroup;
@@ -24,6 +25,8 @@ public class PackageInformationResponse extends BaseResponse {
 	private String label;
 	private boolean isVDR;
 	private String rootDirectoryId;
+	private Date packageTimestamp;
+	private String packageSender;
 
 	public List<RecipientResponse> getRecipients() {
 		return recipients;
@@ -128,6 +131,18 @@ public String getRootDirectoryId() {
 	public void setRootDirectoryId(String rootDirectoryId) {
 		this.rootDirectoryId = rootDirectoryId;
 	}
+	public Date getPackageTimestamp() {
+		return packageTimestamp;
+	}
+	public void setPackageTimestamp(Date packageTimestamp) {
+		this.packageTimestamp = packageTimestamp;
+	}
+	public String getPackageSender() {
+		return packageSender;
+	}
+	public void setPackageSender(String packageSender) {
+		this.packageSender = packageSender;
+	}
 
 
 

diff --git a/SendSafelyAPI/src/com/sendsafely/dto/response/PackageListResponse.java b/SendSafelyAPI/src/com/sendsafely/dto/response/PackageListResponse.java
@@ -19,7 +19,8 @@ public class PackageListResponse extends BaseResponse {
 	private PackageState state;
 	private int packageState;
 	private int life;
-	private String description;
+	private String packageLabel;
+	private boolean packageIsVdr;
 	private String packageUserName;
 	private Date packageUpdateTimestamp;
 
@@ -84,10 +85,16 @@ public void setLife(int life) {
 		this.life = life;
 	}
 	public String getDescription() {
-		return description;
+		return packageLabel;
 	}
 	public void setDescription(String description) {
-		this.description = description;
+		this.packageLabel = description;
+	}
+	public boolean getIsWorkspace() {
+		return packageIsVdr;
+	}
+	public void setIsWorkspace(boolean isWorkspace) {
+		this.packageIsVdr = isWorkspace;
 	}
 	public String getPackageUserName() {
 		return packageUserName;

diff --git a/SendSafelyAPI/src/com/sendsafely/handlers/GetOrganizationPackagesHandler.java b/SendSafelyAPI/src/com/sendsafely/handlers/GetOrganizationPackagesHandler.java
@@ -79,6 +79,8 @@ protected PackageReference convert(PackageListResponse obj) {
 		info.setStatus(convert(obj.getPackageState()));
 		info.setPackageOwner(obj.getPackageUserName());
 		info.setPackageTimestamp(obj.getPackageUpdateTimestamp());
+		info.setPackageDescriptor(obj.getDescription());
+		info.setIsWorkspace(obj.getIsWorkspace());
 		return info;
 	}
 

diff --git a/SendSafelyAPI/src/com/sendsafely/handlers/GetPackagesHandler.java b/SendSafelyAPI/src/com/sendsafely/handlers/GetPackagesHandler.java
@@ -66,6 +66,8 @@ protected PackageReference convert(PackageListResponse obj) {
 		info.setContactGroupNames(obj.getContactGroups());
 		info.setServerSecret(obj.getServerSecret());
 		info.setState(obj.getState());
+		info.setPackageTimestamp(obj.getPackageUpdateTimestamp());
+		info.setPackageOwner(obj.getPackageUserName());
 
 		return info;
 	}

diff --git a/SendSafelyAPI/src/com/sendsafely/handlers/PackageInformationHandler.java b/SendSafelyAPI/src/com/sendsafely/handlers/PackageInformationHandler.java
@@ -86,6 +86,8 @@ protected Package convert(PackageInformationResponse obj)
 		info.setRootDirectoryId(obj.getRootDirectoryId());
 		info.setPackageDescriptor(obj.getLabel());
 		info.setIsWorkspace(obj.isVDR());
+		info.setPackageTimestamp(obj.getPackageTimestamp());
+		info.setPackageOwner(obj.getPackageSender());
 		return info;
 	}