Skip to content

Commit

Permalink
api: Update APIs - issue labels
Browse files Browse the repository at this point in the history
  • Loading branch information
@doortts
doortts committed Jul 8, 2017
1 parent 79a92f1 commit 3c12b84
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 20 deletions.
20 changes: 20 additions & 0 deletions app/controllers/api/IssueApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ private static JsonNode createIssuesNode(JsonNode json, Project project) {
issue.assignee = findAssginee(json.findValue("assignees"), project);
issue.milestone = findMilestone(json.findValue("milestoneTitle"), project);
issue.dueDate = findDueDate(json.findValue("dueDate"));
updateLabels(json, issue, project);
issue.numOfComments = 0;

if(json.findValue("number") != null && json.findValue("number").asLong() > 0){
Expand All @@ -119,6 +120,25 @@ private static JsonNode createIssuesNode(JsonNode json, Project project) {
return result;
}

private static void updateLabels(JsonNode json, Issue issue, Project project) {
JsonNode labelsNode = json.findValue("labels");
if (labelsNode != null && labelsNode.isArray()) {
for (JsonNode labelNode : labelsNode) {
IssueLabel issueLabel = IssueLabel.findByName(
labelNode.findValue("labelName").asText(),
labelNode.findValue("category").asText(),
project);
if(issueLabel != null){
play.Logger.warn("added " + issueLabel);
if(issue.labels == null) {
issue.labels = new HashSet<>();
}
issue.labels.add(issueLabel);
}
}
}
}

private static Milestone findMilestone(JsonNode milestoneTitle, Project project) {
if(milestoneTitle != null){
return Milestone.findMilestoneByTitle(project, milestoneTitle.asText());
Expand Down
118 changes: 98 additions & 20 deletions app/controllers/api/ProjectApi.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Yona, 21st Century Project Hosting SW
*
* <p>
* Copyright 2016 the original author or authors.
*/

Expand All @@ -10,12 +10,14 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import controllers.*;
import controllers.annotation.IsAllowed;
import controllers.annotation.IsCreatable;
import models.*;
import models.enumeration.Operation;
import models.enumeration.ProjectScope;
import models.enumeration.ResourceType;
import models.enumeration.RoleType;
import org.apache.commons.lang3.StringUtils;
import play.data.Form;
import play.db.ebean.Model;
import play.db.ebean.Transactional;
import play.i18n.Messages;
Expand All @@ -35,6 +37,7 @@

import static models.AbstractPosting.findByProject;
import static models.enumeration.ProjectScope.PRIVATE;
import static play.data.Form.form;
import static play.libs.Json.toJson;
import static utils.CacheStore.getProjectCacheKey;
import static utils.CacheStore.projectMap;
Expand Down Expand Up @@ -85,7 +88,7 @@ private static String getProjectScope(Project project) {

public static List<ObjectNode> getAssginees(Project project) {
List<ObjectNode> members = new ArrayList<>();
for(Assignee assignee: project.assignees){
for (Assignee assignee : project.assignees) {
ObjectNode member = Json.newObject();
member.put("loginId", assignee.user.loginId);
member.put("name", assignee.user.name);
Expand All @@ -97,7 +100,7 @@ public static List<ObjectNode> getAssginees(Project project) {

public static List<ObjectNode> getAuthors(Project project) {
List<ObjectNode> authors = new ArrayList<>();
for(User user: project.findAuthors()){
for (User user : project.findAuthors()) {
ObjectNode member = Json.newObject();
member.put("loginId", user.loginId);
member.put("name", user.name);
Expand Down Expand Up @@ -161,7 +164,7 @@ public static Result newProject(String owner) throws Exception {

private static ProjectScope parseProjectScope(JsonNode json) {
JsonNode scopeNode = json.findValue("projectScope");
if(scopeNode == null || StringUtils.isEmpty(scopeNode.asText())) {
if (scopeNode == null || StringUtils.isEmpty(scopeNode.asText())) {
return ProjectScope.PRIVATE;
}

Expand All @@ -188,14 +191,14 @@ private static String getProjectDescription(JsonNode json) {
private static void addProjectMembers(JsonNode json, Project project) {
JsonNode membersNode = json.findValue("members");

if(membersNode != null && membersNode.isArray()){
if (membersNode != null && membersNode.isArray()) {
// find members and add members
for (JsonNode memberNode : membersNode) {
String mail = memberNode.findValue("email").asText();
User member = User.findByEmail(mail);
if(!member.isAnonymous()){
if (!member.isAnonymous()) {
String role = memberNode.findValue("role").asText();
if("member".equalsIgnoreCase(role)){
if ("member".equalsIgnoreCase(role)) {
ProjectUser.assignRole(member.id, project.id, RoleType.MEMBER);
} else if ("manager".equalsIgnoreCase(role)) {
ProjectUser.assignRole(member.id, project.id, RoleType.MANAGER);
Expand Down Expand Up @@ -245,7 +248,7 @@ private static void saveMenuSettingsToDefault(Project project) {
public static JsonNode projectLabels(Project project) {

Map<Long, Map<String, String>> labels = new HashMap<>();
for (Label label: project.labels) {
for (Label label : project.labels) {
labels.put(label.id, convertToMap(label));
}

Expand Down Expand Up @@ -283,8 +286,8 @@ public static ObjectNode getResult(AbstractPosting posting) {
json.put("updatedAt", getDateString(posting.updatedDate));
json.put("body", posting.body);

if(posting.asResource().getType() == ResourceType.ISSUE_POST){
Issue issue = ((Issue)posting);
if (posting.asResource().getType() == ResourceType.ISSUE_POST) {
Issue issue = ((Issue) posting);
Optional.ofNullable(issue.assignee)
.ifPresent(assignee -> json.put("assignees", composeAssigneeJson(issue)));
json.put("state", issue.state.toString());
Expand All @@ -302,12 +305,12 @@ public static ObjectNode getResult(AbstractPosting posting) {

}
List<Attachment> attachments = Attachment.findByContainer(posting.asResource());
if(attachments.size() > 0) {
if (attachments.size() > 0) {
json.put("attachments", toJson(attachments));
}

List <ObjectNode> comments = composePlainCommentsJson(posting);
if(comments.size() > 0){
List<ObjectNode> comments = composePlainCommentsJson(posting);
if (comments.size() > 0) {
json.put("comments", toJson(comments));
}
return json;
Expand Down Expand Up @@ -341,10 +344,10 @@ public static JsonNode composeAssigneeJson(Issue issue) {
return toJson(assignees);
}

private static JsonNode composeMembersJson(Project project){
private static JsonNode composeMembersJson(Project project) {
List<ObjectNode> members = new ArrayList<>();

for(ProjectUser projectUser: project.members()){
for (ProjectUser projectUser : project.members()) {
User user = projectUser.user;
ObjectNode memberNode = Json.newObject();
memberNode.put("loginId", user.loginId);
Expand All @@ -359,23 +362,24 @@ private static JsonNode composeMembersJson(Project project){

private static JsonNode composeLabelJson(Set<IssueLabel> issueLabels) {
List<ObjectNode> labels = new ArrayList<>();
for(IssueLabel label: issueLabels){
for (IssueLabel label : issueLabels) {
ObjectNode labelNode = Json.newObject();
labelNode.put("labelName", label.name);
labelNode.put("labelColor", label.color);
labelNode.put("labelCategory", label.category.name);
labelNode.put("category", label.category.name);
labels.add(labelNode);
}
return toJson(labels);
}

public static JsonNode getAllLabels(List<IssueLabel> issueLabels) {
List<ObjectNode> labels = new ArrayList<>();
for(IssueLabel label: issueLabels){
for (IssueLabel label : issueLabels) {
ObjectNode labelNode = Json.newObject();
labelNode.put("labelName", label.name);
labelNode.put("labelColor", label.color);
labelNode.put("labelCategory", label.category.name);
labelNode.put("category", label.category.name);
labelNode.put("isExclusive", label.category.isExclusive);
labels.add(labelNode);
}
return toJson(labels);
Expand All @@ -393,7 +397,7 @@ public static List<ObjectNode> composePlainCommentsJson(AbstractPosting posting)
commentNode.put("body", comment.contents);

List<Attachment> attachments = Attachment.findByContainer(comment.asResource());
if(attachments.size() > 0) {
if (attachments.size() > 0) {
commentNode.put("attachments", toJson(attachments));
}
comments.add(commentNode);
Expand All @@ -411,4 +415,78 @@ public static ObjectNode getMilestoneNode(Milestone m) {
-> node.put("dueDate", getDateString(dueDate)));
return node;
}

@Transactional
@IsCreatable(ResourceType.ISSUE_LABEL)
public static Result newLabel(String owner, String projectName) {
ObjectNode result = Json.newObject();
JsonNode json = request().body().asJson();
if (json == null) {
return badRequest(result.put("message", "Expecting Json data"));
}

JsonNode labelsNode = json.findValue("labels");
if (labelsNode == null || !labelsNode.isArray()) {
return badRequest(result.put("message", "No issues key exists or value wasn't array!"));
}

Project project = Project.findByOwnerAndProjectName(owner, projectName);

List<JsonNode> createdLabels = new ArrayList<>();

for (JsonNode labelNode : labelsNode) {
createdLabels.add(createLabelNode(labelNode, project));
}
project.update();

return created(toJson(createdLabels));
}

private static JsonNode createLabelNode(JsonNode json, Project project) {
String labelName = json.findValue("labelName").asText();
String labelColor = json.findValue("labelColor").asText();
String categoryName = json.findValue("category").asText();
boolean isExclusive = json.findValue("isExclusive").isBoolean();

IssueLabelCategory category = IssueLabelCategory.findByName(categoryName, project);
if (category == null) {
category = new IssueLabelCategory();
category.project = project;
category.name = categoryName;
category.save();
}

IssueLabel label = IssueLabel.findByName(labelName, categoryName, project);
if( label == null ) {
label = new IssueLabel();
label.category = category;
label.color = labelColor;
label.name = labelName;
label.project = project;
label.save();
} else {
return existedLabel(json);
}

ObjectNode result = Json.newObject();
result.put("status", 201);
result.put("label", label.name);
result.put("category", category.name);
result.put("labelColor", label.color);
result.put("isExclusive", category.isExclusive);

return result;
}

private static JsonNode existedLabel(JsonNode labelNode) {
ObjectNode createdUserNode = Json.newObject();
String message = Messages.get("label.error.duplicated");

createdUserNode.put("status", 409);
createdUserNode.put("reason", "Conflict");
createdUserNode.put("message", message);
createdUserNode.put("user", labelNode);

return createdUserNode;
}
}
14 changes: 14 additions & 0 deletions app/models/IssueLabel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,20 @@ public IssueLabel findExistLabel() {
}
}

@Transient
public static IssueLabel findByName(String labelName, String categoryName, Project project) {
List<IssueLabel> list = finder.where()
.eq("project.id", project.id)
.eq("category.name", categoryName)
.eq("name", labelName)
.findList();
if (list != null && list.size() > 0) {
return list.get(0);
} else {
return null;
}
}

@Override
public void delete() {
for(Issue issue: issues) {
Expand Down
18 changes: 18 additions & 0 deletions app/models/IssueLabelCategory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ public boolean exists() {
.findRowCount() > 0;
}

public static IssueLabelCategory findByName(String name, Project project) {
return find.where()
.eq("project.id", project.id)
.eq("name", name)
.findUnique();
}

public static IssueLabelCategory findBy(IssueLabelCategory instance) {
return find.where()
.eq("project.id", instance.project.id)
Expand Down Expand Up @@ -99,4 +106,15 @@ public ResourceType getType() {
}
};
}

@Override
public String toString() {
return "IssueLabelCategory{" +
"id=" + id +
", project=" + project +
", name='" + name + '\'' +
", labels=" + labels +
", isExclusive=" + isExclusive +
'}';
}
}
1 change: 1 addition & 0 deletions conf/routes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ POST /-_-api/v1/favoriteOrganizations/:organizationId
GET /-_-api/v1/users controllers.UserApp.users(query: String ?= "")
POST /-_-api/v1/users controllers.api.UserApi.newUser()
POST /-_-api/v1/owners/:owner/projects controllers.api.ProjectApi.newProject(owner:String)
POST /-_-api/v1/owners/:owner/projects/:projectName/labels controllers.api.ProjectApi.newLabel(owner:String, projectName:String)

POST /-_-api/v1/user/defultLoginPage controllers.UserApp.setDefaultLoginPage()

Expand Down

0 comments on commit 3c12b84

Please sign in to comment.