Merge pull request #37 from atomist-skills/ges-catchup

async query is not no data

policy/goals/types.go

@@ -77,6 +77,11 @@ type (
 	}
 
 	GoalEvaluator interface {
-		EvaluateGoal(ctx context.Context, req skill.RequestContext, commonData CommonSubscriptionQueryResult, subscriptionResults [][]edn.RawMessage) ([]GoalEvaluationQueryResult, error)
+		EvaluateGoal(ctx context.Context, req skill.RequestContext, commonData CommonSubscriptionQueryResult, subscriptionResults [][]edn.RawMessage) (EvaluationResult, error)
+	}
+
+	EvaluationResult struct {
+		EvaluationCompleted bool
+		Result              []GoalEvaluationQueryResult
 	}
 )

policy/policy_handler/handler.go

@@ -146,12 +146,19 @@ func (h EventHandler) evaluate(ctx context.Context, req skill.RequestContext, da
 	req.Log.Infof("Evaluating goal %s for digest %s ", goalName, digest)
 	evaluationTs := time.Now().UTC()
 
-	goalResults, err := evaluator.EvaluateGoal(ctx, req, commonResults, subscriptionResult)
+	evaluationResult, err := evaluator.EvaluateGoal(ctx, req, commonResults, subscriptionResult)
 	if err != nil {
 		req.Log.Errorf("Failed to evaluate goal %s for digest %s: %s", goal.Definition, digest, err.Error())
 		return skill.NewFailedStatus("Failed to evaluate goal")
 	}
 
+	if !evaluationResult.EvaluationCompleted {
+		req.Log.Info("evaluation incomplete")
+		return skill.NewCompletedStatus("Evaluation incomplete")
+	}
+
+	goalResults := evaluationResult.Result
+
 	for _, f := range h.transactFilters {
 		if !f(ctx, req) {
 			// if not transacting, we return results as part of the skill result