Commit 7d580f0f authored by Mike Hoang's avatar Mike Hoang
Browse files

Merge branch 'mike/minor_refactoring' into 'master'

fixtures/schemas refactoring

See merge request !1998
parents 1514bbe8 89ef3819
......@@ -39,9 +39,7 @@ out/
.env
helm/*/charts/*
*.shlv
fixtures/cache/classifiers
fixtures/cache/dictionaries
fixtures/cache/mappings
test/fixtures/cache
docs/_build
docs/rst/api/*
docs/rst/todo/*
\ No newline at end of file
......@@ -25,9 +25,6 @@ RUN echo $version && sed -i "s/##VERSION##/$version/g" prozorro_sale/__init__.py
FROM test_base as test
COPY test ./test
COPY fixtures /fixtures
COPY fixtures/classifiers /classifiers
COPY fixtures/dictionaries /dictionaries
COPY swagger /swagger
COPY command_ops/ ./command_ops
COPY src/ .
......
......@@ -37,10 +37,10 @@ services:
SWAGGER_DOC: 0
LOGGING_LEVEL: DEBUG
volumes:
- ./fixtures/classifiers:/classifiers
- ./fixtures/dictionaries:/dictionaries
- ./fixtures/mappings:/mappings
- ./fixtures/cache:/cache
- ./test/fixtures/classifiers:/classifiers
- ./test/fixtures/dictionaries:/dictionaries
- ./test/fixtures/mappings:/mappings
- ./test/fixtures/cache:/cache
# local compose
base-local-app:
......@@ -99,7 +99,7 @@ services:
- *base_local_app_environment
SWAGGER_DOC: 0
MONGO_DATABASE: 'procedure-test'
AUTH_PATH: '/fixtures/secrets/auth.yml'
AUTH_PATH: '/secrets/auth.yml'
# unit tests compose
procedure-test-unit:
......@@ -109,7 +109,7 @@ services:
- *base_app_environment
- *base_local_app_environment
SWAGGER_DOC: 0
AUTH_PATH: '/fixtures/secrets/auth.yml'
AUTH_PATH: '/secrets/auth.yml'
# build swagger compose
procedure-swagger:
......
'04': RealEstateProps
'05': JointPropertyComplexProps
'06': LandProps
'34': VehicleProps
'07121000-3': RealEstateProps
'07122000-0': JointPropertyComplexProps
'07123000-7': LandProps
'07126000-8': VahicleProps
'07221000-4': RealEstateProps
'07222000-1': JointPropertyComplexProps
'07223000-8': LandProps
'07226000-9': VehicleProps
auction:
auction:
token: d968fff1fa406e91912814cde923717ab80bf3123c8854879e4d03106d1bac3f
broker_info:
legal_name:
uk_UA: auction
en_US: auction
procedures:
renewables:
- procedure
- bids
timber:
- procedure
- bids
subsoil:
- procedure
- bids
railwayCargo:
- procedure
- bids
dgf:
- procedure
- bids
basicSell:
- procedure
- bids
legitimatePropertyLease:
- procedure
- bids
landRental:
- procedure
- bids
landSell:
- procedure
- bids
arrestedAssets:
- procedure
- bids
alienation:
- procedure
- bids
commercialSell:
- procedure
- bids
bankRuptcy:
- procedure
- bids
regulationsPropertyLease:
- procedure
- bids
commercialPropertyLease:
- procedure
- bids
brokers:
auto_tests:
token: bc8025adfec6bbeec7c6a97ba8d0bcab2e388c5ee2e67e910977b9d35739e6db
broker_info:
legal_name:
uk_UA: auto_tests
en_US: auto_tests
procedures:
renewables:
- procedure
- bids
timber:
- procedure
- bids
railwayCargo:
- procedure
- bids
dgf:
- procedure
- bids
basicSell:
- procedure
- bids
legitimatePropertyLease:
- procedure
- bids
landRental:
- procedure
- bids
landSell:
- procedure
- bids
arrestedAssets:
- procedure
- bids
alienation:
- procedure
- bids
commercialSell:
- procedure
- bids
bankRuptcy:
- procedure
- bids
regulationsPropertyLease:
- procedure
- bids
commercialPropertyLease:
- procedure
- bids
test_broker_1:
token: 6bd950b3b3cff1ea0b844014404ca161b147128b8530a99996538d4af18db66f
broker_info:
legal_name:
uk_UA: test_broker_1
en_US: test_broker_1
procedures:
renewables:
- procedure
- bids
timber:
- procedure
- bids
subsoil:
- procedure
- bids
railwayCargo:
- procedure
- bids
dgf:
- procedure
- bids
basicSell:
- procedure
- bids
legitimatePropertyLease:
- procedure
- bids
landRental:
- procedure
- bids
landSell:
- procedure
- bids
arrestedAssets:
- procedure
- bids
alienation:
- procedure
- bids
commercialSell:
- procedure
- bids
bankRuptcy:
- procedure
- bids
regulationsPropertyLease:
- procedure
- bids
commercialPropertyLease:
- procedure
- bids
test_broker_2:
token: d10960aeae339ff40c8df3370b426b78b29138f74f2eef3fe229de39c68d76a0
broker_info:
legal_name:
uk_UA: test_broker_2
en_US: test_broker_2
procedures:
renewables:
- procedure
- bids
timber:
- procedure
- bids
subsoil:
- procedure
- bids
railwayCargo:
- procedure
- bids
dgf:
- procedure
- bids
basicSell:
- procedure
- bids
legitimatePropertyLease:
- procedure
- bids
landRental:
- procedure
- bids
landSell:
- procedure
- bids
arrestedAssets:
- procedure
- bids
alienation:
- procedure
- bids
commercialSell:
- procedure
- bids
bankRuptcy:
- procedure
- bids
regulationsPropertyLease:
- procedure
- bids
commercialPropertyLease:
- procedure
- bids
......@@ -7,9 +7,7 @@ load_dotenv(override=False)
WORKING_DIR = os.getenv("WORKING_DIR", "/")
FIXTURES_PATH = f"{WORKING_DIR}/fixtures"
CONFIG_PATH = f"{WORKING_DIR}/config"
SPECS_PATH = f"{WORKING_DIR}/specs"
AUTH_FILE_PATH = f"{WORKING_DIR}/secrets/auth.yml"
API_ENV_VARS = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment