From e0d661a1da1a597fbb5d093e17d4fbe7fca9da5d Mon Sep 17 00:00:00 2001
From: Alexis Svinartchouk <alexis@resin.io>
Date: Thu, 24 Aug 2017 12:39:17 +0200
Subject: [PATCH] Remove resin-preload build filtering workaround.

Connects to #640

Change-Type: patch
---
 build/actions/preload.js   | 20 +++-----------------
 lib/actions/preload.coffee | 19 ++-----------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/build/actions/preload.js b/build/actions/preload.js
index 6528f0be..a720c35c 100644
--- a/build/actions/preload.js
+++ b/build/actions/preload.js
@@ -23,7 +23,8 @@ dockerUtils = require('../utils/docker');
 LATEST = 'latest';
 
 getApplicationsWithSuccessfulBuilds = function(deviceType) {
-  var resin;
+  var preload, resin;
+  preload = require('resin-preload');
   resin = require('resin-sdk-preconfigured');
   return resin.pine.get({
     resource: 'my_application',
@@ -41,25 +42,10 @@ getApplicationsWithSuccessfulBuilds = function(deviceType) {
           }
         }
       },
-      expand: {
-        environment_variable: {
-          $select: ['name', 'value']
-        },
-        build: {
-          $select: ['id', 'commit_hash', 'push_timestamp', 'status'],
-          $orderby: 'push_timestamp desc'
-        }
-      },
+      expand: preload.applicationExpandOptions,
       select: ['id', 'app_name', 'device_type', 'commit'],
       orderby: 'app_name asc'
     }
-  }).then(function(applications) {
-    applications.forEach(function(application) {
-      return application.build = application.build.filter(function(build) {
-        return build.status === 'success';
-      });
-    });
-    return applications;
   });
 };
 
diff --git a/lib/actions/preload.coffee b/lib/actions/preload.coffee
index fc24b3c5..d0c4be72 100644
--- a/lib/actions/preload.coffee
+++ b/lib/actions/preload.coffee
@@ -19,6 +19,7 @@ dockerUtils = require('../utils/docker')
 LATEST = 'latest'
 
 getApplicationsWithSuccessfulBuilds = (deviceType) ->
+	preload = require('resin-preload')
 	resin = require('resin-sdk-preconfigured')
 
 	resin.pine.get
@@ -32,25 +33,9 @@ getApplicationsWithSuccessfulBuilds = (deviceType) ->
 						$expr:
 							b:
 								status: 'success'
-			expand:
-				environment_variable:
-					$select: ['name', 'value']
-				build:
-					$select: [ 'id', 'commit_hash', 'push_timestamp', 'status' ]
-					$orderby: 'push_timestamp desc'
-					# FIXME: The filter is commented because it causes an api error.
-					# We manually filter out successful builds below.
-					# We should move that here once this API error is resolved.
-					#$filter:
-					#	status: 'success'
+			expand: preload.applicationExpandOptions
 			select: [ 'id', 'app_name', 'device_type', 'commit' ]
 			orderby: 'app_name asc'
-	# manual filtering
-	.then (applications) ->
-		applications.forEach (application) ->
-			application.build = application.build.filter (build) ->
-				build.status == 'success'
-		applications
 
 selectApplication = (deviceType) ->
 	visuals = require('resin-cli-visuals')