feat: change lower_bound_id and upper_bound_id to lower_bound and upper_bound

Author: atstaeff

eventsourcingdb_client_python/handlers/observe_events/observe_events_options.py

@@ -10,17 +10,17 @@
 @dataclass
 class ObserveEventsOptions:
     recursive: bool
-    lower_bound_id: str | None = None
+    lower_bound: str | None = None
     from_latest_event: ObserveFromLatestEvent | None = None
 
     def validate(self) -> None:
-        if self.lower_bound_id is not None and not is_non_negative_integer(self.lower_bound_id):
+        if self.lower_bound is not None and not is_non_negative_integer(self.lower_bound):
             raise ValidationError(
-                'ReadEventOptions are invalid: lower_bound_id must be 0 or greater.'
+                'ReadEventOptions are invalid: lower_bound must be 0 or greater.'
             )
 
         if self.from_latest_event is not None:
-            if self.lower_bound_id is not None:
+            if self.lower_bound is not None:
                 raise ValidationError(
                     'ReadEventsOptions are invalid: '
                     'lowerBoundId and fromLatestEvent are mutually exclusive'
@@ -47,8 +47,8 @@ def to_json(self):
             'recursive': self.recursive
         }
 
-        if self.lower_bound_id is not None:
-            json['lowerBoundId'] = self.lower_bound_id
+        if self.lower_bound is not None:
+            json['lowerBoundId'] = self.lower_bound
         if self.from_latest_event is not None:
             json['fromLatestEvent'] = self.from_latest_event.to_json()
 

eventsourcingdb_client_python/handlers/read_events/read_events.py

