Merge a190dbe into aa0ef26

guardian · May 29, 2019 · 2539330 · 2539330
2 parents aa0ef26 + a190dbe
commit 2539330
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...y-stops/src/main/scala/com/gu/salesforce/holiday_stops/SalesforceHolidayStopRequest.scala b/...y-stops/src/main/scala/com/gu/salesforce/holiday_stops/SalesforceHolidayStopRequest.scala
@@ -73,7 +73,7 @@ object SalesforceHolidayStopRequest extends Logging {
         s"AND Start_Date__c <= $sfDate " +
         s"AND End_Date__c >= $sfDate"
       logger.info(s"using SF query : $soqlQuery")
-      RestRequestMaker.GetRequestWithParams(soqlQueryBaseUrl, UrlParams(Map("q" -> soqlQuery)))
+      RestRequestMaker.GetRequestWithParams(RelativePath(soqlQueryBaseUrl), UrlParams(Map("q" -> soqlQuery)))
     }
 
   }
@@ -87,7 +87,7 @@ object SalesforceHolidayStopRequest extends Logging {
       val soqlQuery = getHolidayStopRequestPrefixSOQL(productNamePrefix) +
         s"AND IdentityID__c = '$identityId'"
       logger.info(s"using SF query : $soqlQuery")
-      RestRequestMaker.GetRequestWithParams(soqlQueryBaseUrl, UrlParams(Map("q" -> soqlQuery)))
+      RestRequestMaker.GetRequestWithParams(RelativePath(soqlQueryBaseUrl), UrlParams(Map("q" -> soqlQuery)))
     }
 
   }

diff --git a/lib/salesforce/src/main/scala/com/gu/salesforce/SalesforceConstants.scala b/lib/salesforce/src/main/scala/com/gu/salesforce/SalesforceConstants.scala
@@ -1,12 +1,10 @@
 package com.gu.salesforce
 
-import com.gu.util.resthttp.RestRequestMaker.RelativePath
-
 object SalesforceConstants {
 
   val sfApiBaseUrl = "/services/data/v29.0"
 
-  val soqlQueryBaseUrl = RelativePath(sfApiBaseUrl + "/query/")
+  val soqlQueryBaseUrl = sfApiBaseUrl + "/query/"
 
   val sfObjectsBaseUrl = sfApiBaseUrl + "/sobjects/"