Merge pull request #4 from ArtyomDevNow/PH-573

PH-573/PH-609 [BUG] sample-provider-python käitub delegate type=LEGAL_PERSON puhul valesti / Viia sample-provider-python üle API versioon 0.8.0 pealt 0.9.x peale

Author: ArtyomDevNow

api/app.py

@@ -4,10 +4,10 @@
 from flask import Flask, jsonify, request
 from flask_sqlalchemy import SQLAlchemy
 
-from api.exceptions import (CompanyCodeInvalid, DelegateNotFound,
+from api.exceptions import (CompanyCodeInvalid,
                             ErrorConfigBase, MandateDataInvalid,
                             MandateNotFound, MandateSubdelegateDataInvalid,
-                            RepresenteeNotFound, UnprocessableRequestError)
+                            UnprocessableRequestError, ActionInvalid)
 from api.serializers import (serialize_delegate_mandates,
                              serialize_representee_mandates)
 from api.services import (create_mandate_pg, delete_mandate_pg,
@@ -46,11 +46,10 @@ def create_app():
     db.init_app(app)
     app.config['SETTINGS'] = parse_settings(app.config['SETTINGS_PATH'])
 
+    app.errorhandler(ActionInvalid)(create_error_handler(501))
     app.errorhandler(CompanyCodeInvalid)(create_error_handler(400))
     app.errorhandler(MandateDataInvalid)(create_error_handler(400))
     app.errorhandler(MandateSubdelegateDataInvalid)(create_error_handler(400))
-    app.errorhandler(RepresenteeNotFound)(create_error_handler(404))
-    app.errorhandler(DelegateNotFound)(create_error_handler(404))
     app.errorhandler(MandateNotFound)(create_error_handler(404))
     app.errorhandler(UnprocessableRequestError)(create_error_handler(422))
 
@@ -99,10 +98,8 @@ def get_representees_delegates_mandates(representee_id):
             delegate_identifier=delegate_identifier,
             subdelegated_by_identifier=subdelegated_by_identifier
         )
-        # does representee really uknown ?
         if not data_rows:
-            error_config = app.config['SETTINGS']['errors']['representee_not_found']
-            raise RepresenteeNotFound('Representee not found', error_config)
+            return make_success_response(data_rows, 200)
 
         representee, delegates = extract_representee_mandates(data_rows)
         response_data = serialize_representee_mandates(representee, delegates, app.config['SETTINGS'])
@@ -139,16 +136,20 @@ def post_representee_delegate_mandate(representee_id, delegate_id):
         return make_success_response([], 201)
 
     @app.route(
-        '/nss/<string:ns>/representees/<string:representee_id>/delegates/<string:delegate_id>/mandates/<string:mandate_id>',
-        methods=['DELETE']
+        '/representees/<string:representee_id>/delegates/<string:delegate_id>/mandates/<string:mandate_id>',
+        methods=['PUT']
     )
-    def delete_mandate(ns, representee_id, delegate_id, mandate_id):
+    def delete_mandate(representee_id, delegate_id, mandate_id):
         xroad_user_id = request.headers.get('X-Road-UserId')
         app.logger.info(f'X-Road-UserId: {xroad_user_id} Deleting mandate')
+        data = request.json
+        if data['action'] != 'DELETE':
+            error_config = app.config['SETTINGS']['errors']['action_invalid']
+            raise ActionInvalid("Action invalid", error_config)
 
         db_uri = app.config['SQLALCHEMY_DATABASE_URI']
         try:
-            deleted = delete_mandate_pg(db_uri, ns, representee_id, delegate_id, mandate_id)
+            deleted = delete_mandate_pg(db_uri, representee_id, delegate_id, mandate_id)
         except psycopg2.errors.RaiseException as e:
             app.logger.exception(str(e))
             error_config = app.config['SETTINGS']['errors']['unprocessable_request']
