@@ -39,30 +39,51 @@ def _build_record(cls, raw_object):
3939 4040 'name' : 'Rajiv Sinclair'
4141 }
42- ]
42+ ],
43+ 'Date requested by user' : raw_object .timestamp .strftime (format = '%Y-%m-%d' )
4344 }
4445
4546 @classmethod
4647 def _delay_upload (cls , raw_object ):
4748 record = cls ._build_record (raw_object )
49+
50+ if raw_object .airtable_id :
51+ airtable_id = cls ._update_airtable_row (raw_object .airtable_id , record )
52+ else :
53+ airtable_id = cls ._add_airtable_row (record )
54+ time .sleep (cls .API_LIMIT )
55+ return airtable_id
56+
57+ @classmethod
58+ def _add_airtable_row (cls , record ):
4859 try :
4960 res = cls ._get_foia_airtable ().insert (record )
50- time .sleep (cls .API_LIMIT )
5161 return res ['id' ]
5262 except HTTPError :
5363 return ''
5464
5565 @classmethod
56- def _get_uploaded_objects (cls ):
66+ def _update_airtable_row (cls , airtable_id , record ):
67+ try :
68+ res = cls ._get_foia_airtable ().update (airtable_id , record )
69+ return res ['id' ]
70+ except HTTPError as err :
71+ if '404' in err .args [0 ].split (' ' ):
72+ return cls ._add_airtable_row (record )
73+ else :
74+ return airtable_id
75+
76+ @classmethod
77+ def _get_uploaded_objects (cls , update_all_records = False ):
5778 raise NotImplementedError
5879
5980 @classmethod
6081 def _post_handle (cls , upload_results ):
6182 raise NotImplementedError
6283
6384 @classmethod
64- def upload (cls ):
65- raw_objects = cls ._get_uploaded_objects ()
85+ def upload (cls , update_all_records = False ):
86+ raw_objects = cls ._get_uploaded_objects (update_all_records )
6687
6788 uploaded_results = [
6889 (raw_object , cls ._delay_upload (raw_object ))
@@ -78,25 +99,26 @@ def _build_data(cls, document_request):
7899 officer_allegations = allegation .officerallegation_set .select_related ('officer' )\
79100 .order_by ('officer__first_name' , 'officer__last_name' )
80101 officers_info = [
81- "{officer_name}(ID {officer_id})" .format (
82- officer_id = officer_allegation .officer .id ,
83- officer_name = officer_allegation .officer .full_name
84- )
102+ f'{ officer_allegation .officer .full_name } { officer_allegation .officer .id }
85103 for officer_allegation in officer_allegations if officer_allegation .officer
86104 ]
87- explanation = "Officers: {}" .format (', ' .join (officers_info )) if officers_info else ''
88- requested_for = "CR {crid}" .format (crid = allegation .crid )
89- pre_2006 = allegation .incident_date and allegation .incident_date .year < 2006
105+ explanation = f"Officers: { ', ' .join (officers_info )} if officers_info else ''
106+ requested_for = f'CR { allegation .crid }
90107 agencies = [
91108 settings .AIRTABLE_CPD_AGENCY_ID
92- if pre_2006 or document_request .investigated_by_cpd ()
109+ if document_request .investigated_by_cpd
93110 else settings .AIRTABLE_COPA_AGENCY_ID
94111 ]
95112 return explanation , requested_for , agencies
96113
97114 @classmethod
98- def _get_uploaded_objects (cls ):
99- return AttachmentRequest .objects .filter (airtable_id = '' )
115+ def _get_uploaded_objects (cls , update_all_records = False ):
116+ records = AttachmentRequest .objects .annotate_investigated_by_cpd ().select_related ('allegation' )
117+
118+ if not update_all_records :
119+ records = records .filter (airtable_id = '' )
120+
121+ return records
100122
101123 @classmethod
102124 def _post_handle (cls , uploaded_results ):
@@ -106,7 +128,7 @@ def _post_handle(cls, uploaded_results):
106128 attachment_request .airtable_id = record_id
107129 uploaded_attachment_requests .append (attachment_request )
108130
109- AttachmentRequest .objects .bulk_update (
131+ AttachmentRequest .bulk_objects .bulk_update (
110132 uploaded_attachment_requests ,
111133 update_fields = ['airtable_id' ],
112134 batch_size = 1000
@@ -117,17 +139,19 @@ class TRRRequestAirTableUploader(AirTableUploader):
117139 @classmethod
118140 def _build_data (cls , document_request ):
119141 officer = document_request .trr .officer
120- explanation = "Officer: {officer_name}(ID {officer_id})" .format (
121- officer_id = officer .id ,
122- officer_name = officer .full_name
123- ) if officer else ''
142+ explanation = f'Officer: { officer .full_name } { officer .id } if officer else ''
124143
125- requested_for = " TRR {trrid}" . format ( trrid = document_request .trr_id )
144+ requested_for = f' TRR { document_request .trr_id } '
126145 return explanation , requested_for , []
127146
128147 @classmethod
129- def _get_uploaded_objects (cls ):
130- return TRRAttachmentRequest .objects .filter (airtable_id = '' )
148+ def _get_uploaded_objects (cls , update_all_records = False ):
149+ records = TRRAttachmentRequest .objects .all ()
150+
151+ if not update_all_records :
152+ records = records .filter (airtable_id = '' )
153+
154+ return records
131155
132156 @classmethod
133157 def _post_handle (cls , uploaded_results ):
0 commit comments