V3_API : delete persons : SSDM-10395 - JavaScript part

js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js

@@ -87,6 +87,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
 		this.RoleAssignmentDeletionOptions = dtos.RoleAssignmentDeletionOptions;
 		this.SemanticAnnotationDeletionOptions = dtos.SemanticAnnotationDeletionOptions;
 		this.QueryDeletionOptions = dtos.QueryDeletionOptions;
+		this.PersonDeletionOptions = dtos.PersonDeletionOptions;
 		this.PersonPermId = dtos.PersonPermId;
 		this.Me = dtos.Me;
 		this.EntityTypePermId = dtos.EntityTypePermId;
@@ -349,6 +350,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
 		this.DeleteOperationExecutionsOperation = dtos.DeleteOperationExecutionsOperation;
 		this.DeleteSemanticAnnotationsOperation = dtos.DeleteSemanticAnnotationsOperation;
 		this.DeleteQueriesOperation = dtos.DeleteQueriesOperation;
+		this.DeletePersonsOperation = dtos.DeletePersonsOperation;
 
 		this.RevertDeletionsOperation = dtos.RevertDeletionsOperation;
 		this.ConfirmDeletionsOperation = dtos.ConfirmDeletionsOperation;
@@ -1055,6 +1057,13 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
 			return facade.deleteQueries([ id ], options);
 		}.bind(this);
 
+		this.deletePerson = function(facade, id) {
+			var c = this;
+			var options = new dtos.PersonDeletionOptions();
+			options.setReason("test reason");
+			return facade.deletePersons([ id ], options);
+		}.bind(this);
+
 		this.getObjectProperty = function(object, propertyName) {
 			var propertyNames = propertyName.split('.');
 			for ( var pn in propertyNames) {

js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js

@@ -430,6 +430,9 @@ var sources = [
 	'as/dto/person/create/PersonCreation',
 	'as/dto/person/create/CreatePersonsOperation',
 	'as/dto/person/create/CreatePersonsOperationResult',
+	'as/dto/person/delete/DeletePersonsOperation',
+	'as/dto/person/delete/DeletePersonsOperationResult',
+	'as/dto/person/delete/PersonDeletionOptions',
 	'as/dto/person/get/GetPersonsOperation',
 	'as/dto/person/get/GetPersonsOperationResult',
 	'as/dto/person/id/Me',

js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js

@@ -568,6 +568,10 @@ define([ 'jquery', 'openbis', 'test/common' ], function($, openbis, common) {
 			return this._executeDeleteOperation(new c.DeleteQueriesOperation(ids, deletionOptions));
 		}
 
+		this.deletePersons = function(ids, deletionOptions) {
+			return this._executeDeleteOperation(new c.DeletePersonsOperation(ids, deletionOptions));
+		}
+
 		this.searchDeletions = function(criteria, fetchOptions) {
 			return this._executeSearchOperation(new c.SearchDeletionsOperation(criteria, fetchOptions));
 		}

js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js

@@ -307,6 +307,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
 			testDeleteWithoutTrash(c, c.createQuery, c.findQuery, c.deleteQuery);
 		});
 
+		QUnit.test("deletePersons()", function(assert) {
+			var c = new common(assert, openbis);
+			testDeleteWithoutTrash(c, c.createPerson, c.findPerson, c.deletePerson);
+		});
+
 	}
 
 	return function() {

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/delete/DeletePersonsOperation.js

+define(['stjs', 'as/dto/common/delete/DeleteObjectsOperation'], function (
+  stjs,
+  DeleteObjectsOperation
+) {
+  var DeletePersonsOperation = function (objectIds, options) {
+    DeleteObjectsOperation.call(this, objectIds, options)
+  }
+  stjs.extend(
+    DeletePersonsOperation,
+    DeleteObjectsOperation,
+    [DeleteObjectsOperation],
+    function (constructor, prototype) {
+      prototype['@type'] = 'as.dto.person.delete.DeletePersonsOperation'
+      prototype.getMessage = function () {
+        return 'DeletePersonsOperation'
+      }
+    },
+    {}
+  )
+  return DeletePersonsOperation
+})

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/delete/DeletePersonsOperationResult.js

+define([
+  'stjs',
+  'as/dto/common/delete/DeleteObjectsWithoutTrashOperationResult'
+], function (stjs, DeleteObjectsWithoutTrashOperationResult) {
+  var DeletePersonsOperationResult = function () {
+    DeleteObjectsWithoutTrashOperationResult.call(this)
+  }
+  stjs.extend(
+    DeletePersonsOperationResult,
+    DeleteObjectsWithoutTrashOperationResult,
+    [DeleteObjectsWithoutTrashOperationResult],
+    function (constructor, prototype) {
+      prototype['@type'] = 'as.dto.person.delete.DeletePersonsOperationResult'
+      prototype.getMessage = function () {
+        return 'DeletePersonsOperationResult'
+      }
+    },
+    {}
+  )
+  return DeletePersonsOperationResult
+})

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/person/delete/PersonDeletionOptions.js

+define(['stjs', 'as/dto/deletion/AbstractObjectDeletionOptions'], function (
+  stjs,
+  AbstractObjectDeletionOptions
+) {
+  var PersonDeletionOptions = function () {
+    AbstractObjectDeletionOptions.call(this)
+  }
+  stjs.extend(
+    PersonDeletionOptions,
+    AbstractObjectDeletionOptions,
+    [AbstractObjectDeletionOptions],
+    function (constructor, prototype) {
+      prototype['@type'] = 'as.dto.person.delete.PersonDeletionOptions'
+      constructor.serialVersionUID = 1
+    },
+    {}
+  )
+  return PersonDeletionOptions
+})

openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js

@@ -1882,6 +1882,17 @@ define([ 'jquery', 'util/Json', 'as/dto/datastore/search/DataStoreSearchCriteria
 			});
 		}
 
+		this.deletePersons = function(ids, deletionOptions) {
+			var thisFacade = this;
+			return thisFacade._private.ajaxRequest({
+				url : openbisUrl,
+				data : {
+					"method" : "deletePersons",
+					"params" : [ thisFacade._private.sessionToken, ids, deletionOptions ]
+				}
+			});
+		}
+
 		this.searchDeletions = function(criteria, fetchOptions) {
 			var thisFacade = this;
 			return thisFacade._private.ajaxRequest({