0002-mdel-add-SFTP-connection-options-to-send-and-receive.patch
| passerelle/apps/mdel/migrations/0006_auto_20210126_1440.py | ||
|---|---|---|
| 1 |
# -*- coding: utf-8 -*- |
|
| 2 |
# Generated by Django 1.11.29 on 2021-01-26 13:40 |
|
| 3 |
from __future__ import unicode_literals |
|
| 4 | ||
| 5 |
from django.db import migrations |
|
| 6 |
import passerelle.utils.sftp |
|
| 7 | ||
| 8 | ||
| 9 |
class Migration(migrations.Migration): |
|
| 10 | ||
| 11 |
dependencies = [ |
|
| 12 |
('mdel', '0005_remove_mdel_log_level'),
|
|
| 13 |
] |
|
| 14 | ||
| 15 |
operations = [ |
|
| 16 |
migrations.AddField( |
|
| 17 |
model_name='mdel', |
|
| 18 |
name='incoming_sftp', |
|
| 19 |
field=passerelle.utils.sftp.SFTPField(blank=True, default=None, verbose_name='SFTP server for incoming files'), |
|
| 20 |
), |
|
| 21 |
migrations.AddField( |
|
| 22 |
model_name='mdel', |
|
| 23 |
name='outcoming_sftp', |
|
| 24 |
field=passerelle.utils.sftp.SFTPField(blank=True, default=None, verbose_name='SFTP server for outgoing files'), |
|
| 25 |
), |
|
| 26 |
] |
|
| passerelle/apps/mdel/models.py | ||
|---|---|---|
| 25 | 25 |
from passerelle.compat import json_loads |
| 26 | 26 |
from passerelle.utils.api import endpoint |
| 27 | 27 |
from passerelle.utils.jsonresponse import APIError |
| 28 |
from passerelle.utils import SFTPField |
|
| 28 | 29 | |
| 29 | 30 |
from . import mdel |
| 30 | 31 | |
| ... | ... | |
| 74 | 75 |
- Acte d'Etat Civil (AEC-LA) |
| 75 | 76 |
- Recensement Citoyen Obligatoire (RCO-LA) |
| 76 | 77 |
""" |
| 78 | ||
| 79 |
outcoming_sftp = SFTPField(verbose_name=_('SFTP server for outgoing files'), blank=True)
|
|
| 80 |
incoming_sftp = SFTPField(verbose_name=_('SFTP server for incoming files'), blank=True)
|
|
| 81 | ||
| 77 | 82 |
category = _('Civil Status Connectors')
|
| 78 | 83 | |
| 79 | 84 |
class Meta: |
| ... | ... | |
| 120 | 125 | |
| 121 | 126 |
demand.save() |
| 122 | 127 | |
| 128 |
if self.outcoming_sftp: |
|
| 129 |
self.add_job('send_demand', demand_id=demand.demand_id)
|
|
| 130 | ||
| 123 | 131 |
return {'data': {'demand_id': demand.demand_id}}
|
| 124 | 132 | |
| 125 | 133 |
@endpoint(perm='can_access') |
| ... | ... | |
| 161 | 169 |
return os.path.join(mdel.get_resource_base_dir(), |
| 162 | 170 |
self.slug, 'outputs') |
| 163 | 171 | |
| 172 |
def send_demand(self, demand_id): |
|
| 173 |
try: |
|
| 174 |
demand = Demand.objects.get(demand_id=demand_id) |
|
| 175 |
except Demand.DoesNotExist: |
|
| 176 |
return |
|
| 177 |
with self.outcoming_sftp.client() as client: |
|
| 178 |
client.put(demand.filepath, |
|
| 179 |
os.path.join(client.getcwd(), demand.filename)) |
|
| 180 | ||
| 181 |
def get_response_files(self): |
|
| 182 |
if not os.path.exists(self.output_dir): |
|
| 183 |
os.makedirs(self.output_dir) |
|
| 184 | ||
| 185 |
with self.incoming_sftp.client() as client: |
|
| 186 |
for filename in client.listdir(): |
|
| 187 |
if filename in os.listdir(self.output_dir): |
|
| 188 |
continue |
|
| 189 |
client.get(filename, os.path.join(self.output_dir, filename)) |
|
| 190 | ||
| 191 |
def hourly(self): |
|
| 192 |
super().hourly() |
|
| 193 |
if self.incoming_sftp: |
|
| 194 |
self.get_response_files() |
|
| 195 | ||
| 164 | 196 | |
| 165 | 197 |
@six.python_2_unicode_compatible |
| 166 | 198 |
class Demand(models.Model): |
| ... | ... | |
| 194 | 226 |
def filename(self): |
| 195 | 227 |
return '%s.zip' % self.name |
| 196 | 228 | |
| 229 |
@property |
|
| 230 |
def filepath(self): |
|
| 231 |
return os.path.join(self.resource.input_dir, self.filename) |
|
| 232 | ||
| 197 | 233 |
def create_zip(self, formdata): |
| 198 | 234 |
""" |
| 199 | 235 |
Creates demand as zip folder |
| tests/test_mdel.py | ||
|---|---|---|
| 31 | 31 |
from passerelle.apps.mdel.mdel import Message, Description, AttachedFile, get_resource_base_dir |
| 32 | 32 |
from passerelle.apps.mdel.utils import parse_date |
| 33 | 33 |
from passerelle.compat import json_loads |
| 34 |
from passerelle.utils import SFTP |
|
| 34 | 35 | |
| 35 | 36 |
import utils |
| 36 | 37 | |
| ... | ... | |
| 305 | 306 |
assert root.find('DemandeActe/Titulaire/Filiation/Pere/Prenoms').text == 'Ryu'
|
| 306 | 307 | |
| 307 | 308 | |
| 309 |
def test_create_aec_demand_with_output_sftp(app, setup, aec_payload, sftpserver): |
|
| 310 |
setup.outcoming_sftp = SFTP('sftp://foo:bar@{server.host}:{server.port}/output/'.format(server=sftpserver))
|
|
| 311 |
setup.save() |
|
| 312 |
resp = app.post_json('/mdel/test/create', params=aec_payload, status=200)
|
|
| 313 |
expected_filename = '%s-0.zip' % resp.json['data']['demand_id'] |
|
| 314 |
with sftpserver.serve_content({'output': {expected_filename: 'content'}}):
|
|
| 315 |
setup.jobs() |
|
| 316 | ||
| 317 | ||
| 318 |
def test_create_aec_demand_with_input_sftp(app, setup, aec_payload, sftpserver): |
|
| 319 |
setup.incoming_sftp = SFTP('sftp://foo:bar@{server.host}:{server.port}/input/'.format(server=sftpserver))
|
|
| 320 |
setup.save() |
|
| 321 |
resp = app.post_json('/mdel/test/create', params=aec_payload, status=200)
|
|
| 322 |
expected_filename = '%s-1.zip' % resp.json['data']['demand_id'] |
|
| 323 |
with sftpserver.serve_content({'input': {expected_filename: 'content'}}):
|
|
| 324 |
setup.hourly() |
|
| 325 |
assert expected_filename in os.listdir(setup.output_dir) |
|
| 326 | ||
| 327 | ||
| 308 | 328 |
def test_create_aec_demand_type_without_date_acte(app, setup): |
| 309 | 329 |
payload = json_loads(get_file_from_test_base_dir('formdata_aec_deces.json'))
|
| 310 | 330 |
payload['fields'].pop('date_acte')
|
| 311 |
- |
|