@@ -160,10 +161,10 @@ def delete_mandate(ns, representee_id, delegate_id, mandate_id):
         raise MandateNotFound('Mandate to delete was not found', error_config)
 
     @app.route(
-        '/nss/<string:ns>/representees/<string:representee_id>/delegates/<string:delegate_id>/mandates/<string:mandate_id>/subdelegates',
+        '/representees/<string:representee_id>/delegates/<string:delegate_id>/mandates/<string:mandate_id>/subdelegates',
         methods=['POST']
     )
-    def post_subdelegate_mandate(ns, representee_id, delegate_id, mandate_id):
+    def post_subdelegate_mandate(representee_id, delegate_id, mandate_id):
         xroad_user_id = request.headers.get('X-Road-UserId')
         xroad_represented_party = request.headers.get('X-Road-Represented-Party')
         app.logger.info(f'X-Road-UserId: {xroad_user_id} Creating subdelegate')

api/exceptions.py

@@ -23,22 +23,13 @@ def __init__(self, *args, **kwargs) -> None:
         self.status_code = status_code or CompanyCodeInvalid.status_code
 
 
-class RepresenteeNotFound(ErrorConfigBase):
-    status_code = 404
-
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-        status_code = kwargs.get('status_code')
-        self.status_code = status_code or RepresenteeNotFound.status_code
-
-
-class DelegateNotFound(ErrorConfigBase):
-    status_code = 404
+class ActionInvalid(ErrorConfigBase):
+    status_code = 501
 
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         status_code = kwargs.get('status_code')
-        self.status_code = status_code or DelegateNotFound.status_code
+        self.status_code = status_code or ActionInvalid.status_code
 
 
 class MandateDataInvalid(ErrorConfigBase):

api/serializers.py

@@ -26,18 +26,9 @@ def serialize_representee_mandates(representee, delegates, settings):
     response_data = []
     for delegate in delegates:
         item = {
-            'delegate': {
-                'firstName': delegate['delegate_first_name'],
-                'identifier': f'{delegate["delegate_identifier"]}',
-                'surname': delegate['delegate_surname'],
-                'type': delegate['delegate_type']
-            },
+            'delegate': serialize_item_by_type(delegate, 'delegate'),
             'mandates': [],
-            'representee': {
-                'identifier': f'{representee["representee_identifier"]}',
-                'legalName': representee['representee_legal_name'],
-                'type': representee['representee_type']
-            }
+            'representee': serialize_item_by_type(representee, 'representee'),
         }
         for mandate in delegate['mandates']:
             mandate_data = serialize_mandate(representee, delegate, mandate, settings)
@@ -46,6 +37,25 @@ def serialize_representee_mandates(representee, delegates, settings):
     return response_data
 
 
