Skip to content

Commit 7fd6c7c

Browse files
committed
Fix everything for working version 1.1.1
1 parent c3847e1 commit 7fd6c7c

5 files changed

Lines changed: 26 additions & 17 deletions

File tree

docker/examples.dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM postgres:18-bookworm
22
MAINTAINER Claus Prüfer
33

44
ADD ./example /
5-
COPY ./dist/microesb-1.1.tar.gz /
5+
COPY ./dist/microesb-1.1.1.tar.gz /
66

77
COPY ./example/01-hosting-use-case/01-create-schema-sequence.sql /docker-entrypoint-initdb.d/
88
COPY ./example/01-hosting-use-case/02-create-table.sql /docker-entrypoint-initdb.d/
@@ -11,8 +11,7 @@ COPY ./example/01-hosting-use-case/04-insert-user-data.sql /docker-entrypoint-in
1111

1212
RUN apt-get -qq update -y
1313

14-
RUN apt-get -qq install python3-pip python3-sphinx python3-sphinx-rtd-theme -y
15-
RUN apt-get -qq install python3-pytest python3-pytest-pep8 -y
14+
RUN apt-get -qq install python3-pip -y
1615
RUN apt-get -qq install python3-psycopg2 python3-pymongo -y
1716
RUN apt-get -qq install curl -y
1817

@@ -25,7 +24,7 @@ RUN apt-get -qq install mongodb-org -y
2524

2625
RUN mkdir -p /data/db
2726

28-
RUN pip3 install /microesb-1.1.tar.gz --break-system-packages
27+
RUN pip3 install /microesb-1.1.1.tar.gz --break-system-packages
2928

3029
ENV POSTGRES_USER postgres
3130
ENV POSTGRES_PASSWORD password

example/01-hosting-use-case/main.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import sys
2+
import logging
13
import psycopg2
24

35
from microesb import microesb
@@ -8,6 +10,14 @@
810
from service_call_metadata import service_metadata
911

1012

13+
logging.getLogger().addHandler(
14+
logging.StreamHandler(sys.stdout)
15+
)
16+
17+
logging.getLogger().setLevel(
18+
logging.INFO
19+
)
20+
1121
class_mapper = microesb.ClassMapper(
1222
class_references=class_reference,
1323
class_mappings=class_mapping,
@@ -23,13 +33,13 @@
2333

2434
service_metadata['data'][0]['User']['dbcon'] = dbcon
2535

26-
try:
27-
microesb.ServiceExecuter().execute(
28-
class_mapper=class_mapper,
29-
service_data=service_metadata
30-
)
31-
except Exception as e:
32-
print('Service execution error: {}'.format(e))
36+
#try:
37+
microesb.ServiceExecuter().execute(
38+
class_mapper=class_mapper,
39+
service_data=service_metadata
40+
)
41+
#except Exception as e:
42+
# print('Service execution error: {}'.format(e))
3343

3444
try:
3545
dbcon.commit()

example/02-pki-management/00-main-ca.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
from pymongo import MongoClient
1212

13+
1314
client = MongoClient('mongodb://127.0.0.1/')
1415
mongodb = client.get_database('microesb')
1516

16-
1717
logging.getLogger().addHandler(
1818
logging.StreamHandler(sys.stdout)
1919
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "microesb"
7-
version = "1.1"
7+
version = "1.1.1"
88

99
authors = [
1010
{ name="Claus Prüfer", email="pruefer@webcodex.de" },

src/microesb.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@ def __init__(self, *, class_mapper, service_call_data):
560560

561561
self._class_mapper = class_mapper
562562

563-
sc_data_orig = copy.deepcopy(service_call_data)
564563
class_references = self._class_mapper.get_references()
565564

566565
root_class = next(iter(class_references))
@@ -577,11 +576,12 @@ def __init__(self, *, class_mapper, service_call_data):
577576

578577
class_properties = self._class_mapper.get_class_properties()
579578

580-
if 'SYSBackendMethod' in sc_data_orig:
579+
if 'SYSBackendMethod' in service_call_data:
581580

582-
bm_root = sc_data_orig['SYSBackendMethod']
581+
bm_root = service_call_data['SYSBackendMethod']
583582
self.logger.debug('SYSBackendMethod:{}'.format(bm_root))
584583
bm_class_id, bm_method = next(iter(bm_root.items()))
584+
bm_class_call_id = copy.deepcopy(bm_class_id)
585585

586586
try:
587587
bm_class_id = class_references[bm_class_id]['property_ref']
@@ -591,7 +591,7 @@ def __init__(self, *, class_mapper, service_call_data):
591591
)
592592

593593
if bm_method in class_properties[bm_class_id]['methods']:
594-
getattr(getattr(self._class_mapper, bm_class_id), bm_method)()
594+
getattr(getattr(self._class_mapper, bm_class_call_id), bm_method)()
595595

596596
def _map(
597597
self,

0 commit comments

Comments
 (0)