Skip to content

Commit a17b4f9

Browse files
sjoubertsjoubert
committed
Remove unused fields 'isTable'/'parentId' in the parameter group object
1 parent d1647e6 commit a17b4f9

File tree

10 files changed

+2
-113
lines changed

10 files changed

+2
-113
lines changed

‎api/src/integrationTest/kotlin/com/cosmotech/api/home/solution/SolutionControllerTests.kt‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,13 @@ class SolutionControllerTests : ControllerTestBase() {
142142
parameterRegexValidation,
143143
additionalData))
144144
val parameterGroupId = "parameterGroup1"
145-
val parameterGroupParentId = "this_is_a_parent_id"
146145
val parameterGroups =
147146
mutableListOf(
148147
RunTemplateParameterGroupCreateRequest(
149148
parameterGroupId,
150149
parameterGroupDescription,
151150
parameterLabels,
152-
false,
153151
additionalData,
154-
parameterGroupParentId,
155152
mutableListOf(parameterId)))
156153
val runTemplateId = "runtemplate1"
157154
val runTemplateName = "this_is_a_name"
@@ -219,8 +216,6 @@ class SolutionControllerTests : ControllerTestBase() {
219216
.andExpect(jsonPath("$.parameters[0].regexValidation").value(parameterRegexValidation))
220217
.andExpect(jsonPath("$.parameterGroups[0].id").value(parameterGroupId))
221218
.andExpect(jsonPath("$.parameterGroups[0].labels").value(parameterLabels))
222-
.andExpect(jsonPath("$.parameterGroups[0].isTable").value(false))
223-
.andExpect(jsonPath("$.parameterGroups[0].parentId").value(parameterGroupParentId))
224219
.andExpect(jsonPath("$.parameterGroups[0].parameters").value(mutableListOf(parameterId)))
225220
.andExpect(jsonPath("$.runTemplates[0].id").value(runTemplateId))
226221
.andExpect(jsonPath("$.runTemplates[0].name").value(runTemplateName))
@@ -279,17 +274,14 @@ class SolutionControllerTests : ControllerTestBase() {
279274
parameterRegexValidation,
280275
additionalData))
281276
val parameterGroupId = "parameterGroup1"
282-
val parameterGroupParentId = "this_is_a_parent_id"
283277
val parameterGroupDescription = "this_is_a_description"
284278
val parameterGroups =
285279
mutableListOf(
286280
RunTemplateParameterGroupCreateRequest(
287281
parameterGroupId,
288282
parameterGroupDescription,
289283
parameterLabels,
290-
false,
291284
additionalData,
292-
parameterGroupParentId,
293285
mutableListOf(parameterId)))
294286
val runTemplateId = "runtemplate1"
295287
val runTemplateName = "this_is_a_name"
@@ -363,8 +355,6 @@ class SolutionControllerTests : ControllerTestBase() {
363355
jsonPath("$.parameters[0].additionalData[\"even\"][\"object\"]").value("if_you_want"))
364356
.andExpect(jsonPath("$.parameterGroups[0].id").value(parameterGroupId))
365357
.andExpect(jsonPath("$.parameterGroups[0].labels").value(parameterLabels))
366-
.andExpect(jsonPath("$.parameterGroups[0].isTable").value(false))
367-
.andExpect(jsonPath("$.parameterGroups[0].parentId").value(parameterGroupParentId))
368358
.andExpect(jsonPath("$.parameterGroups[0].parameters").value(mutableListOf(parameterId)))
369359
.andExpect(
370360
jsonPath("$.parameterGroups[0].additionalData[\"you_can_put\"]")
@@ -746,16 +736,13 @@ class SolutionControllerTests : ControllerTestBase() {
746736
"you_can_put" to "whatever_you_want_here",
747737
"even" to JSONObject(mapOf("object" to "if_you_want")))
748738
val parameterGroupId = "parameterGroup1"
749-
val parameterGroupParentId = "this_is_a_parent_id"
750739
val parameterGroupDescription = "this_is_a_description"
751740
val parameterGroup =
752741
RunTemplateParameterGroupCreateRequest(
753742
parameterGroupId,
754743
parameterGroupDescription,
755744
parameterLabels,
756-
false,
757745
additionalData,
758-
parameterGroupParentId,
759746
mutableListOf(parameterId))
760747

761748
mvc.perform(
@@ -767,8 +754,6 @@ class SolutionControllerTests : ControllerTestBase() {
767754
.andExpect(jsonPath("$.id").value(parameterGroupId))
768755
.andExpect(jsonPath("$.description").value(parameterGroupDescription))
769756
.andExpect(jsonPath("$.labels").value(parameterLabels))
770-
.andExpect(jsonPath("$.isTable").value(false))
771-
.andExpect(jsonPath("$.parentId").value(parameterGroupParentId))
772757
.andExpect(jsonPath("$.additionalData[\"you_can_put\"]").value("whatever_you_want_here"))
773758
.andExpect(jsonPath("$.additionalData[\"even\"][\"object\"]").value("if_you_want"))
774759
.andExpect(jsonPath("$.parameters").value(mutableListOf(parameterId)))
@@ -788,16 +773,13 @@ class SolutionControllerTests : ControllerTestBase() {
788773
"you_can_put" to "whatever_you_want_here",
789774
"even" to JSONObject(mapOf("object" to "if_you_want")))
790775
val parameterGroupId = "parameterGroup1"
791-
val parameterGroupParentId = "this_is_a_parent_id"
792776
val parameterGroupDescription = "this_is_a_description"
793777
val parameterGroup =
794778
RunTemplateParameterGroupCreateRequest(
795779
parameterGroupId,
796780
parameterGroupDescription,
797781
parameterLabels,
798-
false,
799782
additionalData,
800-
parameterGroupParentId,
801783
mutableListOf(parameterId))
802784

803785
val solutionId =
@@ -814,8 +796,6 @@ class SolutionControllerTests : ControllerTestBase() {
814796
.andExpect(jsonPath("$.id").value(parameterGroupId))
815797
.andExpect(jsonPath("$.description").value(parameterGroupDescription))
816798
.andExpect(jsonPath("$.labels").value(parameterLabels))
817-
.andExpect(jsonPath("$.isTable").value(false))
818-
.andExpect(jsonPath("$.parentId").value(parameterGroupParentId))
819799
.andExpect(jsonPath("$.additionalData[\"you_can_put\"]").value("whatever_you_want_here"))
820800
.andExpect(jsonPath("$.additionalData[\"even\"][\"object\"]").value("if_you_want"))
821801
.andExpect(jsonPath("$.parameters").value(mutableListOf(parameterId)))
@@ -835,16 +815,13 @@ class SolutionControllerTests : ControllerTestBase() {
835815
"you_can_put" to "whatever_you_want_here",
836816
"even" to JSONObject(mapOf("object" to "if_you_want")))
837817
val parameterGroupId = "parameterGroup1"
838-
val parameterGroupParentId = "this_is_a_parent_id"
839818
val parameterGroupDescription = "this_is_a_description"
840819
val parameterGroup =
841820
RunTemplateParameterGroupCreateRequest(
842821
parameterGroupId,
843822
parameterGroupDescription,
844823
parameterLabels,
845-
false,
846824
additionalData,
847-
parameterGroupParentId,
848825
mutableListOf(parameterId))
849826

850827
val solutionId =
@@ -858,16 +835,13 @@ class SolutionControllerTests : ControllerTestBase() {
858835
mutableMapOf(
859836
"you_can_put" to "whatever_you_want_new_here",
860837
"even" to JSONObject(mapOf("new_object" to "if_you_want")))
861-
val newParameterGroupParentId = "this_is_a_new_parent_id"
862838
val newParameterGroupDescription = "this_is_a_new_description"
863839
val newParameterId = "parameter2"
864840
val newParameterGroup =
865841
RunTemplateParameterGroupUpdateRequest(
866842
newParameterGroupDescription,
867843
newParameterLabels,
868-
true,
869844
newadditionalData,
870-
newParameterGroupParentId,
871845
mutableListOf(newParameterId))
872846

873847
mvc.perform(
@@ -880,8 +854,6 @@ class SolutionControllerTests : ControllerTestBase() {
880854
.andExpect(jsonPath("$.id").value(parameterGroupId))
881855
.andExpect(jsonPath("$.description").value(newParameterGroupDescription))
882856
.andExpect(jsonPath("$.labels").value(newParameterLabels))
883-
.andExpect(jsonPath("$.isTable").value(true))
884-
.andExpect(jsonPath("$.parentId").value(newParameterGroupParentId))
885857
.andExpect(
886858
jsonPath("$.additionalData[\"you_can_put\"]").value("whatever_you_want_new_here"))
887859
.andExpect(jsonPath("$.additionalData[\"even\"][\"new_object\"]").value("if_you_want"))
@@ -903,16 +875,13 @@ class SolutionControllerTests : ControllerTestBase() {
903875
"you_can_put" to "whatever_you_want_here",
904876
"even" to JSONObject(mapOf("object" to "if_you_want")))
905877
val parameterGroupId = "parameterGroup1"
906-
val parameterGroupParentId = "this_is_a_parent_id"
907878
val parameterGroupDescription = "this_is_a_description"
908879
val parameterGroup =
909880
RunTemplateParameterGroupCreateRequest(
910881
parameterGroupId,
911882
parameterGroupDescription,
912883
parameterLabels,
913-
false,
914884
additionalData,
915-
parameterGroupParentId,
916885
mutableListOf(parameterId))
917886

918887
val solutionId =
@@ -929,8 +898,6 @@ class SolutionControllerTests : ControllerTestBase() {
929898
.andExpect(jsonPath("$[0].id").value(parameterGroupId))
930899
.andExpect(jsonPath("$[0].description").value(parameterGroupDescription))
931900
.andExpect(jsonPath("$[0].labels").value(parameterLabels))
932-
.andExpect(jsonPath("$[0].isTable").value(false))
933-
.andExpect(jsonPath("$[0].parentId").value(parameterGroupParentId))
934901
.andExpect(jsonPath("$[0].additionalData[\"you_can_put\"]").value("whatever_you_want_here"))
935902
.andExpect(jsonPath("$[0].additionalData[\"even\"][\"object\"]").value("if_you_want"))
936903
.andExpect(jsonPath("$[0].parameters").value(mutableListOf(parameterId)))
@@ -948,16 +915,13 @@ class SolutionControllerTests : ControllerTestBase() {
948915
"you_can_put" to "whatever_you_want_here",
949916
"even" to JSONObject(mapOf("object" to "if_you_want")))
950917
val parameterGroupId = "parameterGroup1"
951-
val parameterGroupParentId = "this_is_a_parent_id"
952918
val parameterGroupDescription = "this_is_a_description"
953919
val parameterGroup =
954920
RunTemplateParameterGroupCreateRequest(
955921
parameterGroupId,
956922
parameterGroupDescription,
957923
parameterLabels,
958-
false,
959924
additionalData,
960-
parameterGroupParentId,
961925
mutableListOf(parameterId))
962926

963927
val solutionId =

‎doc/Models/RunTemplateParameterGroup.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
| **id** | **String** | The Parameter Group id | [default to null] |
77
| **description** | **String** | A description of the parameter group | [optional] [default to null] |
88
| **labels** | **Map** | A translated label with key as ISO 639-1 code | [optional] [default to null] |
9-
| **isTable** | **Boolean** | Does the group define a table | [default to null] |
109
| **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] |
11-
| **parentId** | **String** | The Run Template Group parent Id | [optional] [default to null] |
1210
| **parameters** | **List** | An ordered list of Run Template Parameters | [default to null] |
1311

1412
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎doc/Models/RunTemplateParameterGroupCreateRequest.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
| **id** | **String** | The Parameter Group id | [default to null] |
77
| **description** | **String** | A description of the parameter group | [optional] [default to null] |
88
| **labels** | **Map** | A translated label with key as ISO 639-1 code | [optional] [default to null] |
9-
| **isTable** | **Boolean** | Does the group define a table | [optional] [default to false] |
109
| **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] |
11-
| **parentId** | **String** | The Run Template Group parent Id | [optional] [default to null] |
1210
| **parameters** | **List** | An ordered list of Run Template Parameters | [optional] [default to []] |
1311

1412
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎doc/Models/RunTemplateParameterGroupUpdateRequest.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
|------------ | ------------- | ------------- | -------------|
66
| **description** | **String** | A description of the parameter group | [optional] [default to null] |
77
| **labels** | **Map** | A translated label with key as ISO 639-1 code | [optional] [default to null] |
8-
| **isTable** | **Boolean** | Does the group define a table | [optional] [default to null] |
98
| **additionalData** | [**Map**](AnyType.md) | Free form additional data | [optional] [default to null] |
10-
| **parentId** | **String** | The Run Template Group parent Id | [optional] [default to null] |
119
| **parameters** | **List** | An ordered list of Run Template Parameters | [optional] [default to null] |
1210

1311
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎openapi/plantuml/schemas.plantuml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,28 +306,22 @@ entity RunTemplateParameterGroup {
306306
* id: String
307307
description: String
308308
labels: Map
309-
* isTable: Boolean
310309
additionalData: Map
311-
parentId: String
312310
* parameters: List<String>
313311
}
314312

315313
entity RunTemplateParameterGroupCreateRequest {
316314
* id: String
317315
description: String
318316
labels: Map
319-
isTable: Boolean
320317
additionalData: Map
321-
parentId: String
322318
parameters: List<String>
323319
}
324320

325321
entity RunTemplateParameterGroupUpdateRequest {
326322
description: String
327323
labels: Map
328-
isTable: Boolean
329324
additionalData: Map
330-
parentId: String
331325
parameters: List<String>
332326
}
333327

‎run/src/test/kotlin/com/cosmotech/run/ContainerFactoryTests.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,7 @@ class ContainerFactoryTests {
235235
parameters = mutableListOf(RunTemplateParameter("parameter", "string")),
236236
parameterGroups =
237237
mutableListOf(
238-
RunTemplateParameterGroup(
239-
id = "parameter", isTable = false, parameters = mutableListOf())),
238+
RunTemplateParameterGroup(id = "parameter", parameters = mutableListOf())),
240239
organizationId = "Organizationid",
241240
security = SolutionSecurity(ROLE_ADMIN, mutableListOf()),
242241
)

0 commit comments

Comments
 (0)