lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[#1509] Sync Target type with SW and DS types (targettype.key search) (#1515)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2023-12-13 16:29:56 +02:00
committed by GitHub
parent 767a7e6b11
commit 4ac42c80d7
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
View File

@@ -91,7 +91,7 @@ public enum TargetFields implements FieldNameProvider {
/** /**
* The target type. * The target type.
*/ */
TARGETTYPE("targetType", TargetTypeFields.NAME.getFieldName()); TARGETTYPE("targetType", TargetTypeFields.KEY.getFieldName(), TargetTypeFields.NAME.getFieldName());
private final String fieldName; private final String fieldName;
private List<String> subEntityAttribues; private List<String> subEntityAttribues;

4
hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTypeFields.java
View File

@@ -14,6 +14,10 @@ package org.eclipse.hawkbit.repository;
* the REST API * the REST API
*/ */
public enum TargetTypeFields implements FieldNameProvider { public enum TargetTypeFields implements FieldNameProvider {
/**
* The name field.
*/
KEY("key"),
/** /**
* The name field. * The name field.
*/ */

25
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java
View File

@@ -90,9 +90,13 @@ class RSQLTargetFieldTest extends AbstractJpaIntegrationTest {
assignDistributionSet(ds.getId(), target.getControllerId()); assignDistributionSet(ds.getId(), target.getControllerId());
targetType1 = targetTypeManagement targetType1 = targetTypeManagement
.create(entityFactory.targetType().create().name("Type1").description("Desc. Type1")); .create(entityFactory.targetType().create()
.name("Type1").description("Desc. Type1")
.key("Type1.key"));
targetType2 = targetTypeManagement targetType2 = targetTypeManagement
.create(entityFactory.targetType().create().name("Type2").description("Desc. Type2")); .create(entityFactory.targetType().create()
.name("Type2").description("Desc. Type2")
.key("Type2.key"));
targetManagement.assignType(target.getControllerId(), targetType1.getId()); targetManagement.assignType(target.getControllerId(), targetType1.getId());
targetManagement.assignType(target2.getControllerId(), targetType2.getId()); targetManagement.assignType(target2.getControllerId(), targetType2.getId());
@@ -306,13 +310,26 @@ class RSQLTargetFieldTest extends AbstractJpaIntegrationTest {
} }
@Test @Test
@Description("Test filter by target type") @Description("Test filter by target type key")
void shouldFilterTargetsByTypeIdNameAndDescription() { void shouldFilterTargetsByTypeKey() {
assertRSQLQuery("targettype." + TargetTypeFields.KEY.name() + "==" + targetType1.getKey(), 1);
assertRSQLQuery("targettype." + TargetTypeFields.KEY.name() + "==*1.key", 1);
assertRSQLQuery("targettype." + TargetTypeFields.KEY.name() + "!=" + targetType2.getKey(), 4);
assertRSQLQuery("targettype." + TargetTypeFields.KEY.name() + "==noExist*", 0);
}
@Test
@Description("Test filter by target type name")
void shouldFilterTargetsByTypeName() {
assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==" + targetType1.getName(), 1); assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==" + targetType1.getName(), 1);
assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==*1", 1); assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==*1", 1);
assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "!=" + targetType2.getName(), 4); assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "!=" + targetType2.getName(), 4);
assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==noExist*", 0); assertRSQLQuery("targettype." + TargetTypeFields.NAME.name() + "==noExist*", 0);
}
@Test
@Description("Test filter by target type ID and description")
void shouldFilterTargetsByTypeIdAndDescription() {
assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class) assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class)
.isThrownBy(() -> assertRSQLQuery("targettype.ID==1", 0)); .isThrownBy(() -> assertRSQLQuery("targettype.ID==1", 0));
assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class) assertThatExceptionOfType(RSQLParameterUnsupportedFieldException.class)