Use STATECHANGE event for processing request

Change-Id: Ie1a1c61e29e716904ecb16856cfcf53d4cfeadc9

diff --git a/job_request.py b/job_request.py
index 50239cf..54e370f 100755 (executable)
--- a/job_request.py
+++ b/job_request.py
@@ -349,7 +349,11 @@ def main():
     # Update info of request
     build = BuildService(os.getenv('OBS_API_URL'), \
             os.getenv('OBS_API_USERNAME'), os.getenv('OBS_API_PASSWD'))
+    if 'id' not in event_fields and 'number' in event_fields:
+        print 'Use number(%s) field instead of id' % event_fields.get('number')
+        event_fields['id'] = event_fields.get('number')
     reqinfo = build.get_sr_info(event_fields.get('id'))
+
     for var in ['targetproject', 'sourceproject',
                   'comment', 'sender']:
         if var not in event_fields:
@@ -421,6 +425,10 @@ def main():
         if event_type == 'OBS_SRCSRV_REQUEST_STATECHANGE':
             if event_fields['state'] == 'declined':
                 request_rejected(data, gerrit)
+            elif event_fields['state'] == 'revoked':
+                request_revoked(data)
+            elif event_fields['state'] == 'accepted':
+                request_accepted(data, gerrit, gitprj)
 
         elif event_type == 'OBS_SRCSRV_REQUEST_CREATE':
             request_created(data)
@@ -430,7 +438,7 @@ def main():
         elif event_type == 'OBS_SRCSRV_REQUEST_REVOKED':
             request_revoked(data)
 
-    if buildmonitor_enabled and event_type != 'OBS_SRCSRV_REQUEST_STATECHANGE':
+    if buildmonitor_enabled and event_type == 'OBS_SRCSRV_REQUEST_STATECHANGE':
         bm_end_datetime = datetime.datetime.now()
         #buildmonitor.sr_accept_reject_for_sr_status_detail(event_fields,
         #                                                   bm_start_datetime,