Merge pull request #1308 from fiterlatam/fix/FSF-73

Fix/fsf 73
fiterlatam · Nov 21, 2024 · e8425bb · e8425bb
2 parents 8b9110b + 1fa5bb2
commit e8425bb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/...ct-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java b/...ct-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepository.java
@@ -33,6 +33,8 @@ public interface GroupRepository extends JpaRepository<Group, Long>, JpaSpecific
 
     Optional<Group> findByPrequalificationGroup(PrequalificationGroup prequalificationGroup);
 
+    Optional<Group> findByNameAndGroupLevel(String name, GroupLevel type);
+
     // Collection<Group> findByPrequalificationGroup(PrequalificationGroup prequalificationGroup);
 
     String RETRIEVE_SUBMITTED_ON_DATE = "select g.submittedOnDate from Group g where g.id = :groupId";

diff --git a/...ider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepositoryWrapper.java b/...ider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupRepositoryWrapper.java
@@ -19,6 +19,7 @@
 package org.apache.fineract.portfolio.group.domain;
 
 import java.time.LocalDate;
+import java.util.Optional;
 import org.apache.fineract.organisation.office.domain.Office;
 import org.apache.fineract.organisation.prequalification.domain.PrequalificationGroup;
 import org.apache.fineract.portfolio.group.exception.GroupNotFoundException;
@@ -44,6 +45,10 @@ public Group findOneWithNotFoundDetection(final Long id) {
         return this.repository.findById(id).orElseThrow(() -> new GroupNotFoundException(id));
     }
 
+    public Optional<Group> findByNameAndGroupLevel(final String name, final GroupLevel groupLevel) {
+        return this.repository.findByNameAndGroupLevel(name, groupLevel);
+    }
+
     public Group findOneWithPrequalificationIdNotFoundDetection(final PrequalificationGroup prequalificationGroup) {
         return this.repository.findByPrequalificationGroup(prequalificationGroup)
                 .orElseThrow(() -> new GroupNotFoundException(prequalificationGroup.getId()));

diff --git a/...main/java/org/apache/fineract/portfolio/group/exception/GroupExistsInCenterException.java b/...main/java/org/apache/fineract/portfolio/group/exception/GroupExistsInCenterException.java
@@ -27,4 +27,9 @@ public GroupExistsInCenterException(final Long centerId, final Long groupId) {
                 "Group with identifier " + groupId + " is already exists in Center with identifier " + centerId, groupId, centerId);
     }
 
+    public GroupExistsInCenterException(final Long centerId, final String groupName) {
+        super("error.msg.group.is.already.member.of.center",
+                "Group with name " + groupName + " already exists in Center with identifier " + centerId, groupName, centerId);
+    }
+
 }
diff --git a/.../fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java b/.../fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
@@ -29,6 +29,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import javax.persistence.PersistenceException;
 import lombok.RequiredArgsConstructor;
@@ -95,6 +96,7 @@
 import org.apache.fineract.portfolio.group.domain.GroupRepositoryWrapper;
 import org.apache.fineract.portfolio.group.domain.GroupTypes;
 import org.apache.fineract.portfolio.group.exception.GroupAccountExistsException;
+import org.apache.fineract.portfolio.group.exception.GroupExistsInCenterException;
 import org.apache.fineract.portfolio.group.exception.GroupHasNoStaffException;
 import org.apache.fineract.portfolio.group.exception.GroupMeetingTimeCollisionException;
 import org.apache.fineract.portfolio.group.exception.GroupMemberCountNotInPermissibleRangeException;
@@ -177,6 +179,11 @@ private CommandProcessingResult createGroupingType(final JsonCommand command, fi
             final LocalDate activationDate = command.localDateValueOfParameterNamed(GroupingTypesApiConstants.activationDateParamName);
             final GroupLevel groupLevel = this.groupLevelRepository.findById(groupingType.getId()).orElse(null);
 
+            Optional<Group> existingGroupName = this.groupRepository.findByNameAndGroupLevel(name, groupLevel);
+            if (existingGroupName.isPresent()) {
+                Group oldGroup = existingGroupName.get();
+                throw new GroupExistsInCenterException(oldGroup.getParent().getId(), oldGroup.getName());
+            }
             validateOfficeOpeningDateisAfterGroupOrCenterOpeningDate(groupOffice, groupLevel, activationDate);
 
             Staff staff = null;