Merge pull request #1912 from jcomedouteau/shanoir-issue#1893-update-…

…dataset-bug #1893-update-dataset-bug
fli-iam · Oct 23, 2023 · b3e82a5 · b3e82a5
2 parents 6791ed0 + 7dab2f8
commit b3e82a5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 54 deletions.
diff --git a/...oir-ng-datasets/src/main/java/org/shanoir/ng/dataset/security/DatasetSecurityService.java b/...oir-ng-datasets/src/main/java/org/shanoir/ng/dataset/security/DatasetSecurityService.java
@@ -553,19 +553,15 @@ public boolean hasUpdateRightOnDataset(Dataset dataset, String rightStr) throws
     	if (dataset.getId() == null) {
 			throw new IllegalArgumentException("Dataset id cannot be null here.");
 		}
-    	if (dataset.getStudyId() == null) {
-			return false;
-		}
+    	if (dataset.getDatasetProcessing() != null) {
+    		//Forbid processed dataset update for the moment
+    		return false;
+    	}
     	Dataset dbDataset = datasetRepository.findById(dataset.getId()).orElse(null);
     	if (dbDataset == null) {
 			throw new EntityNotFoundException("Cannot find dataset with id " + dataset.getId());
 		}
-    	if (dataset.getStudyId() == dbDataset.getStudyId()) { // study hasn't changed
-    		return this.hasRightOnStudyCenter(dataset.getDatasetAcquisition().getExamination().getCenterId(), dataset.getDatasetAcquisition().getExamination().getStudyId(), rightStr);
-    	} else { // study has changed : check user has right on both studies
-    		return this.hasRightOnStudyCenter(dataset.getDatasetAcquisition().getExamination().getCenterId(), dataset.getDatasetAcquisition().getExamination().getStudyId(), rightStr) 
-    				&& this.hasRightOnStudyCenter(dbDataset.getDatasetAcquisition().getExamination().getCenterId(), dbDataset.getDatasetAcquisition().getExamination().getStudyId(), rightStr);
-    	}
+    	return this.hasRightOnStudyCenter(dbDataset.getDatasetAcquisition().getExamination().getCenterId(), dbDataset.getDatasetAcquisition().getExamination().getStudyId(), rightStr);
     }
 
     /**

diff --git a/shanoir-ng-datasets/src/test/java/org/shanoir/ng/dataset/DatasetApiSecurityTest.java b/shanoir-ng-datasets/src/test/java/org/shanoir/ng/dataset/DatasetApiSecurityTest.java
@@ -176,7 +176,11 @@ private void testAll(String role) throws ShanoirException, RestServiceException
 			assertAccessDenied(api::updateDataset, 1L, mockDataset(1L, 1L, 1L, 1L, 1L), mockBindingResult);
 		} else if ("ROLE_EXPERT".equals(role)) {
 			assertAccessAuthorized(api::updateDataset, 1L, mockDataset(1L, 1L, 1L, 1L, 1L), mockBindingResult);
-			assertAccessDenied(api::updateDataset, 1L, mockDataset(1L, 1L, 1L, 2L, 1L), mockBindingResult);
+
+			Dataset ds = mockDataset(100L, 1L, 1L, 2L, 1L);
+			given(datasetRepository.findById(ds.getId())).willReturn(Optional.of(ds));
+
+			assertAccessDenied(api::updateDataset, 1L, ds, mockBindingResult);
 		}
 		assertAccessDenied(api::updateDataset, 1L, mockDataset(2L, 2L, 2L, 2L, 2L), mockBindingResult);
 		assertAccessDenied(api::updateDataset, 1L, mockDataset(3L, 3L, 3L, 3L, 1L), mockBindingResult);

diff --git a/shanoir-ng-datasets/src/test/java/org/shanoir/ng/dataset/DatasetServiceSecurityTest.java b/shanoir-ng-datasets/src/test/java/org/shanoir/ng/dataset/DatasetServiceSecurityTest.java
@@ -215,7 +215,10 @@ private void testUpdate(String role) throws ShanoirException {
 			assertAccessDenied(service::update, mockDataset(1L, 1L, 1L, 1L, 1L));
 		} else if ("ROLE_EXPERT".equals(role)) {
 			assertAccessAuthorized(service::update, mockDataset(1L, 1L, 1L, 1L, 1L));
-			assertAccessDenied(service::update, mockDataset(1L, 1L, 1L, 2L, 1L));
+			Dataset ds = mockDataset(100L, 1L, 1L, 2L, 1L);
+			given(datasetRepository.findById(ds.getId())).willReturn(Optional.of(ds));
+
+			assertAccessDenied(service::update, ds);
 		}
 		assertAccessDenied(service::update, mockDataset(2L, 2L, 2L, 2L, 2L));
 		assertAccessDenied(service::update, mockDataset(3L, 3L, 3L, 3L, 1L));

diff --git a/shanoir-ng-front/src/app/datasets/dataset/common/dataset.common.component.html b/shanoir-ng-front/src/app/datasets/dataset/common/dataset.common.component.html
@@ -67,15 +67,9 @@
 		<li>
 			<label i18n="Dataset detail|Dataset study@@datasetDetailStudy">Study</label>
 			<span class="right-col" [ngSwitch]="mode">
-				<ng-template [ngSwitchCase]="'view'">
 				<a [routerLink]="['/study/details/', dataset.study?.id]">
 					{{dataset.study?.name}}
 				</a>
-				</ng-template>
-				<ng-template ngSwitchDefault>
-					<select-box [(ngModel)]="dataset.study" formControlName="study" [optionArr]="studies">
-					</select-box>
-				</ng-template>
 			</span>
 		</li>
 		<li>
@@ -99,41 +93,6 @@
 				</ng-template>
 			</span>
 		</li>
-		<!-- <li>
-			<label i18n="Dataset detail|Dataset acquisition@@datasetDetailAcquisition">Acquisition</label>
-			<span class="right-col" [ngSwitch]="mode">
-				<ng-template [ngSwitchCase]="'view'">{{dataset.acquisitionId}}</ng-template>
-				<ng-template ngSwitchDefault>
-					<select [(ngModel)]="dataset.acquisitionId" [ngModelOptions]="{standalone: true}" >
-						<option *ngFor="" [value]="">{{}}</option>
-					</select>
-				</ng-template>
-			</span>
-		</li> -->
-		<!-- <li>
-			<label i18n="Dataset detail|Dataset processing@@datasetDetailProcessing">Processing</label>
-			<span class="right-col">
-				<ng-template *ngIf="mode == 'view'">{{dataset.processing}}</ng-template>
-			</span>
-		</li> -->
-		<!-- <li>
-			<label i18n="Dataset detail|Dataset referenced for superimposition@@datasetDetailReferencedForSuperimposition">Can be superimposed with</label>
-			<span class="right-col">
-				<ng-template *ngIf="mode=='view'">{{dataset.referencedDatasetForSuperimposition}}</ng-template>
-			</span>
-		</li> -->
-
-		<!-- <li>
-			<label i18n="Dataset detail|Dataset group fo subject@@datasetDetailGroupOfSubject">Group of subjects</label>
-			<span class="right-col" [ngSwitch]="mode">
-				<ng-template [ngSwitchCase]="'view'">{{dataset.groupOfSubjectId}}</ng-template>
-				<ng-template ngSwitchDefault>
-					<select [(ngModel)]="dataset.groupOfSubjectId" [ngModelOptions]="{standalone: true}" >
-						<option *ngFor="" [value]="">{{}}</option>
-					</select>
-				</ng-template>
-			</span>
-		</li> -->
 	</ol>
 </fieldset>
 

diff --git a/shanoir-ng-front/src/app/datasets/dataset/common/dataset.common.component.ts b/shanoir-ng-front/src/app/datasets/dataset/common/dataset.common.component.ts
@@ -68,6 +68,9 @@ export class CommonDatasetComponent implements OnChanges {
             if (this.mode != 'view')  {
                 this.fetchAllSubjects();
                 this.fetchAllStudies();
+                if (this.dataset && this.dataset.creationDate) {
+                    this.dataset.creationDate = new Date(this.dataset.creationDate);
+                }
             } else if (this.dataset) {
                 this.fetchOneSubject();
                 this.fetchOneStudy();

diff --git a/shanoir-ng-front/src/app/datasets/dataset/dataset.component.ts b/shanoir-ng-front/src/app/datasets/dataset/dataset.component.ts
@@ -99,6 +99,7 @@ export class DatasetComponent extends EntityComponent<Dataset> {
     initEdit(): Promise<void> {
         return this.fetchDataset().then(dataset => {
             this.dataset = dataset;
+            this.dataset.creationDate = new Date(this.dataset.creationDate);
         });
     }
 

diff --git a/shanoir-ng-front/src/app/datasets/shared/dataset.service.ts b/shanoir-ng-front/src/app/datasets/shared/dataset.service.ts
@@ -23,8 +23,9 @@ import { Page, Pageable } from '../../shared/components/table/pageable.model';
 import * as AppUtils from '../../utils/app.utils';
 import { ServiceLocator } from '../../utils/locator.service';
 import { Dataset } from './dataset.model';
+import { MrDataset } from '../dataset/mr/dataset.mr.model';
 import { DatasetUtils } from './dataset.utils';
-import {DatasetDTO, DatasetDTOService} from "./dataset.dto";
+import {DatasetDTO, MrDatasetDTO, DatasetDTOService} from "./dataset.dto";
 
 @Injectable()
 export class DatasetService extends EntityService<Dataset> implements OnDestroy {
@@ -286,7 +287,13 @@ export class DatasetService extends EntityService<Dataset> implements OnDestroy
     }
 
     public stringify(entity: Dataset) {
-        let dto = new DatasetDTO(entity);
+        let dto;
+        if (entity instanceof MrDataset) {
+            dto = new MrDatasetDTO(entity);
+            dto.updatedMrMetadata = entity.updatedMrMetadata;
+        } else {
+            dto = new DatasetDTO(entity);
+        }
         return JSON.stringify(dto, (key, value) => {
             return this.customReplacer(key, value, dto);
         });