diff --git a/search-service/src/test/kotlin/com/egm/stellio/search/temporal/service/AttributeInstanceServiceTests.kt b/search-service/src/test/kotlin/com/egm/stellio/search/temporal/service/AttributeInstanceServiceTests.kt index 02083fb4b..e2277aafb 100644 --- a/search-service/src/test/kotlin/com/egm/stellio/search/temporal/service/AttributeInstanceServiceTests.kt +++ b/search-service/src/test/kotlin/com/egm/stellio/search/temporal/service/AttributeInstanceServiceTests.kt @@ -200,8 +200,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -226,8 +225,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timerel = Timerel.AFTER, timeAt = now.minusHours(1), timeproperty = AttributeInstance.TemporalProperty.CREATED_AT - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -252,8 +250,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timerel = Timerel.AFTER, timeAt = now.minusHours(1), timeproperty = AttributeInstance.TemporalProperty.CREATED_AT - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -278,8 +275,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timerel = Timerel.AFTER, timeAt = now.minusHours(1), timeproperty = AttributeInstance.TemporalProperty.MODIFIED_AT - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -298,8 +294,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -315,7 +310,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer } attributeInstanceService.search( - gimmeTemporalEntitiesQuery(buildDefaultTestTemporalQuery(), TemporalRepresentation.NORMALIZED), + gimmeTemporalEntitiesQuery(buildDefaultTestTemporalQuery()), incomingAttribute ) .shouldSucceedWith { @@ -415,8 +410,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timerel = Timerel.AFTER, timeAt = ZonedDateTime.parse("2022-07-01T00:00:00Z"), instanceLimit = 5 - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) @@ -442,8 +436,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timeAt = ZonedDateTime.parse("2022-07-01T00:00:00Z"), endTimeAt = ZonedDateTime.parse("2022-07-05T00:00:00Z"), instanceLimit = 5 - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) @@ -470,8 +463,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timeAt = now.minusHours(1), instanceLimit = 5, lastN = 5 - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -533,8 +525,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { results -> @@ -556,8 +547,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search( temporalEntitiesQuery, @@ -578,8 +568,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.plusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { @@ -820,8 +809,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = ZonedDateTime.parse("1970-01-01T00:00:00Z") - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.modifyAttributeInstance( @@ -859,8 +847,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = ZonedDateTime.parse("1970-01-01T00:00:00Z") - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.modifyAttributeInstance( @@ -899,8 +886,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = ZonedDateTime.parse("1970-01-01T00:00:00Z") - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.modifyAttributeInstance( @@ -944,8 +930,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = ZonedDateTime.parse("1970-01-01T00:00:00Z") - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.modifyAttributeInstance( @@ -984,7 +969,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer ).shouldSucceed() attributeInstanceService.search( - gimmeTemporalEntitiesQuery(buildDefaultTestTemporalQuery(), TemporalRepresentation.NORMALIZED), + gimmeTemporalEntitiesQuery(buildDefaultTestTemporalQuery()), incomingAttribute ) .shouldSucceedWith { @@ -1058,8 +1043,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, incomingAttribute) .shouldSucceedWith { assertThat(it).isEmpty() } @@ -1069,8 +1053,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer timerel = Timerel.AFTER, timeAt = now.minusHours(1), timeproperty = AttributeInstance.TemporalProperty.CREATED_AT - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesAuditQuery, incomingAttribute) @@ -1096,8 +1079,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, outgoingAttribute) .shouldSucceedWith { assertThat(it).hasSize(5) } @@ -1124,8 +1106,7 @@ class AttributeInstanceServiceTests : WithTimescaleContainer, WithKafkaContainer buildDefaultTestTemporalQuery( timerel = Timerel.AFTER, timeAt = now.minusHours(1) - ), - TemporalRepresentation.NORMALIZED + ) ) attributeInstanceService.search(temporalEntitiesQuery, outgoingAttribute) .shouldSucceedWith { assertThat(it).hasSize(5) }