Merge b6d5b1e into f239a91

guardian · Dec 24, 2018 · 43811d6 · 43811d6
2 parents f239a91 + b6d5b1e
commit 43811d6
Showing 1 changed file with 14 additions and 41 deletions.
diff --git a/...alake-export/src/main/scala/com/gu/sf_datalake_export/salesforce_bulk_api/SfQueries.scala b/...alake-export/src/main/scala/com/gu/sf_datalake_export/salesforce_bulk_api/SfQueries.scala
@@ -238,49 +238,22 @@ object SfQueries {
   val cardExpiry =
     """
       |select
-      |Acquisition_Date__c,
-      |Billing_Account__c,
-      |Billing_Account_Zuora_Id__c,
-      |Buyer_Email__c,
-      |Cancellation_Effective_Date__c,
-      |Cancellation_Request_Date__c,
-      |Initial_Card_Expiry_Month__c,
-      |Latest_Card_Expiry_Month__c,
-      |Name,
-      |Initial_Card_Expiry_Year__c,
-      |Latest_Card_Expiry_Year__c,
-      |Contact__c,
-      |CreatedById,
-      |CreatedDate,
-      |Initial_Date_Payment_Method_Created__c,
-      |Latest_Date_Payment_Method_Created__c,
-      |Initial_Days_Since_Creation__c,
-      |IsDeleted,
-      |Initial_Last_4_Digits__c,
-      |Latest_Last_4_Digits__c,
-      |LastModifiedById,
-      |LastModifiedDate,
-      |LastReferencedDate,
-      |LastViewedDate,
-      |Latest_Payment_Method__c,
-      |Next_Charge_Date__c,
-      |Outcome__c,
-      |Initial_Payment_Method__c,
-      |Initial_Payment_Method_Created_By__c,
-      |Latest_Payment_Method_Created_By__c,
-      |Initial_Payment_Method_Name__c,
-      |Latest_Payment_Method_Name__c,
-      |Payment_Term__c,
-      |Product_Name__c,
-      |Product_Type__c,
-      |Promotion_Code__c,
-      |Rate_Plan_Name__c,
       |Id,
+      |Billing_Account__c  ,
+      |Billing_Account_Zuora_Id__c ,
+      |Initial_Card_Expiry_Month__c  ,
+      |Latest_Card_Expiry_Month__c ,
+      |Initial_Card_Expiry_Year__c ,
+      |Latest_Card_Expiry_Year__c  ,
+      |Comms_Journey_Active__c ,
+      |Contact__c  ,
+      |Latest_Date_Payment_Method_Created__c ,
+      |Next_Charge_Date__c ,
+      |Outcome__c  ,
+      |Initial_Payment_Method__c ,
+      |Latest_Payment_Method_Created_By__c ,
       |SF_Subscription__c,
-      |Status__c,
-      |Subscription_Name__c,
-      |SystemModstamp,
-      |Term_End_Date__c
+      |CreatedDate
       |from
       |Card_Expiry__c
       |where Contact__r.Account.GDPR_Deletion_Pending__c = false