1 files changed, 79 insertions, 3 deletions

diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index e26e3e4c6..50c7abb54 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -12,8 +12,9 @@ has api_key => ( is => 'ro', isa => 'Str' );
 has endpoint => ( is => 'ro', isa => 'Str' );
 has test_mode => ( is => 'ro', isa => 'Bool' );
 has test_uri_used => ( is => 'rw', 'isa' => 'Str' );
+has test_req_used => ( is => 'rw' );
 has test_get_returns => ( is => 'rw' );
-has endpoints => ( is => 'rw', default => sub { { services => 'services.xml', requests => 'requests.xml' } } );
+has endpoints => ( is => 'rw', default => sub { { services => 'services.xml', requests => 'requests.xml', service_request_updates => 'update.xml', update => 'update.xml' } } );
 has debug => ( is => 'ro', isa => 'Bool', default => 0 );
 has debug_details => ( is => 'rw', 'isa' => 'Str', default => '' );
 
@@ -74,7 +75,9 @@ EOT
         my $extras = $problem->extra;
 
         for my $attr ( @$extras ) {
-            my $name = sprintf( 'attribute[%s]', $attr->{name} );
+            my $attr_name = $attr->{name};
+            $attr_name =~ s/fms_extra_//;
+            my $name = sprintf( 'attribute[%s]', $attr_name );
             $params->{ $name } = $attr->{value};
         }
     }
@@ -129,6 +132,72 @@ sub get_service_request_id_from_token {
     }
 }
 
+sub get_service_request_updates {
+    my $self = shift;
+
+    my $params = {};
+
+    my $xml = $self->_get( $self->endpoints->{service_request_updates}, $params || undef );
+    my $service_requests = $self->_get_xml_object( $xml );
+    my $requests;
+    if ( ref $service_requests->{request_update } eq 'ARRAY' ) {
+        $requests = $service_requests->{request_update};
+    }
+    else {
+        $requests = [ $service_requests->{request_update} ];
+    }
+
+    return $requests;
+}
+
+sub post_service_request_update {
+    my $self = shift;
+    my $comment = shift;
+
+    my $params = {
+        update_id_ext => $comment->id,
+        updated_datetime => $comment->confirmed,
+        service_request_id => $comment->problem->external_id,
+        service_request_id_ext => $comment->problem->id,
+        status => $comment->problem->is_open ? 'OPEN' : 'CLOSED',
+        email => $comment->user->email,
+        description => $comment->text,
+        public_anonymity_required => $comment->anonymous ? 'TRUE' : 'FALSE',
+        # also need last_name, title
+    };
+
+    if ( $comment->extra ) {
+        $params->{'email_alerts_request'}
+            = $comment->extra->{email_alerts_requested} ? 'TRUE' : 'FALSE';
+        $params->{'title'} = $comment->extra->{title};
+    }
+
+    my $response = $self->_post( $self->endpoints->{update}, $params );
+
+    if ( $response ) {
+        my $obj = $self->_get_xml_object( $response );
+
+        if ( $obj ) {
+            if ( $obj->{ request_update }->{ update_id } ) {
+                my $update_id = $obj->{request_update}->{update_id};
+
+                # if there's nothing in the update_id element we get a HASHREF back
+                unless ( ref $update_id ) {
+                    return $obj->{ request_update }->{ update_id };
+                }
+            } else {
+                my $token = $obj->{ request_update }->{ token };
+                if ( $token ) {
+                    return $self->get_service_request_id_from_token( $token );
+                }
+            }
+        }
+
+        warn sprintf( "Failed to submit comment %s over Open311, response - %s\n%s", $comment->id, $response, $self->debug_details );
+        return 0;
+    }
+}
+
 sub _get {
     my $self   = shift;
     my $path   = shift;
@@ -171,7 +240,14 @@ sub _post {
     $self->debug_details( $self->debug_details . "\nrequest:" . $req->as_string );
 
     my $ua = LWP::UserAgent->new();
-    my $res = $ua->request( $req );
+    my $res;
+
+    if ( $self->test_mode ) {
+        $res = $self->test_get_returns->{ $path };
+        $self->test_req_used( $req );
+    } else {
+        $res = $ua->request( $req );
+    }
 
     if ( $res->is_success ) {
         return $res->decoded_content;