Merge branch 'mike/ssw-organization' into 'master'

fix(SSW): changed sellingEntity schema to organization

See merge request !2008

src/prozorro_sale/procedure/models/schema/bankRuptcy.yml

@@ -1786,7 +1786,10 @@ schemas:
             - type: object
               properties:
                 reason:
-                  default: { }
+                  default: {
+                    "uk_UA": "Порушено порядок підготовки до аукціону",
+                    "en_US": "The order of preparation for the auction was violated"
+                  }
                   type: object
                   allOf:
                     - $ref: '#/components/schemas/base.MultiLang'

src/prozorro_sale/procedure/packages/simpleSell/schema/simpleSell.yml

@@ -369,7 +369,7 @@ schemas:
         x-legalNameEn: Procedure type
       sellingEntity:
         allOf:
-          - $ref: '#/components/schemas/base.SellingEntity'
+          - $ref: '#/components/schemas/base.Organization'
           - type: object
             properties:
               address:

test/unit/simpleSell/basetests/rectification_tests.py

@@ -62,7 +62,7 @@ class RectificationTest:
                 'sellingEntity': {
                     'identifier': {
                         'id': 'test-1234567890',
-                        'scheme': 'AE-ACCI',
+                        'scheme': 'UU-MNE',
                         'legalName': {
                             'uk_UA': 'AE-ACCI',
                             'en_US': 'AE-ACCI'
@@ -98,7 +98,7 @@ class RectificationTest:
                 }
             },
             pytest.raises(errors.DataError, match=r'(?=.+sellingEntity.+identifier.+scheme.+Please provide a valid id '
-                                                  r'for the \[\'ua_identifiers\'\] dictionaries)'),
+                                                  r'for the \[\'identifiers\', \'ua_identifiers\'\] dictionaries)'),
             id='invalid sellingEntity update, identifier + foreign address'
         ),
         pytest.param(
@@ -111,6 +111,49 @@ class RectificationTest:
             pytest.raises(errors.DataError, match=r'^\{"tenderAttempts": "Cannot update with role owner"\}$'),
             id='tenderAttempts blacklist'
         ),
+        pytest.param(
+            {
+                'sellingEntity': {
+                    'identifier': {
+                        'id': 'test-1234567890',
+                        'scheme': 'AE-ACCI',
+                        'legalName': {
+                            'uk_UA': 'AE-ACCI',
+                            'en_US': 'AE-ACCI'
+                        }
+                    },
+                    'address': {
+                        'streetAddress': {
+                            'uk_UA': 'тест адрес',
+                            'en_US': 'test address'
+                        },
+                        'locality': {
+                            'uk_UA': 'Дубаї',
+                            'en_US': 'Dubai'
+                        },
+                        'region': {
+                            'uk_UA': 'Дубаї',
+                            'en_US': 'Dubai'
+                        },
+                        'countryName': {
+                            'uk_UA': 'ОАЕ',
+                            'en_US': 'United Arab Emirates'
+                        }
+                    },
+                    'contactPoint': {
+                        'email': 'Tadmin@example.com',
+                        'telephone': '+380123456789',
+                        'name': {
+                            'uk_UA': 'string',
+                            'en_US': 'string'
+                        },
+                        'url': 'http://string.com'
+                    }
+                }
+            },
+            does_not_raise(),
+            id='valid sellingEntity update, identifier + foreign address'
+        ),
     ])
     def test_update_procedure_within_rectification_period(self, make_procedure, acl_context, data, expected):
         with freeze_time(datetime.now()) as frozen_time: