Restore functionality of deleteGroup: there is no FK from artifacts to groups yet

Author: EricWittmann

app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

@@ -2087,6 +2087,12 @@ public void deleteGroup(String groupId) throws GroupNotFoundException, RegistryS
                     .bind(0, normalizeGroupId(groupId))
                     .execute();
 
+            // Delete all artifacts in the group (TODO there is currently no FK from artifacts to groups)
+            handle.createUpdate(sqlStatements.deleteArtifactsByGroupId())
+                    .bind(0, normalizeGroupId(groupId))
+                    .execute();
+
+            // Now delete the group (labels and rules etc will cascade)
             int rows = handle.createUpdate(sqlStatements.deleteGroup())
                     .bind(0, groupId)
                     .execute();
@@ -2719,6 +2725,7 @@ private void resolveReferences(Map<String, ContentHandle> resolvedReferences, Li
     /**
      * IMPORTANT: Private methods can't be @Transactional. Callers MUST have started a transaction.
      */
+    // TODO call this in a cleanup cron job instead?
     private void deleteAllOrphanedContent() {
         log.debug("Deleting all orphaned content");
         handles.withHandleNoException(handle -> {

app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java

@@ -986,15 +986,50 @@ public void testDeleteArtifactsInGroup() throws Exception {
                 .statusCode(204);
 
         // Verify that all 3 artifacts were deleted
-        TestUtils.retry(() -> {
-            given()
-                    .when()
-                    .queryParam("group", group)
-                    .get("/registry/v3/search/artifacts")
-                    .then()
-                    .statusCode(200)
-                    .body("count", equalTo(0));
-        });
+        given()
+                .when()
+                .queryParam("group", group)
+                .get("/registry/v3/search/artifacts")
+                .then()
+                .statusCode(200)
+                .body("count", equalTo(0));
+    }
+
+    @Test
+    public void testDeleteGroupWithArtifacts() throws Exception {
+        String group = "testDeleteGroupWithArtifacts";
+        String artifactContent = resourceToString("openapi-empty.json");
+
+        // Create several artifacts in the group.
+        createArtifact(group, "EmptyAPI-1", ArtifactType.OPENAPI, artifactContent);
+        createArtifact(group, "EmptyAPI-2", ArtifactType.OPENAPI, artifactContent);
+        createArtifact(group, "EmptyAPI-3", ArtifactType.OPENAPI, artifactContent);
+
+        // Make sure we can search for all three artifacts in the group.
+        given()
+                .when()
+                .queryParam("group", group)
+                .get("/registry/v3/search/artifacts")
+                .then()
+                .statusCode(200)
+                .body("count", equalTo(3));
+
+        // Delete the *group* (should delete all artifacts)
+        given()
+                .when()
+                .pathParam("groupId", group)
+                .delete("/registry/v3/groups/{groupId}")
+                .then()
+                .statusCode(204);
+
+        // Verify that all 3 artifacts were deleted
+        given()
+                .when()
+                .queryParam("group", group)
+                .get("/registry/v3/search/artifacts")
+                .then()
+                .statusCode(200)
+                .body("count", equalTo(0));
     }
 
     @Test