diff --git a/passerelle_reunion_fsn/models.py b/passerelle_reunion_fsn/models.py index 18944e4..fd2ba1d 100644 --- a/passerelle_reunion_fsn/models.py +++ b/passerelle_reunion_fsn/models.py @@ -129,11 +129,11 @@ class FSNReunionConnector(BaseResource): dossiers = self._fetch_dossiers() self.logger.info('num new dossiers fetched: %s' % len(dossiers)) - # def daily(self): - # self.logger.info('start generate batch') - # for batch in self._generate_batches(): - # self.logger.info('created batch %s' % batch.batch_date) - # self.logger.info('end generate batch') + def daily(self): + self.logger.info('start generate batch') + for batch in self._generate_batches(): + self.logger.info('created batch %s' % batch.batch_date) + self.logger.info('end generate batch') def _ds_call(self, query, variables): headers = { @@ -636,7 +636,8 @@ query getDossiers($demarcheNumber: Int!, $createdSince: ISO8601DateTime, $first: devise = 'EUR' def get_data(fields, field_name): - return fields[field_name] or '' + res = fields[field_name] or '' + return res.replace(',', ' ') def write_row(writer, row): writer.writerow([force_text(i) for i in row]) @@ -664,14 +665,6 @@ query getDossiers($demarcheNumber: Int!, $createdSince: ISO8601DateTime, $first: if date_obj is None: raise APIError("Can't parse date") - # FOR TEST because no accepted form yet - # receipt_time = form['receipt_time'] - # if not receipt_time: - # raise APIError("Missing receipt_time") - # date_obj = parse_datetime(receipt_time).date() - # if date_obj is None: - # raise APIError("Can't parse date") - if date_obj >= now: continue if target_date_obj and date_obj != target_date_obj: @@ -693,7 +686,7 @@ query getDossiers($demarcheNumber: Int!, $createdSince: ISO8601DateTime, $first: sequence = "%s-%s" % (code_region, form['display_id']) period = 'MARS-VOLET2' siren = form_fields['siren'] - nom1 = form_fields['nom_responsable'] + form_fields['prenom_responsable'] + nom1 = get_data(form_fields, 'nom_responsable') + get_data(form_fields, 'prenom_responsable') nom2 = '' nb_salaries = form_fields['nb_salaries'] rue = form_fields['numero_voie']