RESTful service to update Study Access Control ID of matching Studies d…

…cm4che#1876
mingdatacom · Mar 29, 2019 · f7955f8 · f7955f8
1 parent 72276a4
commit f7955f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/UpdateStudyAccessMatchingRS.java b/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/UpdateStudyAccessMatchingRS.java
@@ -173,30 +173,20 @@ public Response updateStudyAccessControlID(
         try {
             ArchiveDeviceExtension arcDev = device.getDeviceExtensionNotNull(ArchiveDeviceExtension.class);
             QueryContext qCtx = queryContext(ae);
-            String warning = null;
             int count = 0;
-            Response.Status status = Response.Status.ACCEPTED;
             try (Query query = queryService.createQuery(qCtx)) {
                 query.beginTransaction();
-                try {
-                    query.executeQuery(arcDev.getQueryFetchSize());
-                    while (query.hasMoreMatches()) {
-                        Attributes match = query.nextMatch();
-                        StudyMgtContext ctx = studyService.createStudyMgtContextWEB(request, ae);
-                        ctx.setStudyInstanceUID(match.getString(Tag.StudyInstanceUID));
-                        ctx.setAccessControlID("null".equals(accessControlID) ? "*" :  accessControlID);
-                        studyService.updateAccessControlID(ctx);
-                        count++;
-                    }
-                } catch (Exception e) {
-                    warning = e.getMessage();
-                    status = Response.Status.INTERNAL_SERVER_ERROR;
+                query.executeQuery(arcDev.getQueryFetchSize());
+                while (query.hasMoreMatches()) {
+                    Attributes match = query.nextMatch();
+                    StudyMgtContext ctx = studyService.createStudyMgtContextWEB(request, ae);
+                    ctx.setStudyInstanceUID(match.getString(Tag.StudyInstanceUID));
+                    ctx.setAccessControlID("null".equals(accessControlID) ? "*" :  accessControlID);
+                    studyService.updateAccessControlID(ctx);
+                    count++;
                 }
             }
-            Response.ResponseBuilder builder = Response.status(status);
-            if (warning != null)
-                builder.header("Warning", warning);
-            return builder.entity("{\"count\":" + count + '}').build();
+            return Response.ok("{\"count\":" + count + '}').build();
         } catch (Exception e) {
             return errResponseAsTextPlain(e);
         }

diff --git a/dcm4chee-arc-ui2/src/swagger/swagger.json b/dcm4chee-arc-ui2/src/swagger/swagger.json
@@ -8009,8 +8009,11 @@
           }
         ],
         "responses": {
-          "204": {
-            "description": "successful operation"
+          "200": {
+            "description": "Study Access Control ID successfully updated",
+            "schema": {
+              "$ref": "#/definitions/Count"
+            }
           },
           "404": {
             "description": "No such Archive AE Title"