fix: Fix bug related to serialization of preconditions (#25)

Author: dotKuro

.github/workflows/release.yml

@@ -43,7 +43,7 @@ jobs:
     - name: Create new version
       if: ${{ steps.get_next_version.outputs.hasNextVersion == 'true' }}
       run: |
-        sed -i -r "s/(version = \")([0-9]+\.[0-9]+\.[0-9]+)(\")/\1{{ steps.get_next_version.outputs.version }}\3/" pyproject.toml
+        sed -i -r "s/(version = \")([0-9]+\.[0-9]+\.[0-9]+)(\")/\1${{ steps.get_next_version.outputs.version }}\3/" pyproject.toml
         git config --global user.email "[email protected]"
         git config --global user.name "${{ github.actor }}"
         git add .

eventsourcingdb_client_python/client.py

@@ -10,7 +10,7 @@
 from .http_client import HttpClient
 from .handlers.ping import ping
 from .handlers.read_events import read_events, ReadEventsOptions
-from .handlers.read_subjects import read_subjects, ReadSubjectsOptions
+from .handlers.read_subjects import read_subjects
 from .handlers.store_item import StoreItem
 from .handlers.write_events import Precondition, write_events
 
@@ -40,9 +40,9 @@ def ping(self) -> None:
 
     def read_subjects(
         self,
-        options: ReadSubjectsOptions = ReadSubjectsOptions()
+        base_subject: str
     ) -> Generator[str, None, None]:
-        return read_subjects(self, options)
+        return read_subjects(self, base_subject)
 
     def read_events(
         self,

eventsourcingdb_client_python/handlers/read_subjects/__init__.py

@@ -1,2 +1 @@
 from .read_subjects import read_subjects
-from .read_subjects_options import ReadSubjectsOptions

eventsourcingdb_client_python/handlers/read_subjects/read_subjects.py

@@ -13,21 +13,23 @@
 from ..is_stream_error import is_stream_error
 from ..parse_raw_message import parse_raw_message
 from .is_subject import is_subject
-from .read_subjects_options import ReadSubjectsOptions
+from ...event.validate_subject import validate_subject
 
 
 def read_subjects(
     client: AbstractBaseClient,
-    options: ReadSubjectsOptions
+    base_subject: str
 ) -> Generator[str, None, None]:
     try:
-        options.validate()
+        validate_subject(base_subject)
     except ValidationError as validation_error:
-        raise InvalidParameterError('options', str(validation_error)) from validation_error
+        raise InvalidParameterError('base_subject', str(validation_error)) from validation_error
     except Exception as other_error:
         raise InternalError(str(other_error)) from other_error
 
-    request_body = json.dumps(options.to_json())
+    request_body = json.dumps({
+        'baseSubject': base_subject
+    })
 
     response: requests.Response
     try:

eventsourcingdb_client_python/handlers/read_subjects/read_subjects_options.py

@@ -1,2 +1,4 @@
-from .preconditions import Precondition
+from .preconditions import Precondition, \
+    IsSubjectPristinePrecondition, \
+    IsSubjectOnEventIdPrecondition
 from .write_events import write_events

eventsourcingdb_client_python/handlers/write_events/__init__.py

@@ -14,7 +14,10 @@ class IsSubjectPristinePrecondition(Precondition):
 
     def to_json(self):
         return {
-            'subject': self.subject
+            'type': 'isSubjectPristine',
+            'payload': {
+                'subject': self.subject
+            }
         }
 
 
@@ -25,6 +28,9 @@ class IsSubjectOnEventIdPrecondition(Precondition):
 
     def to_json(self):
         return {
-            'subject': self.subject,
-            'eventId': self.event_id
+            'type': 'isSubjectOnEventId',
+            'payload': {
+                'subject': self.subject,
+                'eventId': self.event_id
+            }
         }

eventsourcingdb_client_python/handlers/write_events/preconditions.py

@@ -1,14 +1,14 @@
 [tool.poetry]
 name = "eventsourcingdb-client-python"
-version = "{{ steps.get_next_version.outputs.version }}"
+version = "0.1.0"
 description = "The Python client for the EventSourcingDB."
 authors = [ "Alexander Kampf", "Golo Roden", "Noah Hummel" ]
 readme = "README.md"
 packages = [{include = "eventsourcingdb_client_python"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-requests = "2.28.2"
+requests = "2.31.0"
 
 
 [tool.poetry.group.dev.dependencies]

poetry.lock

@@ -15,21 +15,14 @@ def __init__(self):
         access_token = str(uuid.uuid4())
         with_authorization = ContainerizedTestingDatabase(
             image,
-            ['run', '--dev', '--ui', '--access-token', f'{access_token}'],
+            ['run', '--access-token', f'{access_token}', '--store-temporary'],
             ClientOptions(access_token=access_token)
         )
 
-        without_authorization = ContainerizedTestingDatabase(
-            image,
-            ['run', '--dev', '--ui']
-        )
-
         with_invalid_url = TestingDatabase(Client('http://localhost.invalid'))
 
         self.with_authorization: ContainerizedTestingDatabase = with_authorization
-        self.without_authorization: ContainerizedTestingDatabase = without_authorization
         self.with_invalid_url: TestingDatabase = with_invalid_url
 
     def stop(self):
         self.with_authorization.stop()
-        self.without_authorization.stop()