EPMRPP-89198 organizations routing refactor

Author: grabsefx

src/main/java/com/epam/ta/reportportal/ws/model/ActivityResource.java

@@ -22,13 +22,19 @@
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 
 /**
  * JSON Representation of Report Portal's Activity domain object.
  *
  * @see <a href="http://en.wikipedia.org/wiki/HATEOAS">HATEOAS Description</a>
  */
 @JsonInclude(Include.NON_NULL)
+@Getter
+@Setter
+@ToString
 public class ActivityResource {
 
 	@NotNull
@@ -69,104 +75,13 @@ public class ActivityResource {
 	@JsonProperty(value = "projectName")
 	private String projectName;
 
+  @JsonProperty(value = "projectKey")
+  private String projectKey;
+
 	@JsonProperty(value = "details")
 	private Object details;
 
 	@JsonProperty(value = "objectName")
 	private String objectName;
 
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getUser() {
-		return user;
-	}
-
-	public void setUser(String user) {
-		this.user = user;
-	}
-
-	public Long getLoggedObjectId() {
-		return loggedObjectId;
-	}
-
-	public void setLoggedObjectId(Long loggedObjectId) {
-		this.loggedObjectId = loggedObjectId;
-	}
-
-	public Date getLastModified() {
-		return lastModified;
-	}
-
-	public void setLastModified(Date lastModified) {
-		this.lastModified = lastModified;
-	}
-
-	public String getActionType() {
-		return actionType;
-	}
-
-	public void setActionType(String actionType) {
-		this.actionType = actionType;
-	}
-
-	public String getObjectType() {
-		return objectType;
-	}
-
-	public void setObjectType(String objectType) {
-		this.objectType = objectType;
-	}
-
-	public Long getProjectId() {
-		return projectId;
-	}
-
-	public void setProjectId(Long projectId) {
-		this.projectId = projectId;
-	}
-
-	public String getProjectName() {
-		return projectName;
-	}
-
-	public void setProjectName(String projectName) {
-		this.projectName = projectName;
-	}
-
-	public Object getDetails() {
-		return details;
-	}
-
-	public void setDetails(Object details) {
-		this.details = details;
-	}
-
-	public String getObjectName() {
-		return objectName;
-	}
-
-	public void setObjectName(String objectName) {
-		this.objectName = objectName;
-	}
-
-	@Override
-	public String toString() {
-		return "ActivityResource{" + "id=" + id
-				+ ", user='" + user + '\''
-				+ ", loggedObjectId='" + loggedObjectId + '\''
-				+ ", lastModified=" + lastModified
-				+ ", actionType='" + actionType + '\''
-				+ ", objectType='" + objectType + '\''
-				+ ", projectId=" + projectId
-				+ ", projectName='" + projectName + '\''
-				+ ", objectName='" + objectName + '\''
-				+ ", details=" + details
-				+ '}';
-	}
 }

src/main/java/com/epam/ta/reportportal/ws/model/ErrorType.java

@@ -189,6 +189,11 @@ public enum ErrorType {
 	 */
 	CLUSTER_NOT_FOUND(40428, "Cluster '{}' not found"),
 
+  /**
+   * If specified by id Organization not found
+   */
+  ORGANIZATION_NOT_FOUND(40429, "Organization '{}' not found. Did you use correct Organization ID?"),
+
 	/**
 	 * Common error in case if object not found
 	 */

src/main/java/com/epam/ta/reportportal/ws/model/ValidationConstraints.java

@@ -81,8 +81,9 @@ public class ValidationConstraints {
 	public static final int MIN_NUMBER_OF_LOG_LINES = -1;
 	public static final String HEX_COLOR_REGEXP = "#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$";
 	public static final String PROJECT_NAME_REGEXP = "[a-zA-Z0-9-_]+";
+  public static final String PROJECT_SLUG_REGEXP = "^[a-z0-9-_]+$";
 
-	private ValidationConstraints() {
+  private ValidationConstraints() {
 
 	}