Fix dcm4che#1858 : Restful service to update Study Access Control ID

mingdatacom · Feb 27, 2019 · 66fc4b4 · 66fc4b4
1 parent f8cddc5
commit 66fc4b4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/dcm4chee-arc-entity/src/main/java/org/dcm4chee/arc/entity/Study.java b/dcm4chee-arc-entity/src/main/java/org/dcm4chee/arc/entity/Study.java
@@ -135,7 +135,11 @@
         @NamedQuery(
                 name = Study.SET_STORAGE_IDS,
                 query = "update Study st set st.storageIDs = ?2 " +
-                        "where st.pk = ?1")
+                        "where st.pk = ?1"),
+        @NamedQuery(
+                name = Study.UPDATE_ACCESS_CONTROL_ID,
+                query = "update Study st set st.accessControlID = ?2 " +
+                        "where st.studyInstanceUID = ?1")
 })
 @Entity
 @Table(name = "study",
@@ -179,6 +183,7 @@ public class Study {
     public static final String FIND_PK_BY_STUDY_UID = "Study.findPkByStudyUID";
     public static final String STORAGE_IDS_BY_STUDY_UID = "Study.storageIDsByStudyUID";
     public static final String SET_STORAGE_IDS = "Study.setStorageIDs";
+    public static final String UPDATE_ACCESS_CONTROL_ID = "Study.updateAccessControlID";
 
     public static class PKUID {
         public final Long pk;

diff --git a/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java b/dcm4chee-arc-iocm-rs/src/main/java/org/dcm4chee/arc/iocm/rs/IocmRS.java
@@ -492,7 +492,7 @@ public Response updateStudyAccessControlID(
             ctx.setStudyInstanceUID(studyUID);
             ctx.setAccessControlID("null".equals(accessControlID) ? "*" :  accessControlID);
             ctx.setEventActionCode(AuditMessages.EventActionCode.Update);
-            if (!studyService.updateAccessControlID(ctx))
+            if (studyService.updateAccessControlID(ctx) == 0)
                 return errResponse("Study not found. " + studyUID, Response.Status.NOT_FOUND);
 
             rsForward.forward(RSOperation.UpdateStudyAccessControlID, arcAE, null, request);

diff --git a/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/StudyService.java b/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/StudyService.java
@@ -60,5 +60,5 @@ public interface StudyService {
 
     void updateExpirationDate(StudyMgtContext ctx) throws Exception;
 
-    boolean updateAccessControlID(StudyMgtContext ctx) throws Exception;
+    int updateAccessControlID(StudyMgtContext ctx) throws Exception;
 }
diff --git a/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceEJB.java b/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceEJB.java
@@ -257,17 +257,11 @@ public void updateExpirationDate(StudyMgtContext ctx) {
         updateStudyExpirationDate(ctx);
     }
 
-    public boolean updateAccessControlID(StudyMgtContext ctx) {
-        try {
-            Study study = em.createNamedQuery(Study.FIND_BY_STUDY_IUID, Study.class)
+    public int updateAccessControlID(StudyMgtContext ctx) {
+        return em.createNamedQuery(Study.UPDATE_ACCESS_CONTROL_ID)
                     .setParameter(1, ctx.getStudyInstanceUID())
-                    .getSingleResult();
-            study.setAccessControlID(ctx.getAccessControlID());
-            ctx.setStudy(study);
-        } catch (NoResultException e) {
-            return false;
-        }
-        return true;
+                    .setParameter(2, ctx.getAccessControlID())
+                    .executeUpdate();
     }
 
     private void setCodes(Collection<CodeEntity> codes, Sequence seq) {

diff --git a/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceImpl.java b/dcm4chee-arc-study/src/main/java/org/dcm4chee/arc/study/impl/StudyServiceImpl.java
@@ -105,15 +105,12 @@ public void updateExpirationDate(StudyMgtContext ctx) {
     }
 
     @Override
-    public boolean updateAccessControlID(StudyMgtContext ctx) {
+    public int updateAccessControlID(StudyMgtContext ctx) {
         try {
             return ejb.updateAccessControlID(ctx);
         } catch (Exception e) {
             ctx.setException(e);
             throw e;
-        } finally {
-            if (ctx.getStudy() != null)
-                updateStudyEvent.fire(ctx);
         }
     }