toulouse-maelis: retirer le paramètre flagCom des payloads (#77547) #247

Merged
nroche merged 4 commits from wip/77547-remove-flagCom-from-payloads into main 2023-05-15 17:55:03 +02:00
12 changed files with 111 additions and 97 deletions

View File

@ -613,10 +613,6 @@ UPDATE_FAMILY_SCHEMA = {
'type': 'string',
'pattern': '.+',
},
'flagCom': {
'description': 'Hors commune',
'oneOf': schemas.BOOLEAN_TYPES,
},
'nbChild': {
'description': "Nombre d'enfants à charge",
'oneOf': [{'type': 'string'}, {'type': 'null'}],

View File

@ -699,8 +699,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
)
for i in range(0, len(post_data.get('childList') or [])):
self.check_and_adapt_child_payload_in_referential(post_data, ['childList', i])
if 'flagCom' in post_data:
post_data['flagCom'] = self.encode_bool(post_data['flagCom'])
def replace_null_values(self, dico):
'''send null fields as empty SOAP tag to tell maelis to empty the value'''
@ -1579,7 +1577,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1610,7 +1607,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1644,7 +1640,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1715,7 +1710,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1809,7 +1803,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1847,7 +1840,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],
@ -1883,7 +1875,6 @@ class ToulouseMaelis(BaseResource, HTTPResource):
'dossierNumber': family_id,
'category': family['category'],
'situation': family['situation'],
'flagCom': family['flagCom'],
'nbChild': family['nbChild'],
'nbTotalChild': family['nbTotalChild'],
'nbAES': family['nbAES'],

View File

