feat(result): get results for a lineItem given

Author: xchopin

src/main/java/org/apereo/openlrw/oneroster/endpoint/ClassController.java

@@ -27,7 +27,9 @@
 import org.apereo.openlrw.caliper.Event;
 
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 
 /**
@@ -99,7 +101,7 @@ public Collection<LineItem> getLineItemsForClass(JwtAuthenticationToken token, @
    * @throws ResultNotFoundException
    */
   @RequestMapping(value = "/{classId:.+}/lineitems/{lineitemId}/results", method = RequestMethod.GET)
-  public Result getLineItemsResults(JwtAuthenticationToken token, @PathVariable final String lineitemId) throws ResultNotFoundException {
+  public Collection<Result> getLineItemsResults(JwtAuthenticationToken token, @PathVariable final String lineitemId) throws ResultNotFoundException {
     UserContext userContext = (UserContext) token.getPrincipal();
     return resultService.getResultsForlineItem(userContext.getTenantId(), userContext.getOrgId(), lineitemId);
   }
@@ -118,12 +120,21 @@ public ResponseEntity<?> postLineItem(JwtAuthenticationToken token, @RequestBody
   @RequestMapping(value = "/{classId:.+}/results", method = RequestMethod.GET)
   public Collection<Result> getResultsForClass(JwtAuthenticationToken token, @PathVariable final String classId) throws LineItemNotFoundException, ResultNotFoundException {
     UserContext userContext = (UserContext) token.getPrincipal();
-    return resultService.getResultsForClass(userContext.getTenantId(), userContext.getOrgId(), classId);
+
+    Collection<LineItem> lineItems = this.lineItemService.getLineItemsForClass(userContext.getTenantId(), userContext.getOrgId(), classId);
+    ArrayList<Result> results = new ArrayList<Result>();
+    for (LineItem lineItem : lineItems) {
+      Collection<Result> lineItemResults = this.resultService.getResultsForlineItem(userContext.getTenantId(), userContext.getOrgId(), lineItem.getSourcedId());
+      results.addAll(lineItemResults);
+    }
+
+    return results;
   }
 
   @RequestMapping(value= "/{classId:.+}/results", method = RequestMethod.POST)
   public ResponseEntity<?> postResult(JwtAuthenticationToken token, @PathVariable final String classId, @RequestBody Result result, @RequestParam(value="check", required=false) Boolean check) {
     UserContext userContext = (UserContext) token.getPrincipal();
+
     Result savedResult = this.resultService.save(userContext.getTenantId(), userContext.getOrgId(), classId, result, (check == null) ? true : check);
     HttpHeaders httpHeaders = new HttpHeaders();
     httpHeaders.setLocation(ServletUriComponentsBuilder.fromCurrentRequest()

src/main/java/org/apereo/openlrw/oneroster/service/ResultService.java

@@ -77,16 +77,19 @@ public Collection<Result> getResultsForClass(final String tenantId, final String
     throw new ResultNotFoundException(String.format("Result not found for %s", classSourcedId));
   }
 
-  /** Returns the result for lineitem
+  /** Return the results for lineitem
    * @param tenantId
    * @param orgId
    * @param lineItemSourcedId
    * @return Result
    * @throws ResultNotFoundException
    */
-  public Result getResultsForlineItem(final String tenantId, final String orgId, final String lineItemSourcedId) throws ResultNotFoundException{
-	  MongoResult mongoResult = mongoResultRepository.findByTenantIdAndOrgIdAndLineitemSourcedId(tenantId, orgId, lineItemSourcedId);
-	  return getResult(lineItemSourcedId, mongoResult);
+  public Collection<Result> getResultsForlineItem(final String tenantId, final String orgId, final String lineItemSourcedId) throws ResultNotFoundException{
+
+      Collection<MongoResult> mongoResults = mongoResultRepository.findByTenantIdAndOrgIdAndLineitemSourcedId(tenantId, orgId, lineItemSourcedId);
+      if (mongoResults == null || mongoResults.isEmpty())
+        throw new ResultNotFoundException("Results not found");
+	  return mongoResults.stream().map(MongoResult::getResult).collect(Collectors.toList());
   }
 
   private Result getResult(final String parameter, MongoResult mongoResult) {

src/main/java/org/apereo/openlrw/oneroster/service/repository/MongoResultRepository.java

@@ -11,12 +11,9 @@ public interface MongoResultRepository extends MongoRepository<MongoResult, Stri
 
   MongoResult findByTenantIdAndOrgIdAndResultSourcedId(final String tenantId, final String orgId, final String resultSourcedId);
 
-  MongoResult
-  findByTenantIdAndOrgIdAndLineitemSourcedId(final String tenantId, final String orgId, 
-    final String lineItemSourcedId);
+  Collection<MongoResult> findByTenantIdAndOrgIdAndLineitemSourcedId(final String tenantId, final String orgId, final String lineItemSourcedId);
 
   MongoResult
-  findByTenantIdAndOrgIdAndUserSourcedId(final String tenantId, final String orgId, 
-    final String userSourcedId);
+  findByTenantIdAndOrgIdAndUserSourcedId(final String tenantId, final String orgId, final String userSourcedId);
 
 }