Merge branch 'brent-atak-add-planned-status' into staging

Author: chrismytton

conf/council-brent_atak.yml-example

@@ -26,5 +26,7 @@ atak_status_to_fms_status:
     "Closed - Out of scope": "no_further_action"
     "Closed - Not found": "closed"
     "Closed - Passed to Brent": "internal_referral"
+    "In progress": "action_scheduled"
 fixed_status: "Closed - Completed"
 closed_status: "Closed - Not found"
+planned_status: "In progress"

perllib/Open311/Endpoint/Integration/ATAK.pm

@@ -333,11 +333,11 @@ sub _fetch_and_apply_updated_issues_info {
             next;
         }
 
-        # Does the $issue hashref have a task_comments field?
+        # Does the $issue hashref have a task_d_planned field?
         # This field only appears on an issue once it has been updated.
-        if (!exists $issue->{task_comments}) {
+        if (!exists $issue->{task_d_planned}) {
             $self->logger->warn(sprintf(
-                    "[ATAK] No task comments field found on updated issue %s. Skipping.",
+                    "[ATAK] No task_d_planned field found on updated issue %s. Skipping.",
                     $issue_reference
                 ));
             next;
@@ -346,11 +346,19 @@ sub _fetch_and_apply_updated_issues_info {
         # Does the task_comments field have a value?
         my $task_comments = $issue->{task_comments};
         if (!$task_comments) {
-            $self->logger->warn(sprintf(
-                    "[ATAK] Task comments field on updated issue %s is blank. Defaulting to fixed status.",
-                    $issue_reference
-                ));
-            $task_comments = $self->endpoint_config->{fixed_status};
+            if ($time_planned && !$time_completed) {
+                $self->logger->warn(sprintf(
+                        "[ATAK] Task comments field on updated issue %s is blank. Defaulting to planned status.",
+                        $issue_reference
+                    ));
+                $task_comments = $self->endpoint_config->{planned_status};
+            } else {
+                $self->logger->warn(sprintf(
+                        "[ATAK] Task comments field on updated issue %s is blank. Defaulting to fixed status.",
+                        $issue_reference
+                    ));
+                $task_comments = $self->endpoint_config->{fixed_status};
+            }
         }
 
         # Assumes no prefix is a substring of another prefix.

t/open311/endpoint/brent.t

@@ -86,9 +86,11 @@ sub atak_config {
             "Closed - Out of scope" => "no_further_action",
             "Closed - Not found" => "closed",
             "Closed - Passed to Brent" => "internal_referral",
+            "In progress" => "action_scheduled",
         },
         fixed_status => "Closed - Completed",
         closed_status => "Closed - Not found",
+        planned_status => "In progress"
     }
 }
 
@@ -881,6 +883,12 @@ subtest "GET ATAK service request updates OK" => sub {
                     "task_d_completed": "2023-08-01T02:00:00Z",
                     "task_d_approved": "2023-08-01T03:00:00Z",
                     "task_p_id": "128"
+                },
+                {
+                    "client_ref":"in_progress",
+                    "task_d_created":"2023-08-01T00:00:00Z",
+                    "task_d_planned":"2023-08-01T01:00:00Z",
+                    "task_p_id": "129"
                 }
             ]
         }');
@@ -910,6 +918,15 @@ subtest "GET ATAK service request updates OK" => sub {
                 updated_datetime => '2023-08-01T03:00:00Z',
                 external_status_code => 'Closed - Completed',
             },
+            {
+                description => '',
+                media_url => '',
+                service_request_id => 'ATAK-129',
+                status => 'action_scheduled',
+                update_id => 'ATAK-in_progress_1690851600',
+                updated_datetime => '2023-08-01T01:00:00Z',
+                external_status_code => 'In progress',
+            },
             {
                 description => '',
                 media_url => '',
@@ -982,6 +999,15 @@ subtest "GET ATAK service request updates OK" => sub {
                 updated_datetime => '2023-08-01T03:00:00Z',
                 external_status_code => 'Closed - Completed',
             },
+            {
+                description => '',
+                media_url => '',
+                service_request_id => 'ATAK-129',
+                status => 'action_scheduled',
+                update_id => 'ATAK-in_progress_1690851600',
+                updated_datetime => '2023-08-01T01:00:00Z',
+                external_status_code => 'In progress',
+            },
             {
                 description => '',
                 media_url => '',
@@ -1011,7 +1037,7 @@ subtest "GET ATAK service request updates OK" => sub {
                     "task_d_planned": "2023-08-03T01:00:00Z",
                     "task_d_completed": "2023-08-03T02:00:00Z",
                     "task_d_approved": "2023-08-03T03:00:00Z",
-                    "task_p_id": "129"
+                    "task_p_id": "130"
                 }
             ]
         }');
@@ -1026,7 +1052,7 @@ subtest "GET ATAK service request updates OK" => sub {
             {
                 description => "description",
                 media_url => '',
-                service_request_id => 'ATAK-129',
+                service_request_id => 'ATAK-130',
                 status => 'fixed',
                 update_id => 'ATAK-test_1691031600',
                 updated_datetime => '2023-08-03T03:00:00Z',