@ -19,7 +19,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.school.ws.maelis.sigec.com" xmlns:ns1="activity.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.school.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.school.ws.maelis.sigec.com" xmlns:ns1="activity.ws.maelis.sigec.com" targetNamespace="bean.persistence.school.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="activity.ws.maelis.sigec.com"/>
<xs:complexType name="weeklyCalendarActivityBean">
<xs:sequence>
@ -68,7 +68,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.invoice.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ws.maelis.sigec.com" targetNamespace="bean.persistence.invoice.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="bean.persistence.ws.maelis.sigec.com"/>
<xs:complexType name="invoiceBean">
<xs:sequence>
@ -117,7 +117,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="activity.ws.maelis.sigec.com" xmlns="bean.persistence.ape.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.ape.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="activity.ws.maelis.sigec.com" targetNamespace="bean.persistence.ape.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="activity.ws.maelis.sigec.com"/>
<xs:complexType name="indicatorValueAddUpdBean">
<xs:complexContent>
@ -132,7 +132,7 @@
</xs:complexContent>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.activity.ws.maelis.sigec.com" xmlns:ns5="bean.persistence.ws.maelis.sigec.com" xmlns:ns4="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns3="bean.persistence.school.ws.maelis.sigec.com" xmlns:ns2="activity.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ape.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.activity.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.activity.ws.maelis.sigec.com" xmlns:ns5="bean.persistence.ws.maelis.sigec.com" xmlns:ns4="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns3="bean.persistence.school.ws.maelis.sigec.com" xmlns:ns2="activity.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ape.ws.maelis.sigec.com" targetNamespace="bean.persistence.activity.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="bean.persistence.ape.ws.maelis.sigec.com"/>
<xs:import namespace="activity.ws.maelis.sigec.com"/>
<xs:import namespace="bean.persistence.school.ws.maelis.sigec.com"/>
@ -1021,16 +1021,6 @@
<xs:element minOccurs="0" name="value" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="indicatorKernelBean">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="choiceList" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="code" type="xs:string"/>
<xs:element minOccurs="0" name="id" type="xs:string"/>
<xs:element minOccurs="0" name="label" type="xs:string"/>
<xs:element minOccurs="0" name="typeDesc" type="tns:indicatorTypeDescEnum"/>
<xs:element minOccurs="0" name="typeDescStr" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="conveyanceInfoKernelBean">
<xs:sequence>
<xs:element minOccurs="0" name="afternoonJourney" type="tns:journeyInfoKernelBean"/>
@ -1054,6 +1044,16 @@
<xs:element minOccurs="0" name="place" type="xs:anyType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="indicatorKernelBean">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="choiceList" nillable="true" type="xs:anyType"/>
<xs:element minOccurs="0" name="code" type="xs:string"/>
<xs:element minOccurs="0" name="id" type="xs:string"/>
<xs:element minOccurs="0" name="label" type="xs:string"/>
<xs:element minOccurs="0" name="typeDesc" type="tns:indicatorTypeDescEnum"/>
<xs:element minOccurs="0" name="typeDescStr" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="updatePersonUnitBasket">
<xs:sequence>
<xs:element name="updateBasketLigneRequestBean" type="tns:updateBasketLigneRequestBean"/>
@ -1175,12 +1175,6 @@
<xs:element maxOccurs="unbounded" minOccurs="0" name="unitKernelList" nillable="true" type="xs:anyType"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="codeLabelKernelBean">
<xs:sequence>
<xs:element minOccurs="0" name="code" type="xs:string"/>
<xs:element minOccurs="0" name="label" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="consoTarifKernelBean">
<xs:sequence>
<xs:element minOccurs="0" name="commune" type="xs:string"/>
@ -1188,6 +1182,12 @@
<xs:element minOccurs="0" name="tarifKernelBean" type="tns:codeLabelKernelBean"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="codeLabelKernelBean">
<xs:sequence>
<xs:element minOccurs="0" name="code" type="xs:string"/>
<xs:element minOccurs="0" name="label" type="xs:string"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="activityPeriodCapacityKernelBean">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="calendCapacityExceptKernelList" nillable="true" type="tns:calendCapacityKernelBean"/>
@ -1267,13 +1267,6 @@
<xs:element minOccurs="0" name="getPersonCatalogueActivityResultBean" type="ns1:getPersonCatalogueActivityResultBean"/>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="indicatorTypeDescEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="NOTE"/>
<xs:enumeration value="CHOICE"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="blocNoteTypeEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="A"/>
@ -1283,6 +1276,13 @@
<xs:enumeration value="ID"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="indicatorTypeDescEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="NOTE"/>
<xs:enumeration value="CHOICE"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="dayInfoStatus">
<xs:restriction base="xs:string">
<xs:enumeration value="NO_CUSTODY"/>
@ -1922,11 +1922,11 @@ Pour chaque jour dé-coché, cette méthode est invoquée pour que la présence
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="cancelInvoiceAndDeleteSubscribeList">
<wsdl:documentation>Méthode qui annule une facture et supprime toutes les inscriptions correspondantes.
<wsdl:documentation>Annule une facture et supprime toutes les inscriptions correspondantes.
Cette méthode est invoquée pour annuler la facture qui n'a pas été payée dans le temps imparti et suppprimer les inscriptions.
-------------------------------
idIns : identifiant de l'inscription (obligatoire)</wsdl:documentation>
idInvoice : identifiant de la facture (obligatoire)</wsdl:documentation>
<wsdl:input message="tns:cancelInvoiceAndDeleteSubscribeList" name="cancelInvoiceAndDeleteSubscribeList">
</wsdl:input>
<wsdl:output message="tns:cancelInvoiceAndDeleteSubscribeListResponse" name="cancelInvoiceAndDeleteSubscribeListResponse">
@ -2255,7 +2255,7 @@ Si la capacité est effectuée par jour, il n'y a pas de contrôle du nombre d'i
</wsdl:binding>
<wsdl:service name="ActivityService">
<wsdl:port binding="tns:ActivityServiceSoapBinding" name="ActivityServiceImplPort">
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse-recette/services/ActivityService"/>
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse/services/ActivityService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -9,7 +9,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.ape.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="ape.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.ape.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.ape.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="ape.ws.maelis.sigec.com" targetNamespace="bean.persistence.ape.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="ape.ws.maelis.sigec.com"/>
<xs:import namespace="bean.persistence.ws.maelis.sigec.com"/>
<xs:complexType name="addApeBookRequestBean">
@ -464,7 +464,7 @@
</wsdl:binding>
<wsdl:service name="ApeService">
<wsdl:port binding="tns:ApeServiceSoapBinding" name="ApeServiceImplPort">
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse-recette/services/ApeService"/>
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse/services/ApeService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -196,6 +196,7 @@
<xs:complexType name="subscribeActivityBean">
<xs:sequence>
<xs:element minOccurs="0" name="libelle" type="xs:string"/>
<xs:element minOccurs="0" name="libelle2" type="xs:string"/>
<xs:element minOccurs="0" name="typeIns" type="xs:string"/>
<xs:element minOccurs="0" name="libelleTypeIns" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="subscribesUnit" nillable="true" type="tns:subscribeUnitBean"/>
@ -383,7 +384,6 @@
<xs:sequence>
<xs:element name="category" type="xs:string"/>
<xs:element name="situation" type="xs:string"/>
<xs:element minOccurs="0" name="flagCom" type="xs:boolean"/>
<xs:element minOccurs="0" name="nbChild" type="xs:int"/>
<xs:element minOccurs="0" name="nbTotalChild" type="xs:int"/>
<xs:element minOccurs="0" name="nbAES" type="xs:int"/>
@ -620,7 +620,6 @@
<xs:element name="dossierNumber" type="xs:int"/>
<xs:element name="category" type="xs:string"/>
<xs:element name="situation" type="xs:string"/>
<xs:element minOccurs="0" name="flagCom" type="xs:boolean"/>
<xs:element minOccurs="0" name="nbChild" type="xs:int"/>
<xs:element minOccurs="0" name="nbTotalChild" type="xs:int"/>
<xs:element minOccurs="0" name="nbAES" type="xs:int"/>
@ -809,13 +808,6 @@
<xs:element maxOccurs="unbounded" minOccurs="0" name="streetList" type="ns1:StreetBean"/>
</xs:sequence>
</xs:complexType>
<xs:simpleType name="indicatorTypeDescEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="NOTE"/>
<xs:enumeration value="CHOICE"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="blocNoteTypeEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="A"/>
@ -825,6 +817,13 @@
<xs:enumeration value="ID"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="indicatorTypeDescEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="NONE"/>
<xs:enumeration value="NOTE"/>
<xs:enumeration value="CHOICE"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="levelCode">
<xs:restriction base="xs:string">
<xs:enumeration value="SCHOOL"/>
@ -859,7 +858,8 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="bean.persistence.ws.maelis.sigec.com" version="1.0">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="family.ws.maelis.sigec.com" targetNamespace="bean.persistence.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="family.ws.maelis.sigec.com"/>
<xs:complexType name="itemBean">
<xs:sequence>
<xs:element minOccurs="0" name="code" type="xs:string"/>
@ -883,13 +883,20 @@
</xs:sequence>
</xs:complexType>
<xs:complexType name="StreetBean">
<xs:sequence>
<xs:element minOccurs="0" name="idStreet" type="xs:string"/>
<xs:element minOccurs="0" name="libelleStreet" type="xs:string"/>
</xs:sequence>
<xs:complexContent>
<xs:extension base="ns1:abstractSpecResultBean">
<xs:sequence>
<xs:element minOccurs="0" name="idStreet" type="xs:string"/>
<xs:element minOccurs="0" name="libelleStreet" type="xs:string"/>
<xs:element minOccurs="0" name="idTown" type="xs:string"/>
<xs:element minOccurs="0" name="zipCode" type="xs:string"/>
<xs:element minOccurs="0" name="town" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="bean.persistence.family.ws.maelis.sigec.com" xmlns="bean.persistence.site.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.site.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="bean.persistence.family.ws.maelis.sigec.com" targetNamespace="bean.persistence.site.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="bean.persistence.family.ws.maelis.sigec.com"/>
<xs:complexType name="subscribeSchoolYearBean">
<xs:sequence>
@ -897,7 +904,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.family.ws.maelis.sigec.com" xmlns:ns3="bean.persistence.site.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="family.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.family.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.family.ws.maelis.sigec.com" xmlns:ns3="bean.persistence.site.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="family.ws.maelis.sigec.com" targetNamespace="bean.persistence.family.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="family.ws.maelis.sigec.com"/>
<xs:import namespace="bean.persistence.ws.maelis.sigec.com"/>
<xs:import namespace="bean.persistence.site.ws.maelis.sigec.com"/>
@ -1972,7 +1979,6 @@
numDossier : numéro de dossier famille (obligatoire)
category : code catégorie familiale
situation : code situation familiale
flagCom : code/hors commune
nbChild : nombre d'enfants à charge max 99
nbTotalChild : nombre d'enfants max 99
@ -2135,7 +2141,6 @@
-------------------------
category : code catégorie familiale (obligatoire)
situation : code situation familiale (obligatoire)
flagCom : code/hors commune
nbChild : nombre d'enfants à charge max 99
nbTotalChild : nombre d'enfants max 99
nbAES : nombre d'AES max 99
@ -2422,7 +2427,6 @@ L'enfant est inscrit pour l'année scolaire et le niveau passé en paramètre :
--------------------
category : code catégorie familiale (obligatoire)
situation : code situation familiale (obligatoire)
flagCom : code/hors commune
nbChild : nombre d'enfants à charge max 99
nbTotalChild : nombre d'enfants max 99
nbAES : nombre d'AES max 99
@ -2835,7 +2839,7 @@ Cette méthode permet de mettre à jour les informations relatives au PAI pour u
</wsdl:fault>
</wsdl:operation>
<wsdl:operation name="readStreetList">
<wsdl:documentation>[REF] Renvoie la liste des voies d'adresse</wsdl:documentation>
<wsdl:documentation>[REF] Renvoie la liste des voies de la commune</wsdl:documentation>
<wsdl:input message="tns:readStreetList" name="readStreetList">
</wsdl:input>
<wsdl:output message="tns:readStreetListResponse" name="readStreetListResponse">
@ -3449,7 +3453,7 @@ Cette méthode permet de mettre à jour les informations relatives au PAI pour u
</wsdl:binding>
<wsdl:service name="FamilyService">
<wsdl:port binding="tns:FamilyServiceSoapBinding" name="FamilyServiceImplPort">
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse-recette/services/FamilyService"/>
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse/services/FamilyService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -152,7 +152,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.invoice.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.invoice.ws.maelis.sigec.com" xmlns:ns2="bean.persistence.ws.maelis.sigec.com" xmlns:ns1="ws.maelis.sigec.com" targetNamespace="bean.persistence.invoice.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="ws.maelis.sigec.com"/>
<xs:import namespace="bean.persistence.ws.maelis.sigec.com"/>
<xs:complexType name="personBankBean">
@ -514,7 +514,7 @@
</wsdl:binding>
<wsdl:service name="InvoiceService">
<wsdl:port binding="tns:InvoiceServiceSoapBinding" name="InvoiceServiceImplPort">
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse-recette/services/InvoiceService"/>
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse/services/InvoiceService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -97,7 +97,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.site.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ws.maelis.sigec.com" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="bean.persistence.site.ws.maelis.sigec.com">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="bean.persistence.site.ws.maelis.sigec.com" xmlns:ns1="bean.persistence.ws.maelis.sigec.com" targetNamespace="bean.persistence.site.ws.maelis.sigec.com" version="1.0">
<xs:import namespace="bean.persistence.ws.maelis.sigec.com"/>
<xs:complexType name="readSchoolForAdressAndLevelRequestBean">
<xs:sequence>
@ -332,7 +332,7 @@
</wsdl:binding>
<wsdl:service name="SiteService">
<wsdl:port binding="tns:SiteServiceSoapBinding" name="SiteServiceImplPort">
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse-recette/services/SiteService"/>
<soap:address location="https://demo-toulouse.sigec.fr/maelisws-toulouse/services/SiteService"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

