Skip to content

Commit 4ca58c7

Browse files
[SELC-7672] Added support tag to deleteMemberFromUserGroup and deleteMemberFromUserGroups. Improved documentation.
1 parent a273c45 commit 4ca58c7

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

apps/user-group-ms/src/main/docs/openapi.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
}, {
8787
"name" : "userId",
8888
"in" : "query",
89-
"description" : "Member's unique identifier",
89+
"description" : "Member's unique identifier (userId)",
9090
"required" : false,
9191
"style" : "form",
9292
"schema" : {
@@ -234,14 +234,14 @@
234234
},
235235
"/v1/user-groups/members/{memberId}" : {
236236
"delete" : {
237-
"tags" : [ "UserGroup" ],
237+
"tags" : [ "UserGroup", "support" ],
238238
"summary" : "deleteMemberFromUserGroups",
239-
"description" : "Service to delete a member from a specific UserGroup entity",
239+
"description" : "Service to delete a member from every group of a specific product of an institution",
240240
"operationId" : "deleteMemberFromUserGroupsUsingDELETE",
241241
"parameters" : [ {
242242
"name" : "memberId",
243243
"in" : "path",
244-
"description" : "Member's unique identifier",
244+
"description" : "Member's unique identifier (userId)",
245245
"required" : true,
246246
"style" : "simple",
247247
"schema" : {
@@ -251,7 +251,7 @@
251251
}, {
252252
"name" : "institutionId",
253253
"in" : "query",
254-
"description" : "institutionId",
254+
"description" : "Users group's institutionId",
255255
"required" : true,
256256
"style" : "form",
257257
"schema" : {
@@ -260,7 +260,7 @@
260260
}, {
261261
"name" : "productId",
262262
"in" : "query",
263-
"description" : "productId",
263+
"description" : "Users group's productId",
264264
"required" : true,
265265
"style" : "form",
266266
"schema" : {
@@ -588,7 +588,7 @@
588588
}, {
589589
"name" : "memberId",
590590
"in" : "path",
591-
"description" : "Member's unique identifier",
591+
"description" : "Member's unique identifier (userId)",
592592
"required" : true,
593593
"style" : "simple",
594594
"schema" : {
@@ -636,7 +636,7 @@
636636
} ]
637637
},
638638
"delete" : {
639-
"tags" : [ "UserGroup" ],
639+
"tags" : [ "UserGroup", "support" ],
640640
"summary" : "deleteMemberFromUserGroup",
641641
"description" : "Service to delete a member from a specific UserGroup entity",
642642
"operationId" : "deleteMemberFromUserGroupUsingDELETE",
@@ -652,7 +652,7 @@
652652
}, {
653653
"name" : "memberId",
654654
"in" : "path",
655-
"description" : "Member's unique identifier",
655+
"description" : "Member's unique identifier (userId)",
656656
"required" : true,
657657
"style" : "simple",
658658
"schema" : {

apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/controller/UserGroupV1Controller.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,26 +197,28 @@ public Page<UserGroupResource> getUserGroups(@ApiParam("${swagger.user-group.mod
197197
@DeleteMapping(value = "/{id}/members/{memberId}")
198198
@ResponseStatus(HttpStatus.NO_CONTENT)
199199
@ApiOperation(value = "", notes = "${swagger.user-group.groups.api.deleteMember}")
200+
@Tag(name = "UserGroup")
201+
@Tag(name = "support")
200202
public void deleteMemberFromUserGroup(@ApiParam("${swagger.user-group.model.id}")
201-
@PathVariable("id")
202-
String userGroupId,
203+
@PathVariable("id") String userGroupId,
203204
@ApiParam("${swagger.user-group.model.memberId}")
204-
@PathVariable("memberId")
205-
UUID memberId) {
205+
@PathVariable("memberId") UUID memberId) {
206206
log.trace("deleteMemberFromUserGroup start");
207207
log.debug("deleteMemberFromUserGroup userGroupId = {}, memberId = {}", Encode.forJava(userGroupId), memberId);
208208
groupService.deleteMember(userGroupId, memberId.toString());
209209
log.trace("deleteMemberFromUserGroup end");
210210
}
211211

212-
213212
@DeleteMapping(value = "/members/{memberId}")
214213
@ResponseStatus(HttpStatus.NO_CONTENT)
215-
@ApiOperation(value = "", notes = "${swagger.user-group.groups.api.deleteMember}")
214+
@ApiOperation(value = "", notes = "${swagger.user-group.groups.api.deleteMembers}")
215+
@Tag(name = "UserGroup")
216+
@Tag(name = "support")
216217
public void deleteMemberFromUserGroups(@ApiParam("${swagger.user-group.model.memberId}")
217-
@PathVariable("memberId")
218-
UUID memberId,
218+
@PathVariable("memberId") UUID memberId,
219+
@ApiParam("${swagger.user-group.model.institutionId}")
219220
@RequestParam(value = "institutionId") String institutionId,
221+
@ApiParam("${swagger.user-group.model.productId}")
220222
@RequestParam(value = "productId") String productId) {
221223
log.trace("deleteMemberFromUserGroups start");
222224
log.debug("deleteMemberFromUserGroups memberId = {}, institutionId = {}, productId = {}", memberId, Encode.forJava(institutionId), Encode.forJava(productId));

apps/user-group-ms/src/main/resources/swagger/swagger_en.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ swagger.user-group.groups.api.getUserGroups=Service that allows to get a list of
1313
swagger.user-group.groups.api.getUserGroup=Service to get a specific UserGroup entity
1414
swagger.user-group.groups.api.addMember=Service to add a member to a specific UserGroup entity
1515
swagger.user-group.groups.api.deleteMember=Service to delete a member from a specific UserGroup entity
16+
swagger.user-group.groups.api.deleteMembers=Service to delete a member from every group of a specific product of an institution
1617
swagger.user-group.model.id=Users group's unique identifier
1718
swagger.user-group.model.institutionId=Users group's institutionId
1819
swagger.user-group.model.productId=Users group's productId
@@ -21,7 +22,7 @@ swagger.user-group.model.description=Users group's description
2122
swagger.user-group.model.status=Users group's status
2223
swagger.user-group.model.members=List of all the members of the group
2324
swagger.user-group.model.pageable=Details for retrieving usergroups based on size and index
24-
swagger.user-group.model.memberId=Member's unique identifier
25+
swagger.user-group.model.memberId=Member's unique identifier (userId)
2526
swagger.user-group.model.createdAt=Date on which the group was created
2627
swagger.user-group.model.createdBy=User by which the group was created
2728
swagger.user-group.model.modifiedAt=Date on which the group was modified

0 commit comments

Comments
 (0)