Merge pull request #330 from AmericaSCORESBayArea/refactor/remove_old_search

Sandbox: Remove old search (`search`) and rename the new from `searchSOSL` to `search`

Author: a-v25

docs/Scores - Salesforce Data API.postman_collection.json

@@ -784,45 +784,6 @@
 					},
 					"response": []
 				},
-				{
-					"name": "/contacts/search",
-					"request": {
-						"method": "GET",
-						"header": [
-							{
-								"key": "client_id",
-								"value": "{{sandbox_client_id}}"
-							},
-							{
-								"key": "client_secret",
-								"value": "{{sandbox_client_secret}}"
-							},
-							{
-								"key": "Origin",
-								"value": "Postman",
-								"type": "text"
-							}
-						],
-						"url": {
-							"raw": "{{base_url}}/contacts/search?searchString=Aleksandr",
-							"host": [
-								"{{base_url}}"
-							],
-							"path": [
-								"contacts",
-								"search"
-							],
-							"query": [
-								{
-									"key": "searchString",
-									"value": "Aleksandr"
-								}
-							]
-						},
-						"description": "BODY/JSON:\n\n{  \n\"TeamSeasonName\": \"\",  \n\"TeamId\": \"\",  \n\"SeasonId\": \"\",  \n\"SchoolSite\": \"\",  \n\"Partnership\": \"\",  \n\"TotalNoOfPlayers\": 0,  \n\"TotalNoOfSessions\": 0,  \n\"SeasonStartDate\": \"\",  \n\"SeasonEndDate\": \"\",  \n\"CoachSoccer\": \"\",  \n\"CoachWriting\": \"\",  \n\"ProgramCoordinator\": \"\",  \n\"ProgramManager\": \"\"  \n}"
-					},
-					"response": []
-				},
 				{
 					"name": "/contacts/searchByPhoneNumber",
 					"request": {
@@ -1012,7 +973,7 @@
 					"response": []
 				},
 				{
-					"name": "/contacts/searchSOSL",
+					"name": "/contacts/search",
 					"request": {
 						"method": "GET",
 						"header": [
@@ -1031,13 +992,13 @@
 							}
 						],
 						"url": {
-							"raw": "{{base_url}}/contacts/searchSOSL?searchString=John&region=San Francisco Crocker&page=1&pageSize=8",
+							"raw": "{{base_url}}/contacts/search?searchString=John&region=San Francisco Crocker&page=1&pageSize=8",
 							"host": [
 								"{{base_url}}"
 							],
 							"path": [
 								"contacts",
-								"searchSOSL"
+								"search"
 							],
 							"query": [
 								{

src/main/mule/contacts.xml

@@ -690,207 +690,6 @@ payload map ( payload01 , indexOfPayload01 ) -> {
       </otherwise>
     </choice>
   </flow>
-  <flow name="get:\contacts\search:salesforce-data-api-config">
-    <logger doc:id="127d162c-eb82-4c68-858e-cba3a849db5c" doc:name="Log entry-flow" level="INFO" message="Method and Request Path stored as vars: method=#[vars.method], request path=#[vars.requestPath]. queryparams=#[attributes.queryParams]"></logger>
-    <ee:transform doc:id="06bf0ffb-bedf-4d91-afb9-accd04fb3580" doc:name="Store Query parameters">
-      <ee:variables>
-        <ee:set-variable variableName="searchString">
-          <![CDATA[%dw 2.0
-import * from dw::core::Strings
-output application/json
----
-attributes.queryParams.'searchString' replace /[&|!(){}\[\]^"~*?:\\'+\-]/ with("")]]>
-        </ee:set-variable>
-        <ee:set-variable variableName="region">
-                    					
-          
-          <![CDATA[attributes.queryParams.'region']]>
-                    				
-        
-        </ee:set-variable>
-      </ee:variables>
-    </ee:transform>
-    <choice doc:name="Choice">
-      <when expression="#[isEmpty(vars.region)]">
-        <set-variable value="" variableName="regionQueryCondition"></set-variable>
-      </when>
-      <otherwise>
-        <set-variable value="#[' AND Account.Region__c = \'' ++ (vars.region default '') ++ '\'']" variableName="regionQueryCondition"></set-variable>
-      </otherwise>
-    </choice>
-	<choice doc:name="Choice1" doc:id="96cea7f6-14a1-4d76-8cf9-8e1d736b29b6">
-			<when expression="#[isEmpty(vars.searchString)]">
-				<set-variable value="SEARCH:BAD_REQUEST" doc:name="Set Custom Error Type" doc:id="57e888c4-bb95-4039-9807-624f70a3249e" variableName="errorCustomType" />
-				<set-variable value="`searchString` is empty or includes only special characters" doc:name="Set Custom Error Message" doc:id="6a74df74-a9d5-48c4-9c32-b061d11fad2d" variableName="errorCustomMessage" />
-				<set-variable value="400" doc:name="Set Status Code" doc:id="518684e1-cf60-4f92-9fa2-0fc97c449d8f" variableName="httpStatus" />
-				<raise-error doc:name="Raise error1" doc:id="0e90e196-0b94-4c46-995b-8cc00804bbda" type="CUSTOM:CUSTOM_ERROR" description="Something went while performing a search." />
-			</when>
-		</choice>
-		<salesforce:query
-			doc:name="Search Query"
-			doc:id="2938911f-53b8-243a5-a53e-14fca711003d"
-			config-ref="Salesforce_Config">
-		<salesforce:salesforce-query>
-		<![CDATA[
-			SELECT 
-				Id,
-				Name,
-				Contact_Type__c,
-				RecordTypeId,
-				FirstName,
-				MiddleName,
-				LastName,
-				Account.Region__c,
-				AccountId,
-				School_Attending__c,
-				Email,
-				HomePhone,
-				Birthdate,
-				Gender__c,
-				Grade__c,
-				Level__c,
-				Ethnicity__c,
-				Permission_to_Commute_Alone__c,
-				Reduced_Price_Lunch__c,
-				Allergies__c,
-				External_Student_ID__c,
-				External_Student_DB__c,
-				Parent_First_Name__c,
-				Parent_Last_Name__c,
-				Parent_Email_Address__c,
-				Parent_Relationship_to_Child__c,
-				Parent_Phone_01__c,
-				Parent_Phone_02__c,
-				Parent_Phone_03__c,
-				MailingStreet,
-				MailingCity,
-				MailingState,
-				MailingPostalCode,
-				MailingCountry,
-				Parent_English_Fluency__c,
-				Parent_Home_Language__c,
-				Parent_Other_Language__c,
-				Volunteer_for_this_Program_Parent__c,
-				Emergency_Contact_Name__c,
-				Emergency_Contact_Relationship_to_Child__c,
-				Emergency_Contact_Name_Phone_01__c,
-				Emergency_Contact_Name_Phone_02__c,
-				Emergency_Contact_Name_Phone_03__c,
-				Emergency_Contact_Permission_to_Pick_Up__c,
-				Second_Emergency_Contact_Name__c,
-				Second_Emerg_Contact_Relationship_Child__c	,
-				Second_Emergency_Phone_01__c,
-				Second_Emergency_Phone_02__c,
-				Second_Emergency_Phone_03__c,
-				Second_Emergency_Permission_to_Pick_Up__c,
-				Liability__c,
-				Media_Release__c,
-				Data_Release__c,
-				Year_of_Reference_for_Grade_Information__c,
-				Grades_child_participated__c,
-				Latest_Waiver_Date__c
-				FROM 
-					Contact
-				WHERE 
-					RecordTypeId = '01250000000VBbXAAW' 
-					AND 
-					(Name LIKE ':searchString')
-					:regionQuery
-				LIMIT 8
-				]]>
-			</salesforce:salesforce-query>
-			<salesforce:parameters><![CDATA[#[output application/java
-				---
-				{
-					searchString : "%" ++ (vars.searchString default "")  ++ "%",
-					regionQuery : vars.regionQueryCondition
-				}]]]>
-			</salesforce:parameters>
-		</salesforce:query>
-		<ee:transform doc:name="Wrap Records with 'record'" doc:id="wrapRecords">
-			<ee:message>
-				<ee:set-payload><![CDATA[#[{
-					searchRecords: payload map ((item, index) -> {
-						record: item
-					})
-				}]]]></ee:set-payload>
-			</ee:message>
-		</ee:transform>
-		<flow-ref name="retrieve-latest-enrollment-based-on-payload-with-contacts" doc:name="Call External Flow to Retrieve all Latest Sites" />
-    	<ee:transform doc:id="32f388c1-5da5-43ab-8241-874d02d18d35" doc:name="Transform Message">
-      <ee:message>
-        <ee:set-payload>
-                    					
-          
-          <![CDATA[%dw 2.0
-output application/json
----
-payload.searchRecords map ( payload01 , indexOfPayload01 ) -> {
-Id: payload01.record.Id as String default "",
-	ContactType: payload01.record.Contact_Type__c as String default "" ,
-	ContactRecordType: payload01.record.RecordTypeId as String default "" ,
-	FirstName: payload01.record.FirstName as String default "" ,
-	MiddleName: payload01.record.MiddleName as String default "" ,
-	LastName: payload01.record.LastName as String default "" ,
-	Region: payload01.record.Account.Region__c as String default "",
-	SchoolSiteId: payload01.record.AccountId as String default "" ,
-	SchoolName: payload01.record.School_Attending__c as String default "" ,
-	PersonalEmail: payload01.record.Email as String default "" ,
-	HomePhone: payload01.record.HomePhone as String default "" ,
-	Birthdate: payload01.record.Birthdate as String default "" ,
-	Gender: payload01.record.Gender__c as String default "" ,
-	Grade: payload01.record.Grade__c as String default "" ,
-	K12GradeLevel: payload01.record.Level__c as String default "" ,
-	Ethnicity: payload01.record.Ethnicity__c as String default "" ,
-	PermissiontoCommuteAlone: payload01.record.Permission_to_Commute_Alone__c as String default "" ,
-	ReducedPriceLunch: payload01.record.Reduced_Price_Lunch__c as String default "" ,
-	Allergies: payload01.record.Allergies__c as String default "" ,
-	ExternalStudentId: payload01.record.External_Student_ID__c as String default "" ,
-	ExternalStudentIdSource: payload01.record.External_Student_DB__c as String default "" ,
-	ParentFName: payload01.record.Parent_First_Name__c as String default "" ,
-	ParentLName: payload01.record.Parent_Last_Name__c as String default "" ,
-	ParentEmail: payload01.record.Parent_Email_Address__c as String default "" ,
-	Relationship: payload01.record.Parent_Relationship_to_Child__c as String default "" ,
-	ParentPhone1: payload01.record.Parent_Phone_01__c as String default "" ,
-	ParentPhone2: payload01.record.Parent_Phone_02__c as String default "" ,
-	ParentPhone3: payload01.record.Parent_Phone_03__c as String default "" ,
-	MailingStreet: payload01.record.MailingStreet as String default "" ,
-	MailingCity: payload01.record.MailingCity as String default "" ,
-	MailingState: payload01.record.MailingState as String default "" ,
-	MailingZip: payload01.record.MailingPostalCode as String default "" ,
-	MailingCountry: payload01.record.MailingCountry as String default "" ,
-	ParentEnglishFluency: payload01.record.Parent_English_Fluency__c as String default "" ,
-	ParentHomeLang: payload01.record.Parent_Home_Language__c as String default "" ,
-	OtherLang: payload01.record.Parent_Other_Language__c as String default "" ,
-	Volunteer: payload01.record.Volunteer_for_this_Program_Parent__c as String default "" ,
-	Emergency_Contact_Name: payload01.record.Emergency_Contact_Name__c as String default "" ,
-	Emergency_Contact_Relationship: payload01.record.Emergency_Contact_Relationship_to_Child__c as String default "" ,
-	Emergency_Contact_Phone1: payload01.record.Emergency_Contact_Name_Phone_01__c as String default "" ,
-	Emergency_Contact_Phone2: payload01.record.Emergency_Contact_Name_Phone_02__c as String default "" ,
-	Emergency_Contact_Phone3: payload01.record.Emergency_Contact_Name_Phone_03__c as String default "" ,
-	Emergency_Contact_Permission_to_Pickup_child: payload01.record.Emergency_Contact_Permission_to_Pick_Up__c as String default "" ,
-	Second_Emergency_Contact_Name: payload01.record.Second_Emergency_Contact_Name__c as String default "" ,
-	Second_Emergency_Contact_Relationship: payload01.record.Second_Emerg_Contact_Relationship_Child__c	 as String default "" ,
-	Second_Emergency_Contact_Phone1: payload01.record.Second_Emergency_Phone_01__c as String default "" ,
-	Second_Emergency_Contact_Phone2: payload01.record.Second_Emergency_Phone_02__c as String default "" ,
-	Second_Emergency_Contact_Phone3: payload01.record.Second_Emergency_Phone_03__c as String default "" ,
-	Second_Emergency_Contact_Permission_to_Pickup_child: payload01.record.Second_Emergency_Permission_to_Pick_Up__c as String default "" ,
-	LiabilityWaiver: payload01.record.Liability__c as String default "" ,
-	MediaReleaseWaiver: payload01.record.Media_Release__c as String default "" ,
-	DataReleaseWaiver: payload01.record.Data_Release__c as String default "",
-	YearOfReferenceForGradeInformation: payload01.record.Year_of_Reference_for_Grade_Information__c as String default "" ,
-	GradesChildParticipated: payload01.record.Grades_child_participated__c as String default "",
-	LatestWaiverDate: payload01.record.Latest_Waiver_Date__c as String default "",
-	LatestEnrolledEndDate: vars.contactResults[indexOfPayload01].LatestEnrolledEndDate as String default "",
-	LatestEnrolledSiteId: vars.contactResults[indexOfPayload01].LatestEnrolledSiteId as String default "",
-	LatestEnrolledSiteName: vars.contactResults[indexOfPayload01].LatestEnrolledSiteName as String default ""	
-}]]>
-                    				
-        
-        </ee:set-payload>
-      </ee:message>
-    </ee:transform>
-  </flow>
   <flow name="get:\contacts\searchByPhoneNumber:salesforce-data-api-config">
     <logger doc:id="5702e8bf-921c-4af0-a9f0-9bc9091adf34" doc:name="Log entry-flow" level="INFO" message="Method and Request Path stored as vars: method=#[vars.method], request path=#[vars.requestPath]. queryparams=#[attributes.queryParams]"></logger>
     <ee:transform doc:id="7e56aada-f163-47f0-8ffc-213f7acd09a8" doc:name="Store Query parameters">
@@ -1674,7 +1473,7 @@ payload map ( payload01 , indexOfPayload01 ) -> {
 	</foreach>
 </flow>
 
-  <flow name="get:\contacts\searchSOSL:salesforce-data-api-config">
+  <flow name="get:\contacts\search:salesforce-data-api-config">
     <logger doc:id="127d162c-eb82-4c68-858e-cba3a849db5c" doc:name="Log entry-flow" level="INFO" message="Method and Request Path stored as vars: method=#[vars.method], request path=#[vars.requestPath]. queryparams=#[attributes.queryParams]"></logger>
     <ee:transform doc:id="06bf0ffb-bedf-4d91-afb9-accd04fb3580" doc:name="Store Query parameters">
       <ee:variables>

src/main/resources/api/salesforce-data-api.raml

@@ -311,26 +311,6 @@ uses:
           application/json:
             type: types.Contact[]
   /search:
-    get:
-      displayName: Get matching contacts
-      description: Get contacts matching a search string (to be used for Student contacts for now)
-      queryParameters:
-        searchString:
-          displayName: searchString
-          description: Search string
-          type: string
-          required: true
-        region:
-          displayName: region
-          description: Filter contacts by region
-          type: string
-          required: false
-      responses:
-        200:
-          body:
-            application/json:
-              type: types.Contact[]
-  /searchSOSL:
     get:
       displayName: Get matching contacts using SOSL
       description: Get contacts matching a search string using Salesforce Object Search Language (to be used for Student contacts for now)