+def serialize_item_by_type(item, key_type):
+    switcher = {
+        'LEGAL_PERSON': {
+            'identifier': item[key_type + '_identifier'],
+            'type': item[key_type + '_type'],
+            'legalName': item[key_type + '_legal_name']
+        },
+        'NATURAL_PERSON': {
+            'identifier': item[key_type + '_identifier'],
+            'type': item[key_type + '_type'],
+            'firstName': item[key_type + '_first_name'],
+            'surname': item[key_type + '_surname']
+        },
+    }
+
+    default = {k: v for k, v in item.items() if v is not None and k != key_type + '_id'}
+    return switcher.get(item[key_type + '_type'], default)
+
+
 def serialize_mandate(representee, delegate, mandate, settings):
     links = {
         'delete': mandate['link_delete'],
@@ -73,16 +83,14 @@ def serialize_mandate(representee, delegate, mandate, settings):
 
 
 def set_subdelegate_link(mandate, representee, delegate):
-    ns = mandate['role'].split(':')[0]
     representee_id = representee['representee_id']
     delegate_id = delegate['delegate_id']
     mandate_id = mandate['mandate_id']
-    return f'/v1/nss/{ns}/representees/{representee_id}/delegates/{delegate_id}/mandates/{mandate_id}/subdelegates'
+    return f'/v1/representees/{representee_id}/delegates/{delegate_id}/mandates/{mandate_id}/subdelegates'
 
 
 def set_delete_link(mandate, representee, delegate):
-    ns = mandate['role'].split(':')[0] if mandate.get('role') else ''
     representee_id = representee['representee_id']
     delegate_id = delegate['delegate_id']
     mandate_id = mandate['mandate_id']
-    return f'/v1/nss/{ns}/representees/{representee_id}/delegates/{delegate_id}/mandates/{mandate_id}'
+    return f'/v1/representees/{representee_id}/delegates/{delegate_id}/mandates/{mandate_id}'

api/services.py

@@ -254,15 +254,14 @@ def create_mandate_pg(uri, data):
     conn.close()
 
 
-def delete_mandate_pg(uri, namespace, representee_identifier,
+def delete_mandate_pg(uri, representee_identifier,
                       delegate_identifier, mandate_identifier):
     conn = psycopg2.connect(uri)
     conn.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
 
     cur = conn.cursor()
     cur.callproc(
         'function_delete_mandate', [
-            namespace,
             representee_identifier,
             delegate_identifier,
             mandate_identifier,

settings.yaml

@@ -8,14 +8,14 @@ errors:
         et: Volituse kustutamine ebaõnnestus
         ru: Volituse kustutamine ebaõnnestus (ru)
       type: test-type-for-legal-person-validation
-    representee_not_found:
-      reference: http://example-representee-not-found-guidence.com
-      title: Representee was not found
+    action_invalid:
+      reference: http://example-delegate-not-found-guidence.com
+      title: Action is invalid
       translation:
-        en: Representee was not found
-        et: Volituse kustutamine ebaõnnestus
-        ru: Volituse kustutamine ebaõnnestus (ru)
-      type: test-type-for-representee-not-found
+        en: Action is invalid
+        et: Action is invalid (et)
+        ru: Action is invalid (ru)
+      type: test-type-for-action-invalid
     mandate_data_invalid:
       reference: http://example-mandate-data-invalid-guidence.com
       title: Mandate data is invalid

tests/pg_data/02_init_views.sql

@@ -22,9 +22,9 @@ SELECT
     mandate.original_mandate_id,
     mandate.document_uuid,
     mandate.can_display_document_to_delegate,
-    CONCAT('/', 'v1/nss/', LEFT(mandate.role, POSITION(':' IN mandate.role) - 1), '/representees/', mandate.representee_id, '/delegates/', mandate.delegate_id, '/mandates/', mandate.id) AS link_delete,
+    CONCAT('/v1/representees/', mandate.representee_id, '/delegates/', mandate.delegate_id, '/mandates/', mandate.id) AS link_delete,
     CASE
-        WHEN mandate.can_sub_delegate IS TRUE THEN CONCAT('/', 'v1/nss/', LEFT(mandate.role, POSITION(':' IN mandate.role) - 1), '/representees/', mandate.representee_id, '/delegates/', mandate.delegate_id, '/mandates/', mandate.id, '/subdelegates')
+        WHEN mandate.can_sub_delegate IS TRUE THEN CONCAT('/v1/representees/', mandate.representee_id, '/delegates/', mandate.delegate_id, '/mandates/', mandate.id, '/subdelegates')
         ELSE mandate.link_add_sub_delegate
     END AS link_add_sub_delegate
 FROM mandate

tests/pg_data/03_init_functions.sql

@@ -61,7 +61,6 @@ END;
 $$ LANGUAGE PLPGSQL;
 
 CREATE OR REPLACE FUNCTION function_delete_mandate(
-    p_namespace TEXT,
     p_representee_identifier TEXT,
     p_delegate_id TEXT, -- change to text type
     p_mandate_id TEXT -- change to text type
@@ -86,8 +85,7 @@ BEGIN
     SET deleted = TRUE
     WHERE id = CAST(p_mandate_id as INTEGER)
         AND representee_id = v_representee_id
-        AND delegate_id = CAST(p_delegate_id AS INTEGER)
-        AND (mandate.role LIKE (p_namespace || ':%') OR mandate.role = p_namespace);
+        AND delegate_id = CAST(p_delegate_id AS INTEGER);
     IF FOUND THEN
           RETURN TRUE;
       ELSE