View File

@ -21,9 +21,9 @@
<countryCode>99350</countryCode>
</birth>
<adresse>
<idStreet>AM0330</idStreet>
<idStreet>2317</idStreet>
<num>170</num>
<street1>TRAVERSE DES MARAICHERS</street1>
<street1>RUE ACHILLE VIADIEU</street1>
<town>Paris</town>
<zipcode>75014</zipcode>
</adresse>

View File

@ -21,9 +21,9 @@
<countryCode>99350</countryCode>
</birth>
<adresse>
<idStreet>AM0330</idStreet>
<idStreet>2317</idStreet>
<num>170</num>
<street1>TRAVERSE DES MARAICHERS</street1>
<street1>RUE ACHILLE VIADIEU</street1>
<town>Paris</town>
<zipcode>75014</zipcode>
</adresse>

View File

@ -21,9 +21,9 @@
<countryCode>99350</countryCode>
</birth>
<adresse>
<idStreet>AM0330</idStreet>
<idStreet>2317</idStreet>
<num>170</num>
<street1>TRAVERSE DES MARAICHERS</street1>
<street1>RUE ACHILLE VIADIEU</street1>
<town>Paris</town>
<zipcode>75014</zipcode>
</adresse>

View File

@ -2,16 +2,25 @@
<soap:Body>
<ns2:readStreetListResponse xmlns:ns2="family.ws.maelis.sigec.com">
<streetList>
<idStreet>AS0264</idStreet>
<libelleStreet>RUE SAINT FRANCOIS DE PAULE</libelleStreet>
<idStreet>2315</idStreet>
<libelleStreet>RUE DE LA VERRERIE</libelleStreet>
<idTown>A00000000006</idTown>
<zipCode>31500</zipCode>
<town>TOULOUSE</town>
</streetList>
<streetList>
<idStreet>AP0594</idStreet>
<libelleStreet>AVENUE PAULIANI</libelleStreet>
<idStreet>2316</idStreet>
<libelleStreet>RUE VESTREPAIN</libelleStreet>
<idTown>A00000000002</idTown>
<zipCode>31100</zipCode>
<town>TOULOUSE</town>
</streetList>
<streetList>
<idStreet>AM0330</idStreet>
<libelleStreet>TRAVERSE DES MARAICHERS</libelleStreet>
<idStreet>2317</idStreet>
<libelleStreet>RUE ACHILLE VIADIEU</libelleStreet>
<idTown>A00000000005</idTown>
<zipCode>31400</zipCode>
<town>TOULOUSE</town>
</streetList>
</ns2:readStreetListResponse>
</soap:Body>

View File

@ -1108,18 +1108,32 @@ def test_read_street_list(con, app):
assert resp.json['err'] == 0
assert len(resp.json['data']) == 3
assert resp.json['data'] == [
{'id': 'AP0594', 'text': 'AVENUE PAULIANI', 'idStreet': 'AP0594', 'libelleStreet': 'AVENUE PAULIANI'},
{
'id': 'AS0264',
'text': 'RUE SAINT FRANCOIS DE PAULE',
'idStreet': 'AS0264',
'libelleStreet': 'RUE SAINT FRANCOIS DE PAULE',
'id': '2317',
'text': 'RUE ACHILLE VIADIEU',
'town': 'TOULOUSE',
'idTown': 'A00000000005',
'zipCode': '31400',
'idStreet': '2317',
'libelleStreet': 'RUE ACHILLE VIADIEU',
},
{
'id': 'AM0330',
'text': 'TRAVERSE DES MARAICHERS',
'idStreet': 'AM0330',
'libelleStreet': 'TRAVERSE DES MARAICHERS',
'id': '2315',
'text': 'RUE DE LA VERRERIE',
'town': 'TOULOUSE',
'idTown': 'A00000000006',
'zipCode': '31500',
'idStreet': '2315',
'libelleStreet': 'RUE DE LA VERRERIE',
},
{
'id': '2316',
'text': 'RUE VESTREPAIN',
'town': 'TOULOUSE',
'idTown': 'A00000000002',
'zipCode': '31100',
'idStreet': '2316',
'libelleStreet': 'RUE VESTREPAIN',
},
]
@ -1406,11 +1420,11 @@ def test_read_family(family_service, xml, con, app):
'countryCode_text': 'MAROC',
},
'adresse': {
'idStreet': 'AM0330',
'idStreet_text': 'TRAVERSE DES MARAICHERS',
'idStreet': '2317',
'idStreet_text': 'RUE ACHILLE VIADIEU',
'num': 170,
'numComp': None,
'street1': 'TRAVERSE DES MARAICHERS',
'street1': 'RUE ACHILLE VIADIEU',
'street2': None,
'town': 'Paris',
'zipcode': '75014',
@ -1934,6 +1948,7 @@ def test_read_rl2(family_service, con, app):
'subscribeActivityList': [
{
'libelle': 'CSocial Adult 2021/2022 - Bijoux en cuirs 21/03/22',
'libelle2': None,
'typeIns': '1',
'libelleTypeIns': 'DEFINITIVE',
'subscribesUnit': [
@ -2247,7 +2262,6 @@ def test_create_family(family_service, con, app):
params = {
'category': 'ACCEUI',
'situation': 'C',
'flagCom': False,
'rl1/civility': 'M.',
'rl1/firstname': 'Jhon',
'rl1/lastname': 'Doe',
@ -2257,7 +2271,7 @@ def test_create_family(family_service, con, app):
'rl1/birth/countryCode': '99350',
'rl1/birth/dateBirth': '1938-07-26',
'rl1/birth/place': 'Rabbat',
'rl1/adresse/idStreet': 'AM0330',
'rl1/adresse/idStreet': '2317',
'rl1/adresse/street1': 'Chateau',
'rl1/adresse/town': 'Paris',
'rl1/adresse/zipcode': '75014',
@ -3252,7 +3266,7 @@ def test_update_coordinate(family_service, con, app):
params = {
'adresse/num': '169',
'adresse/numComp': 'B',
'adresse/idStreet': 'AM0330',
'adresse/idStreet': '2317',
'adresse/street1': 'Château',
'adresse/street2': None,
'adresse/town': 'Paris',