Merge branch 'glos-subscribe-to-jobs' into staging

Author: nephila-nacrea

perllib/Integrations/Confirm.pm

@@ -393,31 +393,41 @@ GRAPHQL
 sub jobs_graphql_query {
     my ( $self, %args ) = @_;
 
-    my $job_numbers_str = join ',', @{ $args{job_numbers} };
+    my @job_type_codes
+        = keys %{ $self->config->{job_service_whitelist} // () };
 
     my @status_codes
         = keys %{ $self->config->{job_reverse_status_mapping} // () };
-    my $status_codes_str = join( ',', @status_codes );
+
+    my (
+        $start_date,
+        $end_date,
+        $job_type_codes_str,
+        $status_codes_str,
+    ) = (
+        $args{start_date},
+        $args{end_date},
+        join( ',', @job_type_codes ),
+        join( ',', @status_codes ),
+    );
 
     return <<"GRAPHQL"
 {
     jobs (
         filter: {
-            jobNumber: {
-                inList: [ $job_numbers_str ]
+            entryDate: {
+                greaterThanEquals: "$start_date"
+                lessThanEquals: "$end_date"
             }
         }
     ){
-        description
-        entryDate
-        geometry
-        jobNumber
-
-        jobType {
-            code
-            name
-        }
-        priority {
+        jobType(
+            filter: {
+                code: {
+                    inList: [ $job_type_codes_str ]
+                }
+            }
+        ){
             code
             name
         }
@@ -432,6 +442,16 @@ sub jobs_graphql_query {
             loggedDate
             statusCode
         }
+
+        entryDate
+        description
+        geometry
+        jobNumber
+
+        priority {
+            code
+            name
+        }
     }
 }
 GRAPHQL
@@ -460,11 +480,6 @@ sub GetJobStatusLogs {
 sub GetJobs {
     my ($self, %args) = @_;
 
-    return []
-        unless $args{job_numbers}
-        && ref $args{job_numbers} eq 'ARRAY'
-        && @{ $args{job_numbers} };
-
     my $content = $self->perform_request_graphql( type => 'jobs', %args );
 
     return [] unless $content->{data}{jobs};

perllib/Open311/Endpoint/Integration/Confirm.pm

@@ -884,21 +884,12 @@ sub get_service_requests {
 
     # Jobs
 
-    # We try to follow a similar pattern to Enquiries above; we find updated
-    # jobs by first grabbing the status logs for the given time period, then
-    # look up the details for each job associated with those status logs.
-
     if ($self->handle_jobs) {
-        my $status_logs = $integ->GetJobStatusLogs(
+        my $jobs = $integ->GetJobs(
             start_date => $args->{start_date},
             end_date   => $args->{end_date},
         );
 
-        my %uniq_job_numbers = map { $_->{jobNumber} => 1 } @$status_logs;
-
-        my $jobs
-            = $integ->GetJobs( job_numbers => [ keys %uniq_job_numbers ] );
-
         for my $job (@$jobs) {
             my $job_id = $job->{jobNumber};