From 4cb749bc5d9e342cb3ad407485226b77d8174fc7 Mon Sep 17 00:00:00 2001 From: 3bru <16ebruarslan@gmail.com> Date: Fri, 10 Mar 2023 17:20:12 +0300 Subject: [PATCH 1/2] bugfixed --- .../java/tr/org/lider/controllers/UserGroupsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tr/org/lider/controllers/UserGroupsController.java b/src/main/java/tr/org/lider/controllers/UserGroupsController.java index 60be4bc..dbe0043 100644 --- a/src/main/java/tr/org/lider/controllers/UserGroupsController.java +++ b/src/main/java/tr/org/lider/controllers/UserGroupsController.java @@ -352,7 +352,7 @@ public ResponseEntity deleteMembersOfGroup(@RequestParam(value="dn", //so dn must be joined with comma //if member dn that will be added to group is cn=agent1,ou=Groups,dn=liderahenk,dc=org //spring boot gets this param as array which has size 4 - String dnStringTemp = String.join(",", dn); + String dnStringTemp = String.join(",", dnList); List dnListTemp = new ArrayList<>(); dnListTemp.add(dnStringTemp); DNType dnType= null; From 6c47d8dd356c998152e826ecd287ab21886c05a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tuncay=20=C3=87OLAK?= Date: Tue, 21 Mar 2023 15:43:59 +0300 Subject: [PATCH 2/2] get policy exception by policy and by selected group --- .../controllers/PolicyExceptionController.java | 14 ++++++++++++++ .../tr/org/lider/entities/PolicyExceptionImpl.java | 14 +++++++++++--- .../repositories/PolicyExceptionRepository.java | 2 ++ .../org/lider/services/PolicyExceptionService.java | 4 ++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/tr/org/lider/controllers/PolicyExceptionController.java b/src/main/java/tr/org/lider/controllers/PolicyExceptionController.java index 7ece0a6..514b945 100644 --- a/src/main/java/tr/org/lider/controllers/PolicyExceptionController.java +++ b/src/main/java/tr/org/lider/controllers/PolicyExceptionController.java @@ -133,6 +133,18 @@ public ResponseEntity> policyExceptionListByPolicy(@Pa .status(HttpStatus.OK) .body(policyExceptionService.listByPolicy(policyService.findPolicyByID(id).getId())); } + + @Operation(summary = "Get policy exception list by policy id and by selected group dn", description = "", tags = { "policy-exception" }) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Returns policy exception list successfully"), + @ApiResponse(responseCode = "417", description = "Could not get policy exception list. Unexpected error occurred", + content = @Content(schema = @Schema(implementation = String.class))) }) + @GetMapping(value = "/list/policy/{id}/group-dn/{dn}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> policyExceptionListByPolicyByDn(@PathVariable Long id, @PathVariable String dn) { + return ResponseEntity + .status(HttpStatus.OK) + .body(policyExceptionService.findByPolicyAndGroupDn(policyService.findPolicyByID(id), dn)); + } // return saved policy //@RequestMapping(method=RequestMethod.POST ,value = "/add", produces = MediaType.APPLICATION_JSON_VALUE) @@ -166,6 +178,7 @@ else if(configService.getDomainType().equals(DomainType.LDAP) || configService.g policyExceptionImpl.setLabel(params.getLabel()); policyExceptionImpl.setDn(dnList.get(j)); policyExceptionImpl.setDnType(DNType.GROUP); + policyExceptionImpl.setGroupDn(params.getGroupDn()); policyExceptionService.add(policyExceptionImpl); } } else { @@ -176,6 +189,7 @@ else if(configService.getDomainType().equals(DomainType.LDAP) || configService.g policyExceptionImpl.setLabel(params.getLabel()); policyExceptionImpl.setDn(params.getMembers().get(i).toString()); policyExceptionImpl.setDnType(getLdapEntry(params.getMembers().get(i).toString()).getType()); + policyExceptionImpl.setGroupDn(params.getGroupDn()); policyExceptionService.add(policyExceptionImpl); } } diff --git a/src/main/java/tr/org/lider/entities/PolicyExceptionImpl.java b/src/main/java/tr/org/lider/entities/PolicyExceptionImpl.java index 03487c4..f05d654 100644 --- a/src/main/java/tr/org/lider/entities/PolicyExceptionImpl.java +++ b/src/main/java/tr/org/lider/entities/PolicyExceptionImpl.java @@ -29,10 +29,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -93,6 +90,9 @@ public class PolicyExceptionImpl implements Serializable { @Column(name = "DN",columnDefinition = "TEXT", length = 1000, nullable = false) private String dn; + @Column(name = "GROUP_DN",columnDefinition = "TEXT", length = 1000, nullable = false) + private String groupDn; + @Transient private List members; @@ -196,6 +196,14 @@ public String getDn() { public void setDn(String dn) { this.dn = dn; } + + public String getGroupDn() { + return groupDn; + } + + public void setGroupDn(String groupDn) { + this.groupDn = groupDn; + } public void setModifyDate(Date modifyDate) { this.modifyDate = modifyDate; diff --git a/src/main/java/tr/org/lider/repositories/PolicyExceptionRepository.java b/src/main/java/tr/org/lider/repositories/PolicyExceptionRepository.java index 941078b..713ef0e 100644 --- a/src/main/java/tr/org/lider/repositories/PolicyExceptionRepository.java +++ b/src/main/java/tr/org/lider/repositories/PolicyExceptionRepository.java @@ -18,6 +18,8 @@ public interface PolicyExceptionRepository extends BaseJpaRepository findByPolicy(Long id); List findByPolicyAndDn(PolicyImpl policy, String dn); + + List findByPolicyAndGroupDn(PolicyImpl policy, String dn); @Transactional @Modifying(clearAutomatically = true) diff --git a/src/main/java/tr/org/lider/services/PolicyExceptionService.java b/src/main/java/tr/org/lider/services/PolicyExceptionService.java index 3930279..7d390b0 100644 --- a/src/main/java/tr/org/lider/services/PolicyExceptionService.java +++ b/src/main/java/tr/org/lider/services/PolicyExceptionService.java @@ -43,6 +43,10 @@ public List findByPolicyAndDn(PolicyImpl policy, String dn) return policyExceptionRepository.findByPolicyAndDn(policy, dn); } + public List findByPolicyAndGroupDn(PolicyImpl policy, String dn){ + return policyExceptionRepository.findByPolicyAndGroupDn(policy, dn); + } + public PolicyExceptionImpl add(PolicyExceptionImpl policyExceptionImpl) { PolicyExceptionImpl existPolicyException = policyExceptionRepository.save(policyExceptionImpl); return existPolicyException;