11import json
22import os
3+ import re
34from datetime import datetime , timedelta
45from datetime import timezone as datetime_timezone
56
3738class Command (BaseCommand ):
3839 help = "Add new entries from Access database file"
3940
41+ def get_codes_skip (self ):
42+ value = AppealFilter .objects .filter (name = "ingestAppealFilter" ).values_list ("value" , flat = True ).first ()
43+ return re .findall (r"[^\s,]+" , value or "" )
44+
4045 def parse_date (self , date_string ):
4146 timeformat = "%Y-%m-%dT%H:%M:%S"
4247 return datetime .strptime (date_string [:18 ], timeformat ).replace (tzinfo = datetime_timezone .utc )
@@ -62,10 +67,7 @@ def get_new_or_modified_appeals(self):
6267 logger .info ("Using local appeals.json file" )
6368
6469 codes = Appeal .objects .values_list ("code" , flat = True )
65- if AppealFilter .objects .values_list ("value" , flat = True ).filter (name = "ingestAppealFilter" ).count () > 0 :
66- codes_skip = AppealFilter .objects .values_list ("value" , flat = True ).filter (name = "ingestAppealFilter" )[0 ].split ("," )
67- else :
68- codes_skip = []
70+ codes_skip = self .get_codes_skip ()
6971
7072 with open ("appeals.json" ) as f :
7173 # modified = json.loads(f.read())
@@ -155,10 +157,7 @@ def get_new_or_modified_appeals(self):
155157
156158 codes = Appeal .objects .values_list ("code" , flat = True )
157159
158- if AppealFilter .objects .values_list ("value" , flat = True ).filter (name = "ingestAppealFilter" ).count () > 0 :
159- codes_skip = AppealFilter .objects .values_list ("value" , flat = True ).filter (name = "ingestAppealFilter" )[0 ].split ("," )
160- else :
161- codes_skip = []
160+ codes_skip = self .get_codes_skip ()
162161
163162 for r in records :
164163 # Temporary filtering, the manual version should be kept:
0 commit comments