Add support for the timestamp_range property after spec change

Signed-off-by: sdimitrov9 <stoyan.dimitrov@limechain.tech>

Author: sdimitrov9

rest-java/src/main/java/org/hiero/mirror/restjava/mapper/CommonMapper.java

@@ -20,6 +20,7 @@
 import org.hiero.mirror.rest.model.Key;
 import org.hiero.mirror.rest.model.Key.TypeEnum;
 import org.hiero.mirror.rest.model.TimestampRange;
+import org.hiero.mirror.rest.model.TimestampRangeNullable;
 import org.hiero.mirror.restjava.exception.InvalidMappingException;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingInheritanceStrategy;
@@ -115,6 +116,18 @@ default TimestampRange mapRange(Range<Long> source) {
         return target;
     }
 
+    default TimestampRangeNullable mapTimestampRangeNullable(Range<Long> source) {
+        final var timestampRange = mapRange(source);
+        if (timestampRange == null) {
+            return null;
+        }
+
+        final var target = new TimestampRangeNullable();
+        target.setFrom(timestampRange.getFrom());
+        target.setTo(timestampRange.getTo());
+        return target;
+    }
+
     @Named(QUALIFIER_TIMESTAMP)
     default String mapTimestamp(Long timestamp) {
         if (timestamp == null) {

rest-java/src/main/java/org/hiero/mirror/restjava/repository/HookRepositoryCustomImpl.java

@@ -32,7 +32,7 @@ public Collection<Hook> findAll(HooksRequest request, EntityId accountId) {
         final var orderBy = hookTable.HOOK_ID.sort(request.getOrder().isAscending() ? SortOrder.ASC : SortOrder.DESC);
 
         return dsl.selectFrom(hookTable)
-                .where(ownerIdCondition.and(hookIdCondition)) // Combine conditions
+                .where(ownerIdCondition.and(hookIdCondition))
                 .orderBy(orderBy)
                 .limit(request.getLimit())
                 .fetchInto(Hook.class);

rest-java/src/test/java/org/hiero/mirror/restjava/mapper/HookMapperTest.java

@@ -4,12 +4,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.common.collect.Range;
 import org.apache.commons.codec.DecoderException;
 import org.hiero.mirror.common.domain.entity.EntityId;
 import org.hiero.mirror.common.domain.hook.HookExtensionPoint;
 import org.hiero.mirror.common.domain.hook.HookType;
 import org.hiero.mirror.rest.model.Hook;
 import org.hiero.mirror.rest.model.Key;
+import org.hiero.mirror.rest.model.TimestampRangeNullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -33,6 +35,7 @@ void map() throws DecoderException {
         source.setHookId(10L);
         source.setOwnerId(200L);
         source.setExtensionPoint(HookExtensionPoint.ACCOUNT_ALLOWANCE_HOOK);
+        source.setTimestampRange(Range.closed(1L, 100000L));
         source.setType(HookType.LAMBDA);
         source.setDeleted(false);
 
@@ -50,6 +53,8 @@ void map() throws DecoderException {
         assertThat(result.getHookId()).isEqualTo(10L);
         assertThat(result.getDeleted()).isFalse();
         assertThat(result.getExtensionPoint()).isEqualTo(Hook.ExtensionPointEnum.ACCOUNT_ALLOWANCE_HOOK);
+        assertThat(result.getTimestampRange())
+                .isEqualTo(new TimestampRangeNullable().from("0.000000001").to("0.000100000"));
         assertThat(result.getType()).isEqualTo(Hook.TypeEnum.LAMBDA);
         assertThat(result.getAdminKey().getType()).isEqualTo(Key.TypeEnum.ED25519);
         assertThat(result.getAdminKey().getKey()).hasSize(64);
@@ -77,6 +82,9 @@ void mapNulls() {
                 .isNull();
         assertThat(result.getHookId()).as("hookId default for primitive long").isEqualTo(0L);
         assertThat(result.getOwnerId()).as("ownerId should be null").isNull();
+        assertThat(result.getTimestampRange())
+                .as("timestampRange should be null")
+                .isNull();
         assertThat(result.getType()).as("type should be null").isNull();
     }
 }

rest/api/v1/openapi.yml

@@ -1595,6 +1595,7 @@ components:
         - extension_point
         - hook_id
         - owner_id
+        - timestamp_range
         - type
       properties:
         admin_key:
@@ -1625,6 +1626,8 @@ components:
           allOf:
             - $ref: "#/components/schemas/EntityId"
           description: The entity that owns the hook
+        timestamp_range:
+          $ref: "#/components/schemas/TimestampRangeNullable"
         type:
           description: The type of the hook implementation
           enum: [LAMBDA]