Completed Mastery Task 1. All tests passing.

DESIGN_DOCUMENT.md

@@ -135,7 +135,7 @@ clickThroughRate // the rate that customers who see the add click on it (between
 targetingPredicates // the targeting rules for this group 
 ```
 
-##CreateContent
+## CreateContent
 
 Creates a new piece of advertising content and a targeting group to go with it. The html/css content of the advertisement 
 and a marketplace to schedule the content in is required. If a list of targeting predicates is provided, the initial 

src/com/amazon/ata/advertising/service/activity/AddTargetingGroupActivity.java

@@ -14,6 +14,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 /**
@@ -24,7 +25,7 @@
  * clickThroughRate can be learned.
  */
 public class AddTargetingGroupActivity {
-    public static final boolean IMPLEMENTED_STREAMS = false;
+    public static final boolean IMPLEMENTED_STREAMS = true;
     private static final Logger LOG = LogManager.getLogger(AddTargetingGroupActivity.class);
 
     private final TargetingGroupDao targetingGroupDao;
@@ -52,12 +53,19 @@ public AddTargetingGroupResponse addTargetingGroup(AddTargetingGroupRequest requ
             contentId));
 
         List<TargetingPredicate> targetingPredicates = new ArrayList<>();
+
         if (requestedTargetingPredicates != null) {
+            /* original implementation:
             for (com.amazon.ata.advertising.service.model.TargetingPredicate targetingPredicate :
                 requestedTargetingPredicates) {
                 TargetingPredicate predicate = TargetingPredicateTranslator.fromCoral(targetingPredicate);
                 targetingPredicates.add(predicate);
             }
+             */
+
+            targetingPredicates = requestedTargetingPredicates.stream()
+                    .map(TargetingPredicateTranslator::fromCoral)
+                    .collect(Collectors.toList());
         }
 
         TargetingGroup targetingGroup = targetingGroupDao.create(contentId, targetingPredicates);

src/com/amazon/ata/advertising/service/businesslogic/AdvertisementSelectionLogic.java

@@ -4,6 +4,8 @@
 import com.amazon.ata.advertising.service.model.AdvertisementContent;
 import com.amazon.ata.advertising.service.model.EmptyGeneratedAdvertisement;
 import com.amazon.ata.advertising.service.model.GeneratedAdvertisement;
+import com.amazon.ata.advertising.service.model.RequestContext;
+import com.amazon.ata.advertising.service.targeting.TargetingEvaluator;
 import com.amazon.ata.advertising.service.targeting.TargetingGroup;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -12,6 +14,7 @@
 import org.apache.logging.log4j.Logger;
 
 import java.util.*;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 
 /**
@@ -63,8 +66,28 @@ public GeneratedAdvertisement selectAdvertisement(String customerId, String mark
             final List<AdvertisementContent> contents = contentDao.get(marketplaceId);
 
             if (CollectionUtils.isNotEmpty(contents)) {
+                /* Original Implementation:
                 AdvertisementContent randomAdvertisementContent = contents.get(random.nextInt(contents.size()));
                 generatedAdvertisement = new GeneratedAdvertisement(randomAdvertisementContent);
+
+                 */
+
+
+                RequestContext requestContext = new RequestContext(customerId, marketplaceId);
+                TargetingEvaluator targetingEvaluator = new TargetingEvaluator(requestContext);
+
+                List<AdvertisementContent> eligibleContents = contents.stream()
+                        .filter(content -> {
+                            List<TargetingGroup> targetingGroups = targetingGroupDao.get(content.getContentId());
+                            return targetingGroups.stream()
+                                    .anyMatch(group -> targetingEvaluator.evaluate(group).isTrue());
+                        })
+                        .collect(Collectors.toList());
+
+                if (CollectionUtils.isNotEmpty(eligibleContents)) {
+                    AdvertisementContent randomAdvertisementContent = eligibleContents.get(random.nextInt(eligibleContents.size()));
+                    generatedAdvertisement = new GeneratedAdvertisement(randomAdvertisementContent);
+                }
             }
 
         }

src/com/amazon/ata/advertising/service/targeting/TargetingEvaluator.java

@@ -10,7 +10,7 @@
  * Evaluates TargetingPredicates for a given RequestContext.
  */
 public class TargetingEvaluator {
-    public static final boolean IMPLEMENTED_STREAMS = false;
+    public static final boolean IMPLEMENTED_STREAMS = true;
     public static final boolean IMPLEMENTED_CONCURRENCY = false;
     private final RequestContext requestContext;
 
@@ -30,6 +30,8 @@ public TargetingEvaluator(RequestContext requestContext) {
      */
     public TargetingPredicateResult evaluate(TargetingGroup targetingGroup) {
         List<TargetingPredicate> targetingPredicates = targetingGroup.getTargetingPredicates();
+
+        /* original implementation:
         boolean allTruePredicates = true;
         for (TargetingPredicate predicate : targetingPredicates) {
             TargetingPredicateResult predicateResult = predicate.evaluate(requestContext);
@@ -38,6 +40,11 @@ public TargetingPredicateResult evaluate(TargetingGroup targetingGroup) {
                 break;
             }
         }
+         */
+
+        boolean allTruePredicates = targetingPredicates.stream()
+                .map(predicate -> predicate.evaluate(requestContext))
+                .allMatch(TargetingPredicateResult::isTrue);
 
         return allTruePredicates ? TargetingPredicateResult.TRUE :
                                    TargetingPredicateResult.FALSE;

src/com/amazon/ata/advertising/service/targeting/predicate/TargetingPredicateTypeConverter.java

@@ -1,5 +1,6 @@
 package com.amazon.ata.advertising.service.targeting.predicate;
 
+import com.amazon.ata.advertising.service.dependency.DaggerLambdaComponent;
 import com.amazon.ata.advertising.service.exceptions.AdvertisementServiceException;
 import com.amazon.ata.advertising.service.dependency.LambdaComponent;
 import com.amazon.ata.advertising.service.dependency.TargetingPredicateInjector;
@@ -46,7 +47,11 @@ private String getSerializePredicateFunction(TargetingPredicate predicate) {
 
     @Override
     public List<TargetingPredicate> unconvert(String value) {
+        /* Original implementation:
         LambdaComponent component = null; //TODO: DaggerLambdaComponent.create();
+         */
+
+        LambdaComponent component = DaggerLambdaComponent.create(); // FIXME: Possibly remove this line. Added to resolve null pointer exception
         TargetingPredicateInjector injector = component.getTargetingPredicateInjector();
         try {
             final List<TargetingPredicate> predicates = MAPPER.readValue(value,