Merge remote-tracking branch 'origin/a258001251842882_refactoring_san…

…dbox_23'

src/openprocurement/api/app.py

@@ -12,8 +12,7 @@
 from logging import getLogger
 from openprocurement.api.auth import AuthenticationPolicy, authenticated_role, check_accreditation
 from openprocurement.api.database import set_api_security
-from openprocurement.api.utils import forbidden, request_params
-from openprocurement.api.constants import ROUTE_PREFIX
+from openprocurement.api.utils import forbidden, request_params, route_prefix
 from pkg_resources import iter_entry_points
 from pyramid.authorization import ACLAuthorizationPolicy as AuthorizationPolicy
 from pyramid.config import Configurator
@@ -30,7 +29,7 @@ def main(global_config, **settings):
         settings=settings,
         authentication_policy=AuthenticationPolicy(settings['auth.file'], __name__),
         authorization_policy=AuthorizationPolicy(),
-        route_prefix=ROUTE_PREFIX,
+        route_prefix=route_prefix(settings),
     )
     config.include('pyramid_exclog')
     config.include("cornice")

src/openprocurement/api/subscribers.py

@@ -9,7 +9,7 @@
 def add_logging_context(event):
     request = event.request
     params = {
-        'API_VERSION': VERSION,
+        'API_VERSION': request.registry.settings.get('api_version', VERSION),
         'TAGS': 'python,api',
         'USER': str(request.authenticated_userid or ''),
         'CURRENT_URL': request.url,
@@ -63,4 +63,4 @@ def set_renderer(event):
 @subscriber(BeforeRender)
 def beforerender(event):
     if event.rendering_val and isinstance(event.rendering_val, dict) and 'data' in event.rendering_val:
-        fix_url(event.rendering_val['data'], event['request'].application_url)
+        fix_url(event.rendering_val['data'], event['request'].application_url, event['request'].registry.settings)

src/openprocurement/api/utils.py

@@ -25,7 +25,7 @@
 from openprocurement.api.constants import LOGGER
 from openprocurement.api.constants import (
     ADDITIONAL_CLASSIFICATIONS_SCHEMES, DOCUMENT_BLACKLISTED_FIELDS,
-    DOCUMENT_WHITELISTED_FIELDS, ROUTE_PREFIX, TZ, SESSION
+    DOCUMENT_WHITELISTED_FIELDS, ROUTE_PREFIX, TZ, SESSION, VERSION
 )
 from openprocurement.api.interfaces import IOPContent
 from openprocurement.api.interfaces import IContentConfigurator
@@ -38,6 +38,10 @@ def validate_dkpp(items, *args):
         raise ValidationError(u"One of additional classifications should be one of [{0}].".format(', '.join(ADDITIONAL_CLASSIFICATIONS_SCHEMES)))
 
 
+def route_prefix(settings={}):
+    return '/api/{}'.format(settings.get('api_version', VERSION))
+
+
 def get_now():
     return datetime.now(TZ)
 

src/openprocurement/api/views/spore.py

@@ -10,4 +10,5 @@
 @spore.get()
 def get_spore(request):
     services = get_services()
-    return generate_spore_description(services, 'Service name', request.application_url, request.registry.settings.get('api_version', VERSION))
+    return generate_spore_description(services, 'Service name', request.application_url,
+                                      request.registry.settings.get('api_version', VERSION))