Skip to content

Commit 0b8e9f9

Browse files
authored
Merge pull request #133 from mcanoy/project-tree
Only look for the status.json at root
2 parents 223f712 + 275535b commit 0b8e9f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/com/redhat/labs/lodestar/service/EngagementService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private Status getProjectStatusFile(String customerName, String engagementName)
193193
public Optional<Status> getProjectStatus(String customerName, String engagementName) {
194194

195195
List<ProjectTreeNode> nodes = projectService
196-
.getProjectTree(GitLabPathUtils.getValidPath(engagementPathPrefix, customerName, engagementName));
196+
.getProjectTree(GitLabPathUtils.getValidPath(engagementPathPrefix, customerName, engagementName), false);
197197

198198
// find status file node or throw 404
199199
List<ProjectTreeNode> status = nodes.stream().filter(node -> STATUS_FILE.equals(node.getName()))

src/main/java/com/redhat/labs/lodestar/service/ProjectService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,13 @@ public Optional<Project> transferProject(Integer projectId, Integer newGroupId)
205205

206206
}
207207

208-
public List<ProjectTreeNode> getProjectTree(String projectId) {
208+
public List<ProjectTreeNode> getProjectTree(String projectId, boolean recursive) {
209209

210210
Response response = null;
211211
PagedResults<ProjectTreeNode> page = new PagedResults<>(commitPageSize);
212212

213213
while (page.hasMore()) {
214-
response = gitLabService.getProjectTree(projectId, true);
214+
response = gitLabService.getProjectTree(projectId, recursive);
215215
page.update(response, new GenericType<List<ProjectTreeNode>>() {
216216
});
217217
}

0 commit comments

Comments
 (0)