Merge pull request #366 from AmericaSCORESBayArea/sandbox

Enhance Task Filtering and Responses; Add Coach Stats Endpoint

Author: AleksandrMolchagin

docs/Scores - Salesforce Data API.postman_collection.json

@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "0e927c57-e663-43d7-b54f-7487525e3134",
+		"_postman_id": "43dbedd3-7e21-463c-8cf4-f199f2aa4f83",
 		"name": "Scores - Salesforce Data API",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "34720049"
@@ -2009,6 +2009,55 @@
 					},
 					"response": []
 				},
+				{
+					"name": "/coach/{coachId}/stats",
+					"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}}/coach/003cX000005TYcvQAG/stats?interval&teamSeasonId&seasonid",
+							"host": [
+								"{{base_url}}"
+							],
+							"path": [
+								"coach",
+								"003cX000005TYcvQAG",
+								"stats"
+							],
+							"query": [
+								{
+									"key": "interval",
+									"value": null,
+									"description": "overall (default) | year | quarter | month | week"
+								},
+								{
+									"key": "teamSeasonId",
+									"value": null
+								},
+								{
+									"key": "seasonId",
+									"value": null
+								}
+							]
+						},
+						"description": "Response Example:\n\n{ \"Not Started\": 1, \"Started\": 0, \"Complete\": 41}"
+					},
+					"response": []
+				},
 				{
 					"name": "/coach/{coachId}/teamseasons/{teamSeasonId}/stats",
 					"request": {
@@ -2029,13 +2078,50 @@
 							}
 						],
 						"url": {
-							"raw": "{{base_url_s}}/coach/a0qcX000000GEggQAG/003cX000008IZnXQAW/stats",
+							"raw": "{{base_url_s}}/coach/a0qcX000000GEggQAG/teamseasons/003cX000008IZnXQAW/stats",
 							"host": [
 								"{{base_url_s}}"
 							],
 							"path": [
 								"coach",
 								"a0qcX000000GEggQAG",
+								"teamseasons",
+								"003cX000008IZnXQAW",
+								"stats"
+							]
+						},
+						"description": "Response Example:\n\n{ \"Not Started\": 1, \"Started\": 0, \"Complete\": 41}"
+					},
+					"response": []
+				},
+				{
+					"name": "/coach/{coachId}/teamseasons/{teamSeasonId}/stats",
+					"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_s}}/coach/a0qcX000000GEggQAG/teamseasons/003cX000008IZnXQAW/stats",
+							"host": [
+								"{{base_url_s}}"
+							],
+							"path": [
+								"coach",
+								"a0qcX000000GEggQAG",
+								"teamseasons",
 								"003cX000008IZnXQAW",
 								"stats"
 							]
@@ -2168,7 +2254,7 @@
 							}
 						},
 						"url": {
-							"raw": "{{base_url_s}}/tasks?contactId=003cX000008IZnXQAW&sessionId=a0pcX0000008y3pQAA",
+							"raw": "{{base_url_s}}/tasks?contactId=003cX000008IZnXQAW&sessionId=a0pcX0000008y3pQAA&teamSeasonId=a0qUQ000003FNvRYAW&seasonId=a0oUQ000001MNBtYAO&startDate=2025-05-03&endDate=2024-05-03",
 							"host": [
 								"{{base_url_s}}"
 							],
@@ -2183,6 +2269,22 @@
 								{
 									"key": "sessionId",
 									"value": "a0pcX0000008y3pQAA"
+								},
+								{
+									"key": "teamSeasonId",
+									"value": "a0qUQ000003FNvRYAW"
+								},
+								{
+									"key": "seasonId",
+									"value": "a0oUQ000001MNBtYAO"
+								},
+								{
+									"key": "startDate",
+									"value": "2025-05-03"
+								},
+								{
+									"key": "endDate",
+									"value": "2024-05-03"
 								}
 							]
 						},

src/main/mule/coach.xml

@@ -1358,6 +1358,162 @@ output application/json
 }]]></ee:set-payload>
 			</ee:message>
 		</ee:transform>
+	</flow>
+			<flow name="get:\coach\(coachId)\stats" doc:id="ffd9b198-afcf-48f3-9378-d284e6a8290f" >
+		<set-variable value="#[attributes.uriParams.'coachId']" doc:name='Save "coachId"' doc:id="741cebb4-072d-4d8e-9af8-7bcf4bb79e4e" variableName="coachId" />
+		<set-variable value="#[attributes.queryParams.'interval' default &quot;overall&quot;]" doc:name='Save "interval"' doc:id="9c99f9b4-5bd8-4801-b234-db24ca47c389" variableName="interval" />
+		<set-variable value="#[attributes.queryParams.'teamSeasonId']" doc:name='Save "teamSeasonId"' doc:id="e219a9fd-c2c6-47ed-851d-39b229927b1a" variableName="teamSeasonId" />
+		<set-variable value="#[attributes.queryParams.'seasonId']" doc:name='Save "seasonId"' doc:id="0bab0beb-a972-4a89-b6e2-ba31b3902cf7" variableName="seasonId" />
+		<choice doc:name="Choice" doc:id="c26ef9b8-ee01-4386-b285-b20f62423ff7">
+			<when expression="#[vars.interval != 'overall']">
+				<set-variable value='#[%dw 2.0&#10;import * from dw::core::Dates&#10;import floor from dw::core::Numbers&#10;&#10;output application/json&#10;&#10;var interval = vars.interval&#10;var today    = now() as Date&#10;&#10;fun quarterStart(d: Date): Date =&#10;  date({&#10;    year:  d.year,&#10;    month: floor(((d.month) - 1) / 3) * 3 + 1,&#10;    day:   1&#10;  })&#10;&#10;var first =&#10;  if      (interval == "month")   atBeginningOfMonth(today)&#10;  else if (interval == "quarter") quarterStart(today)&#10;  else if (interval == "year")    atBeginningOfYear(today)&#10;  else if (interval == "week")    atBeginningOfWeek(today)&#10;  else                            today&#10;&#10;var last =&#10;  if      (interval == "month")   (atBeginningOfMonth(today + |P1M|) - |P1D|) as Date&#10;  else if (interval == "quarter") (quarterStart(today + |P3M|)      - |P1D|) as Date&#10;  else if (interval == "year")    (atBeginningOfYear(today + |P1Y|) - |P1D|) as Date&#10;  else if (interval == "week")    (atBeginningOfWeek(today + |P7D|) - |P1D|) as Date&#10;  else                            today&#10;&#10;---&#10;{&#10;  firstDay: first,&#10;  lastDay : last&#10;}]' doc:name="Set Dates" doc:id="e6d6fe3e-ed67-4f99-941b-19027f57b0ee" variableName="dates" />
+			</when>
+		</choice>
+		<set-variable doc:name="query" doc:id="b267385d-523f-491d-97cf-9fbb7109d686" variableName="query" value="#[%dw 2.0&#10;import * from dw::core::Dates&#10;import floor from dw::core::Numbers&#10;&#10;output application/json&#10;&#10;var firstDay = vars.dates.firstDay default &quot;&quot;&#10;var lastDay = vars.dates.lastDay default &quot;&quot;&#10;var interval = vars.interval&#10;var teamSeasonId = vars.teamSeasonId&#10;var seasonId = vars.seasonId&#10;&#10;&#10;var tq1 = if (interval == 'overall') &quot;&quot; else &#10;&quot;Session__r.Session_Date__c &gt;= $(firstDay) AND Session__r.Session_Date__c &lt;= $(lastDay)&quot;&#10;var tq2 = if (isEmpty(teamSeasonId)) &quot;&quot; else &#10;&quot;Session__r.Team_Season__c = '$(teamSeasonId)'&quot; &#10;var tq3 = if (isEmpty(seasonId)) &quot;&quot; else &#10;&quot;Session__r.Team_Season__r.Season__c = '$(seasonId)'&quot; &#10;var taskQuery = ([tq1, tq2, tq3] filter (item) -&gt; item != &quot;&quot;) joinBy  &quot; AND &quot;&#10;&#10;var sq1 = if (interval == 'overall') &quot;&quot; else &#10;&quot;Session_Date__c &gt;= $(firstDay) AND Session_Date__c &lt;= $(lastDay)&quot;&#10;var sq2 = if (isEmpty(teamSeasonId)) &quot;&quot; else &#10;&quot;Team_Season__c = '$(teamSeasonId)'&quot; &#10;var sq3 = if (isEmpty(seasonId)) &quot;&quot; else &#10;&quot;Team_Season__r.Season__c = '$(seasonId)'&quot; &#10;var sessionQuery = ([sq1, sq2, sq3] filter (item) -&gt; item != &quot;&quot;) joinBy  &quot; AND &quot;&#10;&#10;&#10;var attendanceQuery = taskQuery&#10;&#10;&#10;---&#10;{&#10;    &quot;tasksQuery&quot;: taskQuery,&#10;    &quot;sessionsQuery&quot;: sessionQuery,&#10;    &quot;attendancesQuery&quot;: attendanceQuery&#10;}]"/>
+		<salesforce:query doc:name="Attendances" doc:id="a8fac832-eb95-4309-aecf-9be8eeb63cb4" config-ref="Salesforce_Config" target="attendances">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM Attendance__c
+WHERE (Session__r.Team_Season__r.Coach_Writing__c = ':coachId' OR Session__r.Team_Season__r.Coach_Soccer__c = ':coachId')
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+output application/java
+---
+{
+  coachId: vars.coachId,
+  q: if (isEmpty((vars.query.attendancesQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.attendancesQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<salesforce:query doc:name='Attendances "True"' doc:id="13ddeea7-b74c-4a82-99ef-f2a49c53aab8" config-ref="Salesforce_Config" target="attendancesTrue">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM Attendance__c
+WHERE (Session__r.Team_Season__r.Coach_Writing__c = ':coachId' OR Session__r.Team_Season__r.Coach_Soccer__c = ':coachId')
+AND Attended__c = true
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+output application/java
+---
+{
+  coachId: vars.coachId,
+  q: if (isEmpty((vars.query.attendancesQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.attendancesQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<salesforce:query doc:name="Sessions" doc:id="98be4b7b-ed86-4faa-afe2-8036661a4047" config-ref="Salesforce_Config" target="sessions">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM Session__c
+WHERE (Team_Season__r.Coach_Writing__c = ':coachId' OR Team_Season__r.Coach_Soccer__c = ':coachId')
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+output application/java
+---
+{
+  coachId: vars.coachId,
+  q: if (isEmpty((vars.query.sessionsQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.sessionsQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<salesforce:query doc:name='Sessions "Completed"' doc:id="fff15502-7569-4860-a491-a9237522b7d9" config-ref="Salesforce_Config" target="sessionsCompleted">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM Session__c
+WHERE (Team_Season__r.Coach_Writing__c = ':coachId' OR Team_Season__r.Coach_Soccer__c = ':coachId')
+:subquery
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+import * from dw::core::Dates          // atBeginningOfDay, etc. (not used here)
+
+var dateTime = now() >> "America/Los_Angeles"
+var nowDate = (dateTime as Date) as String
+var nowTime = dateTime as String { format: "HH:mm:ss" } ++ 'Z'
+
+output application/java
+---
+{
+  coachId: vars.coachId,
+  subquery: " AND Session_Date__c <= $(nowDate) AND Session_End__c <= $(nowTime)",
+  q: if (isEmpty((vars.query.sessionsQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.sessionsQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<salesforce:query doc:name="Tasks" doc:id="34d761e8-bdca-46bd-b7ee-5b915c82f688" config-ref="Salesforce_Config" target="tasks">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM SCORES_Task__c 
+WHERE Assigned_To__c = ':coachId'
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+output application/java
+---
+{
+  coachId: vars.coachId,
+  q: if (isEmpty((vars.query.tasksQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.tasksQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<salesforce:query doc:name='Tasks "Done"' doc:id="6087d402-6845-4c26-b01f-19513c816964" config-ref="Salesforce_Config" target="tasksDone">
+			<salesforce:salesforce-query><![CDATA[SELECT COUNT()
+FROM SCORES_Task__c 
+WHERE Assigned_To__c = ':coachId'
+AND Task_Status__c = 'Done'
+:q]]></salesforce:salesforce-query>
+			<salesforce:parameters><![CDATA[#[%dw 2.0
+output application/java
+---
+{
+  coachId: vars.coachId,
+  q: if (isEmpty((vars.query.tasksQuery default "") as String)) 
+        "" 
+     else 
+        " AND " ++ (vars.query.tasksQuery default "") as String
+}]]]></salesforce:parameters>
+		</salesforce:query>
+		<ee:transform doc:name="Prepare Response" doc:id="e67b671b-2a19-4189-884f-ce588b0fa2d3">
+			<ee:message>
+				<ee:set-payload><![CDATA[%dw 2.0
+
+fun ratio(trueList = [], totalList = []): String =
+  if (sizeOf(totalList default []) != 0)
+       ((sizeOf(trueList default []) as Number
+         / sizeOf(totalList default []) ) * 100)
+            as String { format: "##0.00", roundMode: "HALF_UP" } ++ "%"
+  else "100%"
+
+    
+output application/json
+---
+{	
+	"coach": vars.coachId,
+	"interval": vars.interval,
+	"teamseason": vars.teamSeasonId default "",
+	"season": vars.seasonId default "",
+	"sessions": {
+		"completed": sizeOf(vars.sessionsCompleted default []),
+		"total": sizeOf(vars.sessions default []),
+		"ratio": ratio(vars.sessionsCompleted, vars.sessions)
+	},
+	"tasks": {
+		"done": sizeOf(vars.tasksDone default []),
+		"total": sizeOf(vars.tasks default []),
+		"ratio": ratio(vars.tasksDone, vars.tasks)
+	},
+	"attendances":{
+		"true": sizeOf(vars.attendancesTrue default []),
+		"total": sizeOf(vars.attendances default []),
+		"ratio": ratio(vars.attendancesTrue, vars.attendances)
+	}
+}
+]]></ee:set-payload>
+			</ee:message>
+		</ee:transform>
 	</flow>
 	<flow name="get:\coach\(coachId)\teamseasons\(teamSeasonId)\stats" doc:id="59de02c6-9de9-4b00-9b6c-f7af6438b90e" >
 		<set-variable value="#[attributes.uriParams.'coachId']" doc:name='Save "coachId"' doc:id="66df3a39-36f9-4328-81d5-ed4a29902fb1" variableName="coachId" />

src/main/mule/sessions.xml

@@ -358,7 +358,7 @@ var attendedTrue = vars.attendanceResponse filter (item, itemIndex) -> (item.
 }]' doc:name="Set Attendances `toRemove` and `Ids`" doc:id="803dbfac-430e-491a-9576-ba7644ba9ccd" variableName="attendanceResponsePrepared"/>
 				<choice doc:name="Choice" doc:id="92f74e31-c84b-4d92-96a8-a54282a8f912">
 			<when expression="#[isEmpty(vars.assesmentResponse) and vars.attendanceResponsePrepared.toRemove]">
-				<ee:transform doc:name="tasksIds + attendancesIds + sessionId" doc:id="0fbc4a8b-63a7-4921-a442-cb27583294c7">
+						<ee:transform doc:name="tasksIds + attendancesIds + sessionId" doc:id="0fbc4a8b-63a7-4921-a442-cb27583294c7">
 					<ee:message>
 						<ee:set-payload><![CDATA[%dw 2.0
 output application/java
@@ -378,9 +378,30 @@ payload]]></ee:set-payload>
 				</ee:transform>
 						<choice doc:name="Update successful?" doc:id="57cfc27f-d39b-489a-a941-195e88648fa2" >
 							<when expression="#[payload.successful == false]" >
-								<set-variable value="#['SALESFORCE_SESSION_CREATE:' ++ (payload.items[0].statusCode default 'UNKNOWN')]" doc:name="Set Custom Error Type" doc:id="599e729e-d7a1-4679-91a0-694cf584353c" variableName="errorCustomType" />
-								<set-variable value="#[payload.items[0].message default 'Unknown Error']" doc:name="Set Custom Error Message" doc:id="cb64c6a4-6537-4a20-a9ad-fb2248e6bb68" variableName="errorCustomMessage" />
-								<raise-error doc:name="Raise error" doc:id="d432f898-eca8-410d-b79b-50cf1dffbd6f" type="CUSTOM:CUSTOM_ERROR" description="Something went wrong while creating a session record." />
+								<set-variable value='#[%dw 2.0&#10;output application/json&#10;&#10;var errors = payload.items filter (item) -&gt; (item.payload.success == false)&#10;var filtered_errors = errors filter (item) -&gt; !(errors[0].exception.message contains ("ENTITY_IS_DELETED"))&#10;&#10;---&#10;sizeOf(filtered_errors) == 0]' doc:name="All Errors Says That The Entity Was Deleted Before?" doc:id="879368d7-0170-4294-bfcc-172da507083d" variableName="deletedBefore"/>
+								<choice doc:name="Choice" doc:id="0443b0fe-9fad-4636-a8fc-3d6d8c26f2e8">
+									<when expression="#[vars.deletedBefore]">
+										<ee:transform doc:name="Success Response" doc:id="24d1ad1d-6e15-4394-a416-69201a784f68" >
+											<ee:message >
+												<ee:set-payload ><![CDATA[%dw 2.0
+output application/json
+---
+{
+	"message" : "Session, related attendances and tasks are deleted successfully, but some records were delete before",
+	"sessionId": vars.sessionId,
+	"attendenceIds": vars.attendanceResponsePrepared.ids,
+	"taskIds": vars.tasksResponsePrepared.ids,
+	"success": true
+}]]></ee:set-payload>
+											</ee:message>
+										</ee:transform>
+									</when>
+									<otherwise >
+										<set-variable value="#['SALESFORCE_SESSION_DELETE:' ++ (payload.items[0].statusCode default 'UNKNOWN')]" doc:name="Set Custom Error Type" doc:id="599e729e-d7a1-4679-91a0-694cf584353c" variableName="errorCustomType" />
+										<set-variable value="#[payload.items[0].message default 'Unknown Error']" doc:name="Set Custom Error Message" doc:id="cb64c6a4-6537-4a20-a9ad-fb2248e6bb68" variableName="errorCustomMessage" />
+										<raise-error doc:name="Raise error" doc:id="d432f898-eca8-410d-b79b-50cf1dffbd6f" type="CUSTOM:CUSTOM_ERROR" description="Something went wrong while deleting a session record." />
+									</otherwise>
+								</choice>
 							</when>
 							<otherwise >
 								<ee:transform doc:name="Success Response" doc:id="6f9995d5-7f26-43e0-84b5-37947225a965">