AMP-31085: Bulk delete for orgs

Resolve activity delete issue

Author: brianbrix

amp/src/main/java/org/digijava/module/aim/action/OrganisationManager.java

@@ -6,12 +6,19 @@
     import org.apache.struts.action.ActionForm;
     import org.apache.struts.action.ActionForward;
     import org.apache.struts.action.ActionMapping;
+    import org.apache.struts.action.ActionMessage;
+    import org.apache.struts.action.ActionMessages;
     import org.digijava.module.aim.dbentity.AmpOrganisation;
+    import org.digijava.module.aim.dbentity.AmpTeam;
     import org.digijava.module.aim.form.OrgManagerForm;
     import org.digijava.module.aim.helper.TeamMember;
+    import org.digijava.module.aim.util.ActivityUtil;
     import org.digijava.module.aim.util.DbUtil;
+    import org.digijava.module.aim.util.TeamUtil;
     import org.digijava.module.calendar.util.AmpUtil;
+    import org.hibernate.JDBCException;
 
+    import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpSession;
     import java.util.*;
 
@@ -50,6 +57,9 @@ public ActionForward execute(ActionMapping mapping, ActionForm form,
 
     OrgManagerForm eaForm = (OrgManagerForm) form;
     eaForm.setAdminSide(isAdmin);
+    if (isAdmin && "true".equals(request.getParameter("deleteSelectedOrgs"))) {
+      deleteSelectedOrganisations(eaForm, request);
+    }
     if (request.getParameter("orgSelReset") != null
         && request.getParameter("orgSelReset").equals("false")) {
       eaForm.setOrgSelReset(false);
@@ -229,6 +239,84 @@ else if (StringUtils.isNotBlank(eaForm.getKeyword())) {
 
   }
 
+    /**
+     * Deletes the organizations checked in the "Select" column, applying the same
+     * referential checks as the single-organization delete on the edit page.
+     */
+    private void deleteSelectedOrganisations(OrgManagerForm eaForm, HttpServletRequest request) {
+        Long[] ids = eaForm.getSelectedOrgIds();
+        if (ids == null || ids.length == 0) {
+            return;
+        }
+
+        ActionMessages messages = new ActionMessages();
+        int deletedCount = 0;
+        for (Long orgId : ids) {
+            AmpOrganisation org = DbUtil.getOrganisation(orgId);
+            if (org == null) {
+                continue;
+            }
+
+            boolean blocked = false;
+
+            Set<String> ampIds = new TreeSet<>();
+            addAllIfNotNull(ampIds, DbUtil.getAmpIdsByOrg(orgId));
+            addAllIfNotNull(ampIds, ActivityUtil.getAmpIdsByFundingOrg(orgId));
+            addAllIfNotNull(ampIds, DbUtil.getAmpIdsByInternalIdOrg(orgId));
+            if (!ampIds.isEmpty()) {
+                messages.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+                        "error.aim.organizationManager.deleteOrgActErrorBulk", org.getName(), String.join(", ", ampIds)));
+                blocked = true;
+            }
+
+            if (org.getCalendar() != null && !org.getCalendar().isEmpty()) {
+                messages.add(ActionMessages.GLOBAL_MESSAGE,
+                        new ActionMessage("error.aim.organizationManager.deleteOrgEventErrorBulk", org.getName()));
+                blocked = true;
+            }
+
+            List<AmpTeam> relatedTeams = TeamUtil.getTeamByOrg(orgId);
+            if (relatedTeams != null && !relatedTeams.isEmpty()) {
+                messages.add(ActionMessages.GLOBAL_MESSAGE,
+                        new ActionMessage("error.aim.organizationManager.deleteOrgTeamErrorBulk", org.getName()));
+                blocked = true;
+            }
+
+            if (org.getUsers() != null && !org.getUsers().isEmpty()) {
+                messages.add(ActionMessages.GLOBAL_MESSAGE,
+                        new ActionMessage("error.aim.organizationManager.deleteOrgVerifiedOrgErrorBulk", org.getName()));
+                blocked = true;
+            }
+
+            if (blocked) {
+                continue;
+            }
+
+            try {
+                DbUtil.deleteOrg(org);
+                deletedCount++;
+            } catch (JDBCException e) {
+                messages.add(ActionMessages.GLOBAL_MESSAGE,
+                        new ActionMessage("error.aim.organizationManager.deleteOrgJdbcErrorBulk", org.getName()));
+            }
+        }
+
+        if (deletedCount > 0) {
+            messages.add(ActionMessages.GLOBAL_MESSAGE,
+                    new ActionMessage("error.aim.organizationManager.deleteOrgSuccessBulk", String.valueOf(deletedCount)));
+        }
+        if (!messages.isEmpty()) {
+            saveErrors(request, messages);
+        }
+        eaForm.setSelectedOrgIds(null);
+    }
+
+    private void addAllIfNotNull(Set<String> set, Collection<String> toAdd) {
+        if (toAdd != null && !toAdd.isEmpty()) {
+            set.addAll(toAdd);
+        }
+    }
+
     private void collectAlphaArray(OrgManagerForm eaForm, Collection<AmpOrganisation> col) {
         SortedSet<String> chars = new TreeSet<String>(AmpUtil.CharUnicodeComparator);
         SortedSet<String> digits = new TreeSet<String>(AmpUtil.CharUnicodeComparator);

amp/src/main/java/org/digijava/module/aim/form/OrgManagerForm.java

@@ -43,6 +43,7 @@ public class OrgManagerForm
 
   private String[] digitPages;
   private String[] alphaPages = null;
+  private Long[] selectedOrgIds;
 
     public boolean isAdminSide() {
         return adminSide;
@@ -107,6 +108,14 @@ public void setAlphaPages(String[] alphaPages) {
     this.alphaPages = alphaPages;
   }
 
+  public Long[] getSelectedOrgIds() {
+    return selectedOrgIds;
+  }
+
+  public void setSelectedOrgIds(Long[] selectedOrgIds) {
+    this.selectedOrgIds = selectedOrgIds;
+  }
+
   /**
    * @return Returns the ampOrgTypeId.
    */

amp/src/main/resources/java/resources/application.properties

@@ -583,6 +583,12 @@ error.aim.organizationManager.deleteOrgActError=Can not delete this organization
 error.aim.organizationManager.deleteOrgEventError=Can not delete this organization as it is currently referenced by Events
 error.aim.organizationManager.deleteOrgTeamError=Can not delete this organization as it is currently referenced by Teams
 error.aim.organizationManager.deleteOrgVerifiedOrgError=Can not delete this organization as it is currently referenced as verified Organization
+error.aim.organizationManager.deleteOrgActErrorBulk=Cannot delete organization "{0}": it is currently referenced by the following Activities (AMP Ids): {1}.
+error.aim.organizationManager.deleteOrgEventErrorBulk=Cannot delete organization "{0}": it is currently referenced by Events.
+error.aim.organizationManager.deleteOrgTeamErrorBulk=Cannot delete organization "{0}": it is currently referenced by Teams.
+error.aim.organizationManager.deleteOrgVerifiedOrgErrorBulk=Cannot delete organization "{0}": it is currently referenced as a verified Organization.
+error.aim.organizationManager.deleteOrgJdbcErrorBulk=Cannot delete organization "{0}": it is referenced by other data (e.g. Table widgets).
+error.aim.organizationManager.deleteOrgSuccessBulk=Successfully deleted {0} organization(s).
 error.aim.organizationManager.saveOrgPledgeError=Please complete the fields program, amount and date for each Pledge
 error.aim.organizationManager.saveOrgCodeError=Please choose another organization code as it is currently in use by some other organization.
 error.aim.organizationManager.saveOrgAcronymError = Please choose another organization acronym as it is currently in \

amp/src/main/resources/org/digijava/module/aim/dbentity/AmpActivityVersion.hbm.xml

@@ -139,7 +139,9 @@
 		</set>
 
 
-		<set name="categories" table="AMP_ACTIVITIES_CATEGORYVALUES" lazy="false" cascade="delete">
+		<!-- AmpCategoryValue rows are shared reference data (statuses, types, etc.), never owned by
+		     one activity version, so this join must not cascade delete to the category value itself. -->
+		<set name="categories" table="AMP_ACTIVITIES_CATEGORYVALUES" lazy="false" cascade="none">
 			<cache usage="read-write" />
 			<key column="amp_activity_id" />
 			<many-to-many class="org.digijava.module.categorymanager.dbentity.AmpCategoryValue"

amp/src/main/webapp/WEB-INF/jsp/aim/view/organisationManager.jsp

@@ -58,6 +58,37 @@
         document.aimOrgManagerForm.submit();
     }
 
+	function toggleAllOrgCheckboxes(masterCheckbox) {
+		var boxes = document.getElementsByName("selectedOrgIds");
+		for (var i = 0; i < boxes.length; i++) {
+			boxes[i].checked = masterCheckbox.checked;
+		}
+	}
+
+	function deleteSelectedOrgs() {
+		var boxes = document.getElementsByName("selectedOrgIds");
+		var selected = false;
+		for (var i = 0; i < boxes.length; i++) {
+			if (boxes[i].checked) {
+				selected = true;
+				break;
+			}
+		}
+		if (!selected) {
+			alert('<digi:trn jsFriendly="true">Please select at least one organization first.</digi:trn>');
+			return false;
+		}
+		if (!confirm('<digi:trn jsFriendly="true">Are you sure you want to delete the selected organizations?</digi:trn>')) {
+			return false;
+		}
+		<digi:context name="searchOrg" property="context/module/moduleinstance/organisationManager.do"/>
+		url = "<%= searchOrg %>?deleteSelectedOrgs=true&orgSelReset=false";
+		document.aimOrgManagerForm.action = url;
+		document.aimOrgManagerForm.target = "_self";
+		document.aimOrgManagerForm.submit();
+		return true;
+	}
+
 
 
 
@@ -182,6 +213,13 @@
 																		</td>
 																		<!-- end header -->
 																	</tr>
+																	<c:if test="${aimOrgManagerForm.adminSide}">
+																	<tr>
+																		<td colspan="6" align="right" style="padding: 5px;">
+																			<input type="button" class="buttonx_sm" onclick="return deleteSelectedOrgs()" value="<digi:trn jsFriendly="true">Delete Selected</digi:trn>">
+																		</td>
+																	</tr>
+																	</c:if>
 																	<!-- Page Logic -->
 
 																	<logic:empty name="aimOrgManagerForm"
@@ -203,6 +241,11 @@
 																					class="inside">
 																					<thead>
 																						<tr>
+																							<c:if test="${aimOrgManagerForm.adminSide}">
+																							<td class="inside" bgcolor=#F2F2F2 align="center">
+																								<input type="checkbox" onclick="toggleAllOrgCheckboxes(this)">
+																							</td>
+																							</c:if>
 																							<td class="inside" bgcolor=#F2F2F2><c:if
 																									test="${not empty aimOrgManagerForm.sortBy && aimOrgManagerForm.sortBy!='nameAscending'}">
 																									<digi:link
@@ -306,6 +349,11 @@
 																							property="pagedCol" id="organisation"
 																							indexId="index">
 																							<tr>
+																								<c:if test="${aimOrgManagerForm.adminSide}">
+																								<td class="inside" align="center">
+																									<input type="checkbox" name="selectedOrgIds" value="${organisation.ampOrgId}">
+																								</td>
+																								</c:if>
 																								<td class="inside">
 																								<jsp:useBean
 																										id="urlParams" type="java.util.Map"