@@ -70,7 +70,7 @@ async def read_events(
                 raise ServerError(f'{message["payload"]["error"]}.')
 
             if is_event(message):
-                event = Event.parse(message['payload']['event'])
+                event = Event.parse(message['payload'])
 
                 yield StoreItem(event, message['payload']['hash']) # type: ignore
                 continue

eventsourcingdb_client_python/handlers/read_events/read_events_options.py

@@ -12,22 +12,22 @@
 class ReadEventsOptions:
     recursive: bool
     order: Order | None = None
-    lower_bound_id: str | None = None
-    upper_bound_id: str | None = None
+    lower_bound: str | None = None
+    upper_bound: str | None = None
     from_latest_event: ReadFromLatestEvent | None = None
 
     def validate(self) -> None:
-        if self.lower_bound_id is not None and not is_non_negative_integer(self.lower_bound_id):
+        if self.lower_bound is not None and not is_non_negative_integer(self.lower_bound):
             raise ValidationError(
-                'ReadEventOptions are invalid: lower_bound_id must be 0 or greater.'
+                'ReadEventOptions are invalid: lower_bound must be 0 or greater.'
             )
-        if self.upper_bound_id is not None and not is_non_negative_integer(self.upper_bound_id):
+        if self.upper_bound is not None and not is_non_negative_integer(self.upper_bound):
             raise ValidationError(
-                'ReadEventOptions are invalid: upper_bound_id must be 0 or greater.'
+                'ReadEventOptions are invalid: upper_bound must be 0 or greater.'
             )
 
         if self.from_latest_event is not None:
-            if self.lower_bound_id is not None:
+            if self.lower_bound is not None:
                 raise ValidationError(
                     'ReadEventsOptions are invalid: '
                     'lowerBoundId and fromLatestEvent are mutually exclusive'
@@ -56,10 +56,10 @@ def to_json(self):
 
         if self.order is not None:
             json['order'] = self.order.value
-        if self.lower_bound_id is not None:
-            json['lowerBoundId'] = self.lower_bound_id
-        if self.upper_bound_id is not None:
-            json['upperBoundId'] = self.upper_bound_id
+        if self.lower_bound is not None:
+            json['lowerBound'] = self.lower_bound
+        if self.upper_bound is not None:
+            json['upperBound'] = self.upper_bound
         if self.from_latest_event is not None:
             json['fromLatestEvent'] = self.from_latest_event.to_json()
 

tests/test_observe_events.py

@@ -251,7 +251,7 @@ async def test_observes_event_starting_from_given_event_name(
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_observes_event_starting_from_given_lower_bound_id(
+    async def test_observes_event_starting_from_given_lower_bound(
         prepared_database: Database,
         test_data: TestData
     ):
@@ -263,7 +263,7 @@ async def test_observes_event_starting_from_given_lower_bound_id(
             '/users',
             ObserveEventsOptions(
                 recursive=True,
-                lower_bound_id='2'
+                lower_bound='2'
             )
         ):
             observed_items.append(event)
@@ -322,7 +322,7 @@ async def test_throws_error_for_mutually_exclusive_options(
                 '/users',
                 ObserveEventsOptions(
                     recursive=True,
-                    lower_bound_id='3',
+                    lower_bound='3',
                     from_latest_event=ObserveFromLatestEvent(
                         subject='/',
                         type='com.foo.bar',
@@ -344,7 +344,7 @@ async def test_throws_error_for_non_integer_lower_bound(
                 '/users',
                 ObserveEventsOptions(
                     recursive=True,
-                    lower_bound_id='hello',
+                    lower_bound='hello',
                 )
             ):
                 pass
@@ -361,7 +361,7 @@ async def test_throws_error_for_negative_lower_bound(
                 '/users',
                 ObserveEventsOptions(
                     recursive=True,
-                    lower_bound_id='-1',
+                    lower_bound='-1',
                 )
             ):
                 pass

tests/test_read_events.py

@@ -216,7 +216,7 @@ async def test_read_events_recursive_from_latest_event_in_child_subject(
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_read_events_starting_from_lower_bound_id(
+    async def test_read_events_starting_from_lower_bound(
         prepared_database: Database,
         test_data: TestData
     ):
@@ -227,7 +227,7 @@ async def test_read_events_starting_from_lower_bound_id(
             '/users',
             ReadEventsOptions(
                 recursive=True,
-                lower_bound_id='2'
+                lower_bound='2'
             )
         ):
             result.append(event)
@@ -255,7 +255,7 @@ async def test_read_events_starting_from_lower_bound_id(
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_read_events_up_to_the_upper_bound_id(
+    async def test_read_events_up_to_the_upper_bound(
         prepared_database: Database,
         test_data: TestData
     ):
@@ -266,7 +266,7 @@ async def test_read_events_up_to_the_upper_bound_id(
             '/users',
             ReadEventsOptions(
                 recursive=True,
-                upper_bound_id='1'
+                upper_bound='1'
             )
         ):
             result.append(event)
@@ -309,7 +309,7 @@ async def test_throws_error_for_exclusive_options(
                         type='com.foo.bar',
                         if_event_is_missing=IfEventIsMissingDuringRead.READ_EVERYTHING
                     ),
-                    lower_bound_id='0'
+                    lower_bound='0'
                 )
             ):
                 pass
@@ -332,7 +332,7 @@ async def test_throws_error_for_invalid_subject(
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_throws_error_for_invalid_lower_bound_id(
+    async def test_throws_error_for_invalid_lower_bound(
         prepared_database: Database
     ):
         client = prepared_database.with_authorization.client
@@ -342,14 +342,14 @@ async def test_throws_error_for_invalid_lower_bound_id(
                 '/',
                 ReadEventsOptions(
                     recursive=True,
-                    lower_bound_id='hello'
+                    lower_bound='hello'
                 )
             ):
                 pass
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_throws_error_for_negative_lower_bound_id(
+    async def test_throws_error_for_negative_lower_bound(
         prepared_database: Database
     ):
         client = prepared_database.with_authorization.client
@@ -359,14 +359,14 @@ async def test_throws_error_for_negative_lower_bound_id(
                 '/',
                 ReadEventsOptions(
                     recursive=True,
-                    lower_bound_id='-1'
+                    lower_bound='-1'
                 )
             ):
                 pass
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_throws_error_for_invalid_upper_bound_id(
+    async def test_throws_error_for_invalid_upper_bound(
         prepared_database: Database
     ):
         client = prepared_database.with_authorization.client
@@ -376,14 +376,14 @@ async def test_throws_error_for_invalid_upper_bound_id(
                 '/',
                 ReadEventsOptions(
                     recursive=True,
-                    upper_bound_id='hello'
+                    upper_bound='hello'
                 )
             ):
                 pass
 
     @staticmethod
     @pytest.mark.asyncio
-    async def test_throws_error_for_negative_upper_bound_id(
+    async def test_throws_error_for_negative_upper_bound(
         prepared_database: Database
     ):
         client = prepared_database.with_authorization.client
@@ -393,7 +393,7 @@ async def test_throws_error_for_negative_upper_bound_id(
                 '/',
                 ReadEventsOptions(
                     recursive=True,
-                    upper_bound_id='-1'
+                    upper_bound='-1'
                 )
             ):
                 pass