diff --git a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java index a7f5a0de6..79056815a 100644 --- a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java +++ b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java @@ -63,7 +63,7 @@ public class LocalizedString implements Serializable { /** * The localised values of the string. */ - @ElementCollection(fetch = FetchType.EAGER) + @ElementCollection(fetch = FetchType.LAZY) @MapKeyColumn(name = "LOCALE") @Column(name = "LOCALIZED_VALUE") @Basic diff --git a/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java b/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java index 1dfe4121f..0cb9e6f6c 100644 --- a/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java +++ b/ccm-core/src/main/java/org/libreccm/sites/SiteAwareApplication.java @@ -36,7 +36,7 @@ import javax.persistence.Table; * * Only applications which are different for each site should extend this class. * For example for the Admin application or the Content Center application - * provided by the ccm-cms module it makes to sense to make them site aware. + * provided by the ccm-cms module it makes no sense to make them site aware. * This applications are used to manage objects which are shared by all sites. * Other applications like the Pages application provided by ccm-cms module are * of course site aware. The Pages application for example manages the page tree diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java index 128b2e9cc..8e9f557f9 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java @@ -142,6 +142,7 @@ public class CategoryManagerTest { .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addAsLibraries(getModuleDependencies()) @@ -197,16 +198,23 @@ public class CategoryManagerTest { * adds an object to a category. */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( + excludeColumns = { + "categorization_id", + "uuid" + }, + orderBy = { + "categorizations.object_order" + }, value = "datasets/org/libreccm/categorization/CategoryManagerTest/" - + "after-add-obj-to-category.yml", - excludeColumns = {"categorization_id"}) + + "after-add-obj-to-category.yml" + ) @InSequence(1100) public void addObjectToCategoryBySystemUser() { - final Optional object2 = ccmObjectRepo.findById(-3200L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object2 = ccmObjectRepo.findById(3200L); + final Optional foo = categoryRepo.findById(2100L); assertThat(object2.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -220,16 +228,23 @@ public class CategoryManagerTest { * domain to the categories works. */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/categorization/CategoryManagerTest/" - + "after-add-obj-to-category.yml", - excludeColumns = {"categorization_id"}) + excludeColumns = { + "categorization_id", + "uuid" + }, + orderBy = { + "categorizations.categorization_id" + }, + value = "datasets/org/libreccm/categorization/CategoryManagerTest" + + "/after-add-obj-to-category.yml" + ) @InSequence(1200) public void addObjectToCategoryAuthByDomain() { - final Optional object2 = ccmObjectRepo.findById(-3200L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object2 = ccmObjectRepo.findById(3200L); + final Optional foo = categoryRepo.findById(2100L); assertThat(object2.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -249,16 +264,23 @@ public class CategoryManagerTest { * categories. */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/categorization/CategoryManagerTest/" - + "after-add-obj-to-category.yml", - excludeColumns = {"categorization_id"}) + excludeColumns = { + "categorization_id", + "uuid" + }, + orderBy = { + "categorizations.categorization_id" + }, + value = "datasets/org/libreccm/categorization/CategoryManagerTest" + + "/after-add-obj-to-category.yml" + ) @InSequence(1300) public void addObjectToCategoryAuthByCategory() { - final Optional object2 = ccmObjectRepo.findById(-3200L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object2 = ccmObjectRepo.findById(3200L); + final Optional foo = categoryRepo.findById(2100L); assertThat(object2.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -283,8 +305,8 @@ public class CategoryManagerTest { @ShouldThrowException(UnauthorizedException.class) @InSequence(1400) public void addObjectToCategoryNotAuthorized() { - final Optional object2 = ccmObjectRepo.findById(-3200L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object2 = ccmObjectRepo.findById(3200L); + final Optional foo = categoryRepo.findById(2100L); assertThat(object2.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -311,8 +333,8 @@ public class CategoryManagerTest { public void removeObjectFromCategoryBySystemUser() throws ObjectNotAssignedToCategoryException { - final Optional object1 = ccmObjectRepo.findById(-3100L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object1 = ccmObjectRepo.findById(3300L); + final Optional foo = categoryRepo.findById(2200L); assertThat(object1.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -344,8 +366,8 @@ public class CategoryManagerTest { public void removeObjectFromCategoryAuthByDomain() throws ObjectNotAssignedToCategoryException { - final Optional object1 = ccmObjectRepo.findById(-3100L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object1 = ccmObjectRepo.findById(3300L); + final Optional foo = categoryRepo.findById(2200L); assertThat(object1.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -370,18 +392,20 @@ public class CategoryManagerTest { * @throws ObjectNotAssignedToCategoryException */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/categorization/CategoryManagerTest/" - + "after-remove-obj-from-category.yml", - excludeColumns = {"categorization_id"}) + excludeColumns = { + }, + value = "datasets/org/libreccm/categorization/CategoryManagerTest" + + "/after-remove-obj-from-category.yml" + ) @InSequence(2200) public void removeObjectFromCategoryAuthByCategory() throws ObjectNotAssignedToCategoryException { - final Optional object1 = ccmObjectRepo.findById(-3100L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object1 = ccmObjectRepo.findById(3300L); + final Optional foo = categoryRepo.findById(2200L); assertThat(object1.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -411,8 +435,8 @@ public class CategoryManagerTest { public void removeObjectFromCategoryNotAuthorized() throws ObjectNotAssignedToCategoryException { - final Optional object1 = ccmObjectRepo.findById(-3100L); - final Optional foo = categoryRepo.findById(-2100L); + final Optional object1 = ccmObjectRepo.findById(3100L); + final Optional foo = categoryRepo.findById(2100L); assertThat(object1.isPresent(), is(true)); assertThat(foo.isPresent(), is(true)); @@ -444,7 +468,7 @@ public class CategoryManagerTest { query.setParameter("name", "category-new"); final Category sub = query.getSingleResult(); - final Optional foo = categoryRepo.findById(-2100L); + final Optional foo = categoryRepo.findById(2100L); shiro.getSystemUser().execute( () -> categoryManager.addSubCategoryToCategory(sub, foo.get())); @@ -475,7 +499,7 @@ public class CategoryManagerTest { query.setParameter("name", "category-new"); final Category sub = query.getSingleResult(); - final Optional foo = categoryRepo.findById(-2100L); + final Optional foo = categoryRepo.findById(2100L); final UsernamePasswordToken token = new UsernamePasswordToken( "jane.doe@example.org", "foo123"); @@ -492,12 +516,16 @@ public class CategoryManagerTest { * set of the category. */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/categorization/" - + "CategoryManagerTest/after-add-subcategory.yml", - excludeColumns = {"object_id", "uuid"}) + excludeColumns = { + "object_id", + "uuid" + }, + value = "datasets/org/libreccm/categorization" + + "/CategoryManagerTest/after-add-subcategory.yml" + ) @InSequence(3000) public void addSubCategoryToCategoryAuthByCategory() { final Category category = new Category(); @@ -512,7 +540,7 @@ public class CategoryManagerTest { query.setParameter("name", "category-new"); final Category sub = query.getSingleResult(); - final Optional foo = categoryRepo.findById(-2100L); + final Optional foo = categoryRepo.findById(2100L); final UsernamePasswordToken token = new UsernamePasswordToken( "mmuster@example.com", "foo123"); @@ -548,7 +576,7 @@ public class CategoryManagerTest { query.setParameter("name", "category-new"); final Category sub = query.getSingleResult(); - final Optional foo = categoryRepo.findById(-2100L); + final Optional foo = categoryRepo.findById(2100L); categoryManager.addSubCategoryToCategory(sub, foo.get()); } @@ -566,8 +594,8 @@ public class CategoryManagerTest { excludeColumns = {"categorization_id", "object_id"}) @InSequence(4000) public void removeSubCategoryFromCategoryBySystemUser() { - final Optional foo = categoryRepo.findById(-2100L); - final Optional bar = categoryRepo.findById(-2200L); + final Optional foo = categoryRepo.findById(2100L); + final Optional bar = categoryRepo.findById(2200L); shiro.getSystemUser().execute( () -> categoryManager.removeSubCategoryFromCategory(bar.get(), @@ -588,8 +616,8 @@ public class CategoryManagerTest { excludeColumns = {"categorization_id", "object_id"}) @InSequence(4000) public void removeSubCategoryFromCategoryAuthByDomain() { - final Optional foo = categoryRepo.findById(-2100L); - final Optional bar = categoryRepo.findById(-2200L); + final Optional foo = categoryRepo.findById(2100L); + final Optional bar = categoryRepo.findById(2200L); final UsernamePasswordToken token = new UsernamePasswordToken( "jane.doe@example.org", "foo123"); @@ -614,8 +642,8 @@ public class CategoryManagerTest { excludeColumns = {"categorization_id", "object_id"}) @InSequence(4000) public void removeSubCategoryFromCategoryAuthByCategory() { - final Optional foo = categoryRepo.findById(-2100L); - final Optional bar = categoryRepo.findById(-2200L); + final Optional foo = categoryRepo.findById(2100L); + final Optional bar = categoryRepo.findById(2200L); final UsernamePasswordToken token = new UsernamePasswordToken( "mmuster@example.com", "foo123"); @@ -639,8 +667,8 @@ public class CategoryManagerTest { @ShouldThrowException(UnauthorizedException.class) @InSequence(4000) public void removeSubCategoryFromCategoryNotAuthorized() { - final Optional foo = categoryRepo.findById(-2100L); - final Optional bar = categoryRepo.findById(-2200L); + final Optional foo = categoryRepo.findById(2100L); + final Optional bar = categoryRepo.findById(2200L); categoryManager.removeSubCategoryFromCategory(bar.get(), foo.get()); } @@ -650,12 +678,20 @@ public class CategoryManagerTest { * created without saving each category after the creation of each category. */ @Test - @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest/" - + "data.yml") + @UsingDataSet("datasets/org/libreccm/categorization/CategoryManagerTest" + + "/data.yml") @ShouldMatchDataSet( + excludeColumns = { + "object_id", + "parent_category_id", + "uuid" + }, + orderBy = { + "categorizations.category_order" + }, value = "datasets/org/libreccm/categorization/CategoryManagerTest/" - + "after-create-multiple-categories.yml", - excludeColumns = {"object_id", "uuid"}) + + "after-create-multiple-categories.yml" + ) @InSequence(5000) public void createMultipleCategories() { @@ -703,8 +739,8 @@ public class CategoryManagerTest { + "data.yml") @InSequence(6000) public void hasIndexObject() { - final Optional category1 = categoryRepo.findById(-2100L); - final Optional category2 = categoryRepo.findById(-2200L); + final Optional category1 = categoryRepo.findById(2100L); + final Optional category2 = categoryRepo.findById(2200L); assertThat(categoryManager.hasIndexObject(category1.get()), is(false)); assertThat(categoryManager.hasIndexObject(category2.get()), is(true)); @@ -712,15 +748,16 @@ public class CategoryManagerTest { /** * Tries to retrieve the index object from several categories and verifies - * that the expected object is returned by null {@link CategoryManager#getIndexObject(org.libreccm.categorization.Category). + * that the expected object is returned by null null null null null null + * null null {@link CategoryManager#getIndexObject(org.libreccm.categorization.Category). */ @Test @UsingDataSet( "datasets/org/libreccm/categorization/CategoryManagerTest/data.yml") @InSequence(6500) public void getIndexObject() { - final Optional category1 = categoryRepo.findById(-2100L); - final Optional category2 = categoryRepo.findById(-2200L); + final Optional category1 = categoryRepo.findById(2100L); + final Optional category2 = categoryRepo.findById(2200L); assertThat(categoryManager .getIndexObject(category1.get()) @@ -749,7 +786,7 @@ public class CategoryManagerTest { public void retrieveMultipleLazyCollections() { assertThat(controller, is(not(nullValue()))); - final Map> data = controller.getData(-2100L); + final Map> data = controller.getData(2100L); final List subCategories = data.get("subCategories"); final List objects = data.get("objects"); diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql index 47ae5789a..fec017b80 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql @@ -38,4 +38,4 @@ DELETE FROM ccm_core.ccm_objects_aud; DELETE FROM ccm_core.ccm_revisions; -ALTER SEQUENCE hibernate_sequence RESTART WITH 1; \ No newline at end of file +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; \ No newline at end of file diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql index c9af1d06e..bf8206760 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql @@ -830,7 +830,7 @@ drop sequence if exists HIBERNATE_SEQUENCE; alter table CCM_CORE.WORKFLOWS add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID); -create sequence hibernate_sequence start with 1 increment by 1; +create sequence hibernate_sequence start with 100000 increment by 1; alter table CCM_CORE.APPLICATIONS add constraint FKatcp9ij6mbkx0nfeig1o6n3lm diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql index 5aae4a469..47ea97cb5 100644 --- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql +++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql @@ -38,4 +38,4 @@ DELETE FROM ccm_core.ccm_objects_aud; DELETE FROM ccm_core.ccm_revisions; -ALTER SEQUENCE hibernate_sequence RESTART; \ No newline at end of file +ALTER SEQUENCE hibernate_sequence RESTART with 100000; \ No newline at end of file diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql index 5fbd3e0df..fd967ab0a 100644 --- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql @@ -830,7 +830,7 @@ create schema CCM_CORE; alter table CCM_CORE.WORKFLOWS add constraint UK_o113id7d1cxql0edsrohlnn9x unique (UUID); -create sequence hibernate_sequence start 1 increment 1; +create sequence hibernate_sequence start 100000 increment 1; alter table CCM_CORE.APPLICATIONS add constraint FKatcp9ij6mbkx0nfeig1o6n3lm diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml index c6ccd8821..c8b3a884b 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml @@ -1,77 +1,77 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false - - categorization_id: -10100 + - categorization_id: 10100 uuid: 50780558-5851-4eb2-8398-460173507a1b - category_id: -2200 - object_id: -3300 + category_id: 2200 + object_id: 3300 category_order: 1 object_order: 1 category_index: true - - categorization_id: -10200 + - categorization_id: 10200 uuid: 05014503-0763-41e3-883c-461721beee6f - object_id: -3200 - category_id: -2100 + object_id: 3200 + category_id: 2100 category_order: 1 object_order: 2 category_index: false \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-subcategory.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-subcategory.yml index f42fb5e63..ab0254ea1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-subcategory.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-subcategory.yml @@ -1,81 +1,81 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 - - object_id: -2300 + - object_id: 2300 display_name: category-new uuid: d9c8ad5d-0450-4d81-be25-721188710880 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2300 + - object_id: 2300 unique_id: catnew name: category-new - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 2 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false - - categorization_id: -10100 + - categorization_id: 10100 uuid: 50780558-5851-4eb2-8398-460173507a1b - category_id: -2200 - object_id: -3300 + category_id: 2200 + object_id: 3300 category_order: 1 object_order: 1 category_index: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-create-multiple-categories.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-create-multiple-categories.yml index 7167e4c11..a5096b2b8 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-create-multiple-categories.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-create-multiple-categories.yml @@ -1,23 +1,23 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 - object_id: 1 @@ -34,25 +34,25 @@ ccm_core.ccm_objects: uuid: 59aa434c-0220-4841-bf3f-f58d311607aa ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false @@ -60,7 +60,7 @@ ccm_core.categories: - object_id: 1 unique_id: com name: com - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false @@ -91,24 +91,24 @@ ccm_core.categories: category_order: 1 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false - - categorization_id: -10100 + - categorization_id: 10100 uuid: 50780558-5851-4eb2-8398-460173507a1b - category_id: -2200 - object_id: -3300 + category_id: 2200 + object_id: 3300 category_order: 1 object_order: 1 category_index: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-obj-from-category.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-obj-from-category.yml index b76f40837..010cb8ad9 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-obj-from-category.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-obj-from-category.yml @@ -1,63 +1,63 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-subcategory.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-subcategory.yml index 3f5383da2..cc41a2748 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-subcategory.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-remove-subcategory.yml @@ -1,43 +1,43 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar enabled: true @@ -46,24 +46,24 @@ ccm_core.categories: category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false - - categorization_id: -10100 + - categorization_id: 10100 uuid: 50780558-5851-4eb2-8398-460173507a1b - category_id: -2200 - object_id: -3300 + category_id: 2200 + object_id: 3300 category_order: 1 object_order: 1 category_index: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml index f14ad81db..1480ae2f3 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml @@ -1,87 +1,87 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: 3b7c7685-340b-48d2-8f27-781a04833634 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 35a74731-d700-431a-b0cf-6d548f3d77c9 - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: 6b5e0a4b-6a09-4108-ac43-f46b59bc2bc6 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 0482f4e1-d1f0-44a1-8bef-2b978e00e9a8 - - object_id: -3100 + - object_id: 3100 display_name: object1 uuid: b82ea94b-875b-46b1-9078-40e457f25868 - - object_id: -3200 + - object_id: 3200 display_name: object2 uuid: 06a838e5-d396-49e4-bcf2-1dabed441406 - - object_id: -3300 + - object_id: 3300 display_name: object3 uuid: 95f03070-9ea1-4e33-8e1b-8108075aac28 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.categorizations: - - categorization_id: -10000 + - categorization_id: 10000 uuid: 5ace8dbb-2e8a-4bf6-932a-22591be326bf - category_id: -2100 - object_id: -3100 + category_id: 2100 + object_id: 3100 object_order: 1 category_order: 1 category_index: false - - categorization_id: -10100 + - categorization_id: 10100 uuid: 50780558-5851-4eb2-8398-460173507a1b - category_id: -2200 - object_id: -3300 + category_id: 2200 + object_id: 3300 category_order: 1 object_order: 1 category_index: true ccm_core.parties: - - party_id: -3000 + - party_id: 3000 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: public-user - - party_id: -3100 + - party_id: 3100 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: jdoe - - party_id: -3200 + - party_id: 3200 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: mmuster ccm_core.users: - - party_id: -3000 + - party_id: 3000 given_name: public family_name: user email_address: public-user@localhost @@ -89,7 +89,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -3100 + - party_id: 3100 given_name: Jane family_name: Doe email_address: jane.doe@example.org @@ -99,7 +99,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -3200 + - party_id: 3200 given_name: Maria family_name: Muster email_address: mmuster@example.com @@ -111,87 +111,87 @@ ccm_core.users: password_reset_required: false ccm_core.ccm_roles: - - role_id: -4000 + - role_id: 4000 uuid: cb07e4f7-9a77-41e8-af1a-eed318aed596 name: domain_test_category_manager - - role_id: -4100 + - role_id: 4100 uuid: e9d4bb0a-7218-4ecb-a759-d1623b2d5c00 name: category_foo_manager ccm_core.role_memberships: - - membership_id: -5000 + - membership_id: 5000 uuid: a62fab65-94e0-463b-8d51-6f7585e2417c - role_id: -4000 - member_id: -3100 + role_id: 4000 + member_id: 3100 - membership_id: 5100 uuid: 8fb7b7cc-fe04-4986-93de-73132b94e2fa - role_id: -4100 - member_id: -3200 + role_id: 4100 + member_id: 3200 ccm_core.permissions: - - permission_id: -6000 + - permission_id: 6000 uuid: 1f9cd01d-b04f-4cb8-83b7-502a53b442c9 granted_privilege: manage_category - grantee_id: -4000 - object_id: -2000 + grantee_id: 4000 + object_id: 2000 inherited: false - - permission_id: -6010 + - permission_id: 6010 uuid: 964ab653-eadf-4c69-b4cb-d90e9834bb81 granted_privilege: manage_category - grantee_id: -4000 - object_id: -2100 + grantee_id: 4000 + object_id: 2100 inherited: true - inherited_from_id: -2000 - - permission_id: -6020 + inherited_from_id: 2000 + - permission_id: 6020 uuid: c44261af-6522-418d-b7c5-ae3b3dcb02a3 granted_privilege: manage_category - grantee_id: -4000 - object_id: -2200 + grantee_id: 4000 + object_id: 2200 inherited: true - inherited_from_id: -2000 - - permission_id: -6100 + inherited_from_id: 2000 + - permission_id: 6100 uuid: 8aa98e4d-6fa9-411b-bcb0-3e51bba63a5b granted_privilege: manage_category_objects - grantee_id: -4000 - object_id: -2000 + grantee_id: 4000 + object_id: 2000 inherited: false - - permission_id: -6110 + - permission_id: 6110 uuid: 89fe50b0-6f59-4dfd-8520-f9059ad9d629 granted_privilege: manage_category_objects - grantee_id: -4000 - object_id: -2100 + grantee_id: 4000 + object_id: 2100 inherited: true - inherited_from_id: -2000 - - permission_id: -6120 + inherited_from_id: 2000 + - permission_id: 6120 uuid: 052ea99f-a0de-4d8b-aebd-69ad9680f921 granted_privilege: manage_category_objects - grantee_id: -4000 - object_id: -2200 + grantee_id: 4000 + object_id: 2200 inherited: true - inherited_from_id: -2000 - - permission_id: -6200 + inherited_from_id: 2000 + - permission_id: 6200 uuid: daf465e7-bfb3-4847-a5f8-2c985f20cbb8 granted_privilege: manage_category - grantee_id: -4100 - object_id: -2100 + grantee_id: 4100 + object_id: 2100 inherited: false - - permission_id: -6210 + - permission_id: 6210 uuid: 23424b24-fa6f-4e2c-86f6-6c10c4342dd7 granted_privilege: manage_category - grantee_id: -4100 - object_id: -2200 + grantee_id: 4100 + object_id: 2200 inherited: true - inherited_from_id: -2100 - - permission_id: -6300 + inherited_from_id: 2100 + - permission_id: 6300 uuid: 1b58b9ab-7c8a-402f-9fe5-d5f4af8dfa00 granted_privilege: manage_category_objects - grantee_id: -4100 - object_id: -2100 + grantee_id: 4100 + object_id: 2100 inherited: false - - permission_id: -6310 + - permission_id: 6310 uuid: 9aafe40c-ce25-4344-bc3f-144a0457191a granted_privilege: manage_category_objects - grantee_id: -4100 - object_id: -2200 + grantee_id: 4100 + object_id: 2200 inherited: true - inherited_from_id: -2100 \ No newline at end of file + inherited_from_id: 2100 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml index ea34b3286..6f9d67e4d 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/after-save-new-category.yml @@ -1,45 +1,45 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: d76c9183-5558-4ca6-bd56-3cdd8bdadad6 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 1d533dba-08f2-4d65-948a-3bba953dabab - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: a83d238a-1df7-4b54-a886-a93f4e816888 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 7fd42bcd-c49f-4d8a-be1c-fd88f2e9a7c0 - - object_id: -2300 + - object_id: 2300 display_name: new-category uuid: dfe81433-de5c-47f2-aaf6-5013636211ee ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2300 + - object_id: 2300 unique_id: new0001 name: new-category enabled: true @@ -48,25 +48,25 @@ ccm_core.categories: category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.parties: - - party_id: -100 + - party_id: 100 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: public-user - - party_id: -200 + - party_id: 200 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: jdoe - - party_id: -300 + - party_id: 300 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: mmuster ccm_core.users: - - party_id: -100 + - party_id: 100 given_name: public family_name: user email_address: public-user@localhost @@ -74,7 +74,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -200 + - party_id: 200 given_name: John family_name: Doe email_address: john.doe@example.org @@ -83,7 +83,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -300 + - party_id: 300 given_name: Max family_name: Mustermann email_address: max.mustermann@example.org @@ -94,33 +94,33 @@ ccm_core.users: password_reset_required: false ccm_core.ccm_roles: - - role_id: -500 + - role_id: 500 uuid: 420f5f60-18a6-4dbe-9160-c730bbe18f45 name: category_manager - - role_id: -510 + - role_id: 510 uuid: 0aeea94d-3d8e-4a50-807b-e3c857038e22 name: category_manager_domain_test ccm_core.role_memberships: - - membership_id: -600 + - membership_id: 600 uuid: 59bfad40-2bd1-4ddd-91cf-60c51724e29c - role_id: -500 - member_id: -200 - - membership_id: -610 + role_id: 500 + member_id: 200 + - membership_id: 610 uuid: 192024a9-0489-44a0-940f-725b5579a52d - role_id: -510 - member_id: -300 + role_id: 510 + member_id: 300 ccm_core.permissions: - - permission_id: -700 + - permission_id: 700 uuid: 70e8b64c-505d-48bd-b196-36c10ed2321a granted_privilege: manage_category - grantee_id: -500 + grantee_id: 500 inherited: false - - permission_id: -710 + - permission_id: 710 uuid: 1a798119-a4a4-477b-8092-4423d7185e1b granted_privilege: manage_category - grantee_id: -510 - object_id: -1000 + grantee_id: 510 + object_id: 1000 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml index 88ad4122c..4ddeeaae6 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryRepositoryTest/data.yml @@ -1,62 +1,62 @@ ccm_core.ccm_objects: - - object_id: -1000 + - object_id: 1000 display_name: test uuid: d76c9183-5558-4ca6-bd56-3cdd8bdadad6 - - object_id: -2000 + - object_id: 2000 display_name: test_root uuid: 1d533dba-08f2-4d65-948a-3bba953dabab - - object_id: -2100 + - object_id: 2100 display_name: foo uuid: a83d238a-1df7-4b54-a886-a93f4e816888 - - object_id: -2200 + - object_id: 2200 display_name: bar uuid: 7fd42bcd-c49f-4d8a-be1c-fd88f2e9a7c0 ccm_core.categories: - - object_id: -2000 + - object_id: 2000 unique_id: test0001 name: test-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2100 + - object_id: 2100 unique_id: test0002 name: foo - parent_category_id: -2000 + parent_category_id: 2000 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -2200 + - object_id: 2200 unique_id: test0003 name: bar - parent_category_id: -2100 + parent_category_id: 2100 enabled: true visible: true abstract_category: false category_order: 0 ccm_core.category_domains: - - object_id: -1000 + - object_id: 1000 domain_key: test - root_category_id: -2000 + root_category_id: 2000 uri: http://libreccm.org/test version: 1.0 ccm_core.parties: - - party_id: -100 + - party_id: 100 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: public-user - - party_id: -200 + - party_id: 200 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: jdoe - - party_id: -300 + - party_id: 300 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: mmuster ccm_core.users: - - party_id: -100 + - party_id: 100 given_name: public family_name: user email_address: public-user@localhost @@ -64,7 +64,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -200 + - party_id: 200 given_name: John family_name: Doe email_address: john.doe@example.org @@ -73,7 +73,7 @@ ccm_core.users: bouncing: false verified: true password_reset_required: false - - party_id: -300 + - party_id: 300 given_name: Max family_name: Mustermann email_address: max.mustermann@example.org @@ -84,32 +84,32 @@ ccm_core.users: password_reset_required: false ccm_core.ccm_roles: - - role_id: -500 + - role_id: 500 uuid: 420f5f60-18a6-4dbe-9160-c730bbe18f45 name: category_manager - - role_id: -510 + - role_id: 510 uuid: 0aeea94d-3d8e-4a50-807b-e3c857038e22 name: category_manager_domain_test ccm_core.role_memberships: - - membership_id: -600 + - membership_id: 600 uuid: 59bfad40-2bd1-4ddd-91cf-60c51724e29c - role_id: -500 - member_id: -200 - - membership_id: -610 + role_id: 500 + member_id: 200 + - membership_id: 610 uuid: 192024a9-0489-44a0-940f-725b5579a52d - role_id: -510 - member_id: -300 + role_id: 510 + member_id: 300 ccm_core.permissions: - - permission_id: -700 + - permission_id: 700 uuid: 70e8b64c-505d-48bd-b196-36c10ed2321a granted_privilege: manage_category - grantee_id: -500 + grantee_id: 500 inherited: false - - permission_id: -710 + - permission_id: 710 uuid: 1a798119-a4a4-477b-8092-4423d7185e1b granted_privilege: manage_category - grantee_id: -510 - object_id: -1000 + grantee_id: 510 + object_id: 1000 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml index 5f2a4e83f..b530a3645 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml @@ -1,38 +1,38 @@ ccm_core.settings: - - setting_id: -3100 + - setting_id: 3100 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: price dtype: BigDecimalSetting setting_value_big_decimal: 109.99 - - setting_id: -3200 + - setting_id: 3200 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: enabled dtype: BooleanSetting setting_value_boolean: true - - setting_id: -3300 + - setting_id: 3300 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: minTemperature dtype: DoubleSetting setting_value_double: 23.5 - - setting_id: -3400 + - setting_id: 3400 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: itemsPerPage dtype: LongSetting setting_value_long: 30 - - setting_id: -3500 + - setting_id: 3500 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: helpUrl dtype: StringSetting setting_value_string: http://www.example.org - - setting_id: -3600 + - setting_id: 3600 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: languages dtype: EnumSetting ccm_core.settings_enum_values: - - enum_id: -3600 + - enum_id: 3600 value: de - - enum_id: -3600 + - enum_id: 3600 value: en - - enum_id: -3600 + - enum_id: 3600 value: es diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml index 7a65b6886..4aa273f12 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml @@ -1,46 +1,46 @@ ccm_core.settings: - - setting_id: -3100 + - setting_id: 3100 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: price dtype: BigDecimalSetting setting_value_big_decimal: 98.99 - - setting_id: -3200 + - setting_id: 3200 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: enabled dtype: BooleanSetting setting_value_boolean: true - - setting_id: -3300 + - setting_id: 3300 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: minTemperature dtype: DoubleSetting setting_value_double: 23.5 - - setting_id: -3400 + - setting_id: 3400 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: itemsPerPage dtype: LongSetting setting_value_long: 20 - - setting_id: -3500 + - setting_id: 3500 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: helpUrl dtype: StringSetting setting_value_string: http://www.example.org - - setting_id: -3600 + - setting_id: 3600 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: languages dtype: EnumSetting - - setting_id: -4000 + - setting_id: 4000 configuration_class: com.example.TestConfiguration name: enabled dtype: BooleanSetting setting_value_boolean: false - - setting_id: -4100 + - setting_id: 4100 configuration_class: com.example.TestConfiguration name: itemsPerPage dtype: LongSetting setting_value_long: 40 ccm_core.settings_enum_values: - - enum_id: -3600 + - enum_id: 3600 value: de - - enum_id: -3600 + - enum_id: 3600 value: en diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml index a808ef083..3fa375fc9 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml @@ -1,36 +1,36 @@ ccm_core.settings: - - setting_id: -3100 + - setting_id: 3100 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: price dtype: BigDecimalSetting setting_value_big_decimal: 98.99 - - setting_id: -3200 + - setting_id: 3200 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: enabled dtype: BooleanSetting setting_value_boolean: true - - setting_id: -3300 + - setting_id: 3300 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: minTemperature dtype: DoubleSetting setting_value_double: 23.5 - - setting_id: -3400 + - setting_id: 3400 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: itemsPerPage dtype: LongSetting setting_value_long: 20 - - setting_id: -3500 + - setting_id: 3500 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: helpUrl dtype: StringSetting setting_value_string: http://www.example.org - - setting_id: -3600 + - setting_id: 3600 configuration_class: org.libreccm.configuration.TestExampleConfiguration name: languages dtype: EnumSetting ccm_core.settings_enum_values: - - enum_id: -3600 + - enum_id: 3600 value: de - - enum_id: -3600 + - enum_id: 3600 value: en diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.json index 622b83cef..e60f62fdc 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.json @@ -2,12 +2,12 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1", "uuid": "14c5303e-19b7-4710-939d-7e7d5eeef155" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3", "uuid": "6ad52a5f-31a1-4686-affc-c36741e7e949" } diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml index bb7296d17..cf0512e0d 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml @@ -1,7 +1,7 @@ ccm_core.ccm_objects: - - object_id: -10 + - object_id: 10 display_name: Test Object 1 uuid: 14c5303e-19b7-4710-939d-7e7d5eeef155 - - object_id: -30 + - object_id: 30 display_name: Test Object 3 uuid: 6ad52a5f-31a1-4686-affc-c36741e7e949 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json index ed14aea8c..e03fa4225 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json @@ -2,17 +2,17 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1", "uuid": "14c5303e-19b7-4710-939d-7e7d5eeef155" }, { - "object_id": -20, + "object_id": 20, "display_name": "Second Test Object", "uuid": "921bc481-cd82-4138-9791-6df2cfbbebde" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3", "uuid": "6ad52a5f-31a1-4686-affc-c36741e7e949" } diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml index fa3ec6df9..078d208a2 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml @@ -1,10 +1,10 @@ ccm_core.ccm_objects: - - object_id: -10 + - object_id: 10 display_name: Test Object 1 uuid: 14c5303e-19b7-4710-939d-7e7d5eeef155 - - object_id: -20 + - object_id: 20 display_name: Second Test Object uuid: 921bc481-cd82-4138-9791-6df2cfbbebde - - object_id: -30 + - object_id: 30 display_name: Test Object 3 uuid: 6ad52a5f-31a1-4686-affc-c36741e7e949 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.json index 082973223..bfc2b9ca6 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.json @@ -2,22 +2,22 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1", "uuid": "14c5303e-19b7-4710-939d-7e7d5eeef155" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2", "uuid": "921bc481-cd82-4138-9791-6df2cfbbebde" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3", "uuid": "6ad52a5f-31a1-4686-affc-c36741e7e949" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4", "uuid": "a82338aa-a73f-41d2-bf8c-10bedb405a72" } diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml index 739c4e39d..3fb2e0415 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml @@ -1,13 +1,13 @@ ccm_core.ccm_objects: - - object_id: -10 + - object_id: 10 display_name: Test Object 1 uuid: 14c5303e-19b7-4710-939d-7e7d5eeef155 - - object_id: -20 + - object_id: 20 display_name: Test Object 2 uuid: 921bc481-cd82-4138-9791-6df2cfbbebde - - object_id: -30 + - object_id: 30 display_name: Test Object 3 uuid: 6ad52a5f-31a1-4686-affc-c36741e7e949 - - object_id: -40 + - object_id: 40 display_name: Test Object 4 uuid: a82338aa-a73f-41d2-bf8c-10bedb405a72 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json index ef1cd1157..394b9e00e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json @@ -2,17 +2,17 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1", "uuid": "14c5303e-19b7-4710-939d-7e7d5eeef155" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2", "uuid": "921bc481-cd82-4138-9791-6df2cfbbebde" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3", "uuid": "6ad52a5f-31a1-4686-affc-c36741e7e949" } diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml index aebb59052..c478446c7 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml @@ -1,10 +1,10 @@ ccm_core.ccm_objects: - - object_id: -10 + - object_id: 10 display_name: Test Object 1 uuid: 14c5303e-19b7-4710-939d-7e7d5eeef155 - - object_id: -20 + - object_id: 20 display_name: Test Object 2 uuid: 921bc481-cd82-4138-9791-6df2cfbbebde - - object_id: -30 + - object_id: 30 display_name: Test Object 3 uuid: 6ad52a5f-31a1-4686-affc-c36741e7e949 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.json index 43251bf1e..37a14b616 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.json @@ -2,16 +2,16 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.ccm_users": @@ -25,28 +25,28 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true @@ -55,19 +55,19 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -30, - "group_subject_id": -20, - "user_subject_id": -10 + "membership_id": 30, + "group_subject_id": 20, + "user_subject_id": 10 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml index dba188829..43ab6b7dc 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml @@ -1,9 +1,9 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -13,26 +13,26 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -30 - group_subject_id: -20 - user_subject_id: -10 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 30 + group_subject_id: 20 + user_subject_id: 10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.json index aec16788c..ae2909d40 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.json @@ -2,16 +2,16 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.ccm_users": @@ -25,28 +25,28 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true @@ -55,9 +55,9 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml index c2b75f2a5..f998681b6 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml @@ -1,9 +1,9 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -13,20 +13,20 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.json index 34297afc5..3b7bbcaa6 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.json @@ -2,16 +2,16 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.ccm_users": @@ -25,28 +25,28 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true @@ -55,14 +55,14 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml index 95b18a7d8..00ea9107e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml @@ -1,9 +1,9 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -13,23 +13,23 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.json index 4a1d65401..86af9022a 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.json @@ -2,21 +2,21 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -10 + "subject_id": 10 }, { "name": "authors", - "subject_id": -30 + "subject_id": 30 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml index 9789e6cc8..a733ad86f 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml @@ -1,9 +1,9 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -30 +- subject_id: 10 +- subject_id: 30 ccm_core.ccm_groups: - name: admins - subject_id: -10 + subject_id: 10 - name: authors - subject_id: -30 + subject_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.json index 8e394e6b0..8c24c804e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.json @@ -2,28 +2,28 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -10 + "subject_id": 10 }, { "name": "users", - "subject_id": -20 + "subject_id": 20 }, { "name": "editors", - "subject_id": -30 + "subject_id": 30 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml index fc21721b1..af56110e1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml @@ -1,12 +1,12 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 ccm_core.ccm_groups: - name: admins - subject_id: -10 + subject_id: 10 - name: users - subject_id: -20 + subject_id: 20 - name: editors - subject_id: -30 + subject_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.json index ef22391b9..208735141 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.json @@ -2,35 +2,35 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -10 + "subject_id": 10 }, { "name": "users", - "subject_id": -20 + "subject_id": 20 }, { "name": "authors", - "subject_id": -30 + "subject_id": 30 }, { "name": "publishers", - "subject_id": -40 + "subject_id": 40 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml index 4bf701f94..8890d7e96 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml @@ -1,15 +1,15 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 ccm_core.ccm_groups: - name: admins - subject_id: -10 + subject_id: 10 - name: users - subject_id: -20 + subject_id: 20 - name: authors - subject_id: -30 + subject_id: 30 - name: publishers - subject_id: -40 + subject_id: 40 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.json index f5a39c941..a745f9570 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.json @@ -2,28 +2,28 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -10 + "subject_id": 10 }, { "name": "users", - "subject_id": -20 + "subject_id": 20 }, { "name": "authors", - "subject_id": -30 + "subject_id": 30 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml index dee056cc9..e57116426 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml @@ -1,12 +1,12 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 ccm_core.ccm_groups: - name: admins - subject_id: -10 + subject_id: 10 - name: users - subject_id: -20 + subject_id: 20 - name: authors - subject_id: -30 + subject_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.json index e129f044e..e187f42e1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.json @@ -2,72 +2,72 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" }, { - "object_id": -50, + "object_id": 50, "display_name": "Test Object 5" }, { - "object_id": -60, + "object_id": 60, "display_name": "Test Object 6" }, { - "object_id": -70, + "object_id": 70, "display_name": "Test Object 7" }, { - "object_id": -80, + "object_id": 80, "display_name": "Test Object 8" } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" } ], "ccm_core.subjects": [ { - "subject_id": -1 + "subject_id": 1 }, { - "subject_id": -2 + "subject_id": 2 }, { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -81,7 +81,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "webmaster", - "subject_id": -1 + "subject_id": 1 }, { "banned": false, @@ -92,7 +92,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "public-user", - "subject_id": -2 + "subject_id": 2 }, { "banned": false, @@ -103,7 +103,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -114,58 +114,58 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -50 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 50 }, { - "membership_id": -30, - "group_subject_id": -30, - "user_subject_id": -2 + "membership_id": 30, + "group_subject_id": 30, + "user_subject_id": 2 }, { - "membership_id": -40, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 40, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -50, - "group_subject_id": -30, - "user_subject_id": -50 + "membership_id": 50, + "group_subject_id": 30, + "user_subject_id": 50 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -174,146 +174,146 @@ "ccm_core.permissions": [ { - "permission_id": -10, - "grantee_id": -1, - "granted_privilege_id": -10 + "permission_id": 10, + "grantee_id": 1, + "granted_privilege_id": 10 }, { - "permission_id": -20, - "grantee_id": -2, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 20, + "grantee_id": 2, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -30, - "grantee_id": -10, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 30, + "grantee_id": 10, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -40, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 40, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -50, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -30 + "permission_id": 50, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 30 }, { - "permission_id": -60, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 60, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -80, - "grantee_id": -30, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 80, + "grantee_id": 30, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -90, - "grantee_id": -30, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 90, + "grantee_id": 30, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -100, - "grantee_id": -30, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 100, + "grantee_id": 30, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -110, - "grantee_id": -30, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 110, + "grantee_id": 30, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -120, - "grantee_id": -30, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 120, + "grantee_id": 30, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -130, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 130, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -140, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 140, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -150, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 150, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -160, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 160, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -170, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 170, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -180, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -30 + "permission_id": 180, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 30 }, { - "permission_id": -190, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -30 + "permission_id": 190, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 30 }, { - "permission_id": -200, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -30 + "permission_id": 200, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 30 }, { - "permission_id": -220, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -30 + "permission_id": 220, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 30 }, { - "permission_id": -230, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -30 + "permission_id": 230, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 30 }, { - "permission_id": -250, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 250, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -260, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -30 + "permission_id": 260, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 30 }, { - "permission_id": -270, - "grantee_id": -10, - "granted_privilege_id": -20 + "permission_id": 270, + "grantee_id": 10, + "granted_privilege_id": 20 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml index 2b8579143..257d2a406 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml @@ -1,35 +1,35 @@ --- ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 -- object_id: -50 +- object_id: 50 display_name: Test Object 5 -- object_id: -60 +- object_id: 60 display_name: Test Object 6 -- object_id: -70 +- object_id: 70 display_name: Test Object 7 -- object_id: -80 +- object_id: 80 display_name: Test Object 8 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write ccm_core.subjects: -- subject_id: -1 -- subject_id: -2 -- subject_id: -10 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 1 +- subject_id: 2 +- subject_id: 10 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -39,7 +39,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: webmaster - subject_id: -1 + subject_id: 1 - banned: false hash_algorithm: SHA-512 family_name: public-user @@ -48,7 +48,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: public-user - subject_id: -2 + subject_id: 2 - banned: false hash_algorithm: SHA-512 family_name: Doe @@ -57,7 +57,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -66,129 +66,129 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -50 -- membership_id: -30 - group_subject_id: -30 - user_subject_id: -2 -- membership_id: -40 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -50 - group_subject_id: -30 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 50 +- membership_id: 30 + group_subject_id: 30 + user_subject_id: 2 +- membership_id: 40 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 50 + group_subject_id: 30 + user_subject_id: 50 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.permissions: -- permission_id: -10 - grantee_id: -1 - granted_privilege_id: -10 -- permission_id: -20 - grantee_id: -2 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -30 - grantee_id: -10 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -40 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -50 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -30 -- permission_id: -60 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -80 - grantee_id: -30 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -90 - grantee_id: -30 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -100 - grantee_id: -30 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -110 - grantee_id: -30 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -120 - grantee_id: -30 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -130 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -140 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -150 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -160 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -170 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -180 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -30 -- permission_id: -190 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -30 -- permission_id: -200 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -30 -- permission_id: -220 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -30 -- permission_id: -230 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -30 -- permission_id: -250 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -260 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -30 -- permission_id: -270 - grantee_id: -10 - granted_privilege_id: -20 +- permission_id: 10 + grantee_id: 1 + granted_privilege_id: 10 +- permission_id: 20 + grantee_id: 2 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 30 + grantee_id: 10 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 40 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 50 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 30 +- permission_id: 60 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 80 + grantee_id: 30 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 90 + grantee_id: 30 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 100 + grantee_id: 30 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 110 + grantee_id: 30 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 120 + grantee_id: 30 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 130 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 140 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 150 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 160 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 170 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 180 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 30 +- permission_id: 190 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 30 +- permission_id: 200 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 30 +- permission_id: 220 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 30 +- permission_id: 230 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 30 +- permission_id: 250 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 260 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 30 +- permission_id: 270 + grantee_id: 10 + granted_privilege_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.json index f252930ba..f27abbd04 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.json @@ -2,72 +2,72 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" }, { - "object_id": -50, + "object_id": 50, "display_name": "Test Object 5" }, { - "object_id": -60, + "object_id": 60, "display_name": "Test Object 6" }, { - "object_id": -70, + "object_id": 70, "display_name": "Test Object 7" }, { - "object_id": -80, + "object_id": 80, "display_name": "Test Object 8" } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" } ], "ccm_core.subjects": [ { - "subject_id": -1 + "subject_id": 1 }, { - "subject_id": -2 + "subject_id": 2 }, { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -81,7 +81,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "webmaster", - "subject_id": -1 + "subject_id": 1 }, { "banned": false, @@ -92,7 +92,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "public-user", - "subject_id": -2 + "subject_id": 2 }, { "banned": false, @@ -103,7 +103,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -114,58 +114,58 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -50 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 50 }, { - "membership_id": -30, - "group_subject_id": -30, - "user_subject_id": -2 + "membership_id": 30, + "group_subject_id": 30, + "user_subject_id": 2 }, { - "membership_id": -40, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 40, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -50, - "group_subject_id": -30, - "user_subject_id": -50 + "membership_id": 50, + "group_subject_id": 30, + "user_subject_id": 50 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -174,159 +174,159 @@ "ccm_core.permissions": [ { - "permission_id": -10, - "grantee_id": -1, - "granted_privilege_id": -10 + "permission_id": 10, + "grantee_id": 1, + "granted_privilege_id": 10 }, { - "permission_id": -20, - "grantee_id": -2, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 20, + "grantee_id": 2, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -30, - "grantee_id": -10, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 30, + "grantee_id": 10, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -40, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 40, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -50, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -30 + "permission_id": 50, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 30 }, { - "permission_id": -60, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 60, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -80, - "grantee_id": -30, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 80, + "grantee_id": 30, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -90, - "grantee_id": -30, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 90, + "grantee_id": 30, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -100, - "grantee_id": -30, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 100, + "grantee_id": 30, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -110, - "grantee_id": -30, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 110, + "grantee_id": 30, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -120, - "grantee_id": -30, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 120, + "grantee_id": 30, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -130, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 130, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -140, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 140, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -150, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 150, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -160, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 160, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -170, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 170, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -180, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -30 + "permission_id": 180, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 30 }, { - "permission_id": -190, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -30 + "permission_id": 190, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 30 }, { - "permission_id": -200, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -30 + "permission_id": 200, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 30 }, { - "permission_id": -220, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -30 + "permission_id": 220, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 30 }, { - "permission_id": -230, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -30 + "permission_id": 230, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 30 }, { - "permission_id": -250, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 250, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -260, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -30 + "permission_id": 260, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 30 }, { - "permission_id": -270, - "grantee_id": -10, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 270, + "grantee_id": 10, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -280, - "grantee_id": -50, - "object_id": -70, - "granted_privilege_id": -20 + "permission_id": 280, + "grantee_id": 50, + "object_id": 70, + "granted_privilege_id": 20 }, { - "permission_id": -290, - "grantee_id": -50, - "object_id": -70, - "granted_privilege_id": -30 + "permission_id": 290, + "grantee_id": 50, + "object_id": 70, + "granted_privilege_id": 30 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml index 2c4546f0d..1980b09f2 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml @@ -1,35 +1,35 @@ --- ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 -- object_id: -50 +- object_id: 50 display_name: Test Object 5 -- object_id: -60 +- object_id: 60 display_name: Test Object 6 -- object_id: -70 +- object_id: 70 display_name: Test Object 7 -- object_id: -80 +- object_id: 80 display_name: Test Object 8 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write ccm_core.subjects: -- subject_id: -1 -- subject_id: -2 -- subject_id: -10 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 1 +- subject_id: 2 +- subject_id: 10 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -39,7 +39,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: webmaster - subject_id: -1 + subject_id: 1 - banned: false hash_algorithm: SHA-512 family_name: public-user @@ -48,7 +48,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: public-user - subject_id: -2 + subject_id: 2 - banned: false hash_algorithm: SHA-512 family_name: Doe @@ -57,7 +57,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -66,138 +66,138 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -50 -- membership_id: -30 - group_subject_id: -30 - user_subject_id: -2 -- membership_id: -40 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -50 - group_subject_id: -30 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 50 +- membership_id: 30 + group_subject_id: 30 + user_subject_id: 2 +- membership_id: 40 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 50 + group_subject_id: 30 + user_subject_id: 50 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.permissions: -- permission_id: -10 - grantee_id: -1 - granted_privilege_id: -10 -- permission_id: -20 - grantee_id: -2 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -30 - grantee_id: -10 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -40 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -50 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -30 -- permission_id: -60 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -80 - grantee_id: -30 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -90 - grantee_id: -30 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -100 - grantee_id: -30 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -110 - grantee_id: -30 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -120 - grantee_id: -30 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -130 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -140 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -150 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -160 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -170 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -180 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -30 -- permission_id: -190 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -30 -- permission_id: -200 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -30 -- permission_id: -220 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -30 -- permission_id: -230 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -30 -- permission_id: -250 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -260 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -30 -- permission_id: -270 - grantee_id: -10 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -280 - grantee_id: -50 - object_id: -70 - granted_privilege_id: -20 -- permission_id: -290 - grantee_id: -50 - object_id: -70 - granted_privilege_id: -30 +- permission_id: 10 + grantee_id: 1 + granted_privilege_id: 10 +- permission_id: 20 + grantee_id: 2 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 30 + grantee_id: 10 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 40 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 50 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 30 +- permission_id: 60 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 80 + grantee_id: 30 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 90 + grantee_id: 30 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 100 + grantee_id: 30 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 110 + grantee_id: 30 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 120 + grantee_id: 30 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 130 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 140 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 150 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 160 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 170 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 180 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 30 +- permission_id: 190 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 30 +- permission_id: 200 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 30 +- permission_id: 220 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 30 +- permission_id: 230 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 30 +- permission_id: 250 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 260 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 30 +- permission_id: 270 + grantee_id: 10 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 280 + grantee_id: 50 + object_id: 70 + granted_privilege_id: 20 +- permission_id: 290 + grantee_id: 50 + object_id: 70 + granted_privilege_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.json index 10f4168dc..277a29ffe 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.json @@ -2,72 +2,72 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" }, { - "object_id": -50, + "object_id": 50, "display_name": "Test Object 5" }, { - "object_id": -60, + "object_id": 60, "display_name": "Test Object 6" }, { - "object_id": -70, + "object_id": 70, "display_name": "Test Object 7" }, { - "object_id": -80, + "object_id": 80, "display_name": "Test Object 8" } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" } ], "ccm_core.subjects": [ { - "subject_id": -1 + "subject_id": 1 }, { - "subject_id": -2 + "subject_id": 2 }, { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -81,7 +81,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "webmaster", - "subject_id": -1 + "subject_id": 1 }, { "banned": false, @@ -92,7 +92,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "public-user", - "subject_id": -2 + "subject_id": 2 }, { "banned": false, @@ -103,7 +103,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -114,58 +114,58 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -50 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 50 }, { - "membership_id": -30, - "group_subject_id": -30, - "user_subject_id": -2 + "membership_id": 30, + "group_subject_id": 30, + "user_subject_id": 2 }, { - "membership_id": -40, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 40, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -50, - "group_subject_id": -30, - "user_subject_id": -50 + "membership_id": 50, + "group_subject_id": 30, + "user_subject_id": 50 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -174,129 +174,129 @@ "ccm_core.permissions": [ { - "permission_id": -10, - "grantee_id": -1, - "granted_privilege_id": -10 + "permission_id": 10, + "grantee_id": 1, + "granted_privilege_id": 10 }, { - "permission_id": -20, - "grantee_id": -2, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 20, + "grantee_id": 2, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -40, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 40, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -50, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -30 + "permission_id": 50, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 30 }, { - "permission_id": -60, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 60, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -80, - "grantee_id": -30, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 80, + "grantee_id": 30, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -90, - "grantee_id": -30, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 90, + "grantee_id": 30, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -100, - "grantee_id": -30, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 100, + "grantee_id": 30, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -110, - "grantee_id": -30, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 110, + "grantee_id": 30, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -120, - "grantee_id": -30, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 120, + "grantee_id": 30, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -130, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 130, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -140, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 140, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -150, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 150, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -160, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 160, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -170, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 170, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -180, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -30 + "permission_id": 180, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 30 }, { - "permission_id": -190, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -30 + "permission_id": 190, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 30 }, { - "permission_id": -200, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -30 + "permission_id": 200, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 30 }, { - "permission_id": -220, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -30 + "permission_id": 220, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 30 }, { - "permission_id": -230, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -30 + "permission_id": 230, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 30 }, { - "permission_id": -250, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 250, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml index 6f40885dc..33b99005c 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml @@ -1,35 +1,35 @@ --- ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 -- object_id: -50 +- object_id: 50 display_name: Test Object 5 -- object_id: -60 +- object_id: 60 display_name: Test Object 6 -- object_id: -70 +- object_id: 70 display_name: Test Object 7 -- object_id: -80 +- object_id: 80 display_name: Test Object 8 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write ccm_core.subjects: -- subject_id: -1 -- subject_id: -2 -- subject_id: -10 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 1 +- subject_id: 2 +- subject_id: 10 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -39,7 +39,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: webmaster - subject_id: -1 + subject_id: 1 - banned: false hash_algorithm: SHA-512 family_name: public-user @@ -48,7 +48,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: public-user - subject_id: -2 + subject_id: 2 - banned: false hash_algorithm: SHA-512 family_name: Doe @@ -57,7 +57,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -66,118 +66,118 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -50 -- membership_id: -30 - group_subject_id: -30 - user_subject_id: -2 -- membership_id: -40 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -50 - group_subject_id: -30 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 50 +- membership_id: 30 + group_subject_id: 30 + user_subject_id: 2 +- membership_id: 40 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 50 + group_subject_id: 30 + user_subject_id: 50 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.permissions: -- permission_id: -10 - grantee_id: -1 - granted_privilege_id: -10 -- permission_id: -20 - grantee_id: -2 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -40 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -50 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -30 -- permission_id: -60 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -80 - grantee_id: -30 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -90 - grantee_id: -30 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -100 - grantee_id: -30 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -110 - grantee_id: -30 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -120 - grantee_id: -30 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -130 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -140 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -150 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -160 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -170 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -180 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -30 -- permission_id: -190 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -30 -- permission_id: -200 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -30 -- permission_id: -220 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -30 -- permission_id: -230 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -30 -- permission_id: -250 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 +- permission_id: 10 + grantee_id: 1 + granted_privilege_id: 10 +- permission_id: 20 + grantee_id: 2 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 40 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 50 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 30 +- permission_id: 60 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 80 + grantee_id: 30 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 90 + grantee_id: 30 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 100 + grantee_id: 30 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 110 + grantee_id: 30 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 120 + grantee_id: 30 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 130 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 140 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 150 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 160 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 170 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 180 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 30 +- permission_id: 190 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 30 +- permission_id: 200 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 30 +- permission_id: 220 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 30 +- permission_id: 230 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 30 +- permission_id: 250 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.json index b08a26242..3912e6d6a 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.json @@ -2,72 +2,72 @@ "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" }, { - "object_id": -50, + "object_id": 50, "display_name": "Test Object 5" }, { - "object_id": -60, + "object_id": 60, "display_name": "Test Object 6" }, { - "object_id": -70, + "object_id": 70, "display_name": "Test Object 7" }, { - "object_id": -80, + "object_id": 80, "display_name": "Test Object 8" } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" } ], "ccm_core.subjects": [ { - "subject_id": -1 + "subject_id": 1 }, { - "subject_id": -2 + "subject_id": 2 }, { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -81,7 +81,7 @@ "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "password_reset_required": false, "screen_name": "webmaster", - "subject_id": -1 + "subject_id": 1 }, { "banned": false, @@ -92,7 +92,7 @@ "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "password_reset_required": false, "screen_name": "public-user", - "subject_id": -2 + "subject_id": 2 }, { "banned": false, @@ -103,7 +103,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -114,58 +114,58 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -50 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 50 }, { - "membership_id": -30, - "group_subject_id": -30, - "user_subject_id": -2 + "membership_id": 30, + "group_subject_id": 30, + "user_subject_id": 2 }, { - "membership_id": -40, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 40, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -50, - "group_subject_id": -30, - "user_subject_id": -50 + "membership_id": 50, + "group_subject_id": 30, + "user_subject_id": 50 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -174,141 +174,141 @@ "ccm_core.permissions": [ { - "permission_id": -10, - "grantee_id": -1, - "granted_privilege_id": -10 + "permission_id": 10, + "grantee_id": 1, + "granted_privilege_id": 10 }, { - "permission_id": -20, - "grantee_id": -2, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 20, + "grantee_id": 2, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -30, - "grantee_id": -10, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 30, + "grantee_id": 10, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -40, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -20 + "permission_id": 40, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 20 }, { - "permission_id": -50, - "grantee_id": -50, - "object_id": -50, - "granted_privilege_id": -30 + "permission_id": 50, + "grantee_id": 50, + "object_id": 50, + "granted_privilege_id": 30 }, { - "permission_id": -60, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 60, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -80, - "grantee_id": -30, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 80, + "grantee_id": 30, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -90, - "grantee_id": -30, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 90, + "grantee_id": 30, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -100, - "grantee_id": -30, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 100, + "grantee_id": 30, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -110, - "grantee_id": -30, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 110, + "grantee_id": 30, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -120, - "grantee_id": -30, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 120, + "grantee_id": 30, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -130, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -20 + "permission_id": 130, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 20 }, { - "permission_id": -140, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -20 + "permission_id": 140, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 20 }, { - "permission_id": -150, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -20 + "permission_id": 150, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 20 }, { - "permission_id": -160, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -20 + "permission_id": 160, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 20 }, { - "permission_id": -170, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -20 + "permission_id": 170, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 20 }, { - "permission_id": -180, - "grantee_id": -40, - "object_id": -10, - "granted_privilege_id": -30 + "permission_id": 180, + "grantee_id": 40, + "object_id": 10, + "granted_privilege_id": 30 }, { - "permission_id": -190, - "grantee_id": -40, - "object_id": -20, - "granted_privilege_id": -30 + "permission_id": 190, + "grantee_id": 40, + "object_id": 20, + "granted_privilege_id": 30 }, { - "permission_id": -200, - "grantee_id": -40, - "object_id": -30, - "granted_privilege_id": -30 + "permission_id": 200, + "grantee_id": 40, + "object_id": 30, + "granted_privilege_id": 30 }, { - "permission_id": -220, - "grantee_id": -40, - "object_id": -40, - "granted_privilege_id": -30 + "permission_id": 220, + "grantee_id": 40, + "object_id": 40, + "granted_privilege_id": 30 }, { - "permission_id": -230, - "grantee_id": -40, - "object_id": -80, - "granted_privilege_id": -30 + "permission_id": 230, + "grantee_id": 40, + "object_id": 80, + "granted_privilege_id": 30 }, { - "permission_id": -250, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -20 + "permission_id": 250, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 20 }, { - "permission_id": -260, - "grantee_id": -50, - "object_id": -60, - "granted_privilege_id": -30 + "permission_id": 260, + "grantee_id": 50, + "object_id": 60, + "granted_privilege_id": 30 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml index 3c8b93f73..6f1584c53 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml @@ -1,35 +1,35 @@ --- ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 -- object_id: -50 +- object_id: 50 display_name: Test Object 5 -- object_id: -60 +- object_id: 60 display_name: Test Object 6 -- object_id: -70 +- object_id: 70 display_name: Test Object 7 -- object_id: -80 +- object_id: 80 display_name: Test Object 8 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write ccm_core.subjects: -- subject_id: -1 -- subject_id: -2 -- subject_id: -10 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 1 +- subject_id: 2 +- subject_id: 10 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -39,7 +39,7 @@ ccm_core.ccm_users: salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== password_reset_required: false screen_name: webmaster - subject_id: -1 + subject_id: 1 - banned: false hash_algorithm: SHA-512 family_name: public-user @@ -48,7 +48,7 @@ ccm_core.ccm_users: salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== password_reset_required: false screen_name: public-user - subject_id: -2 + subject_id: 2 - banned: false hash_algorithm: SHA-512 family_name: Doe @@ -57,7 +57,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -66,126 +66,126 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -50 -- membership_id: -30 - group_subject_id: -30 - user_subject_id: -2 -- membership_id: -40 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -50 - group_subject_id: -30 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 50 +- membership_id: 30 + group_subject_id: 30 + user_subject_id: 2 +- membership_id: 40 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 50 + group_subject_id: 30 + user_subject_id: 50 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.permissions: -- permission_id: -10 - grantee_id: -1 - granted_privilege_id: -10 -- permission_id: -20 - grantee_id: -2 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -30 - grantee_id: -10 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -40 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -20 -- permission_id: -50 - grantee_id: -50 - object_id: -50 - granted_privilege_id: -30 -- permission_id: -60 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -80 - grantee_id: -30 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -90 - grantee_id: -30 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -100 - grantee_id: -30 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -110 - grantee_id: -30 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -120 - grantee_id: -30 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -130 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -20 -- permission_id: -140 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -20 -- permission_id: -150 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -20 -- permission_id: -160 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -20 -- permission_id: -170 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -20 -- permission_id: -180 - grantee_id: -40 - object_id: -10 - granted_privilege_id: -30 -- permission_id: -190 - grantee_id: -40 - object_id: -20 - granted_privilege_id: -30 -- permission_id: -200 - grantee_id: -40 - object_id: -30 - granted_privilege_id: -30 -- permission_id: -220 - grantee_id: -40 - object_id: -40 - granted_privilege_id: -30 -- permission_id: -230 - grantee_id: -40 - object_id: -80 - granted_privilege_id: -30 -- permission_id: -250 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -20 -- permission_id: -260 - grantee_id: -50 - object_id: -60 - granted_privilege_id: -30 +- permission_id: 10 + grantee_id: 1 + granted_privilege_id: 10 +- permission_id: 20 + grantee_id: 2 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 30 + grantee_id: 10 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 40 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 20 +- permission_id: 50 + grantee_id: 50 + object_id: 50 + granted_privilege_id: 30 +- permission_id: 60 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 80 + grantee_id: 30 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 90 + grantee_id: 30 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 100 + grantee_id: 30 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 110 + grantee_id: 30 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 120 + grantee_id: 30 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 130 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 20 +- permission_id: 140 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 20 +- permission_id: 150 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 20 +- permission_id: 160 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 20 +- permission_id: 170 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 20 +- permission_id: 180 + grantee_id: 40 + object_id: 10 + granted_privilege_id: 30 +- permission_id: 190 + grantee_id: 40 + object_id: 20 + granted_privilege_id: 30 +- permission_id: 200 + grantee_id: 40 + object_id: 30 + granted_privilege_id: 30 +- permission_id: 220 + grantee_id: 40 + object_id: 40 + granted_privilege_id: 30 +- permission_id: 230 + grantee_id: 40 + object_id: 80 + granted_privilege_id: 30 +- permission_id: 250 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 20 +- permission_id: 260 + grantee_id: 50 + object_id: 60 + granted_privilege_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.json index 44180e6a6..2842c88e9 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.json @@ -2,19 +2,19 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -28,7 +28,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -39,34 +39,34 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -75,87 +75,87 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -30, - "group_subject_id": -20, - "user_subject_id": -50 + "membership_id": 30, + "group_subject_id": 20, + "user_subject_id": 50 } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" }, { - "privilege_id": -40, + "privilege_id": 40, "label": "unused" } ], "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" } ], "ccm_core.permissions": [ { - "permission_id": -10, + "permission_id": 10, "creation_date": "2015-07-29 14:32:46", - "granted_privilege_id": -10, - "grantee_id": -20 + "granted_privilege_id": 10, + "grantee_id": 20 }, { - "permission_id": -20, + "permission_id": 20, "creation_date": "2015-07-29 14:34:30", - "granted_privilege_id": -20, - "grantee_id": -30, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 30, + "object_id": 10 }, { - "permission_id": -30, + "permission_id": 30, "creation_date": "2015-07-29 14:36:05", - "granted_privilege_id": -30, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 30, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -40, + "permission_id": 40, "creation_date": "2015-07-29 14:37:22", - "granted_privilege_id": -20, - "grantee_id": -10, - "object_id": -20 + "granted_privilege_id": 20, + "grantee_id": 10, + "object_id": 20 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml index b5a04bebb..2aa6c409b 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml @@ -1,10 +1,10 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -23,68 +23,68 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -30 - group_subject_id: -20 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 30 + group_subject_id: 20 + user_subject_id: 50 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write -- privilege_id: -40 +- privilege_id: 40 label: unused ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 ccm_core.permissions: -- permission_id: -10 +- permission_id: 10 creation_date: '2015-07-29 14:32:46' - granted_privilege_id: -10 - grantee_id: -20 -- permission_id: -20 + granted_privilege_id: 10 + grantee_id: 20 +- permission_id: 20 creation_date: '2015-07-29 14:34:30' - granted_privilege_id: -20 - grantee_id: -30 - object_id: -10 -- permission_id: -30 + granted_privilege_id: 20 + grantee_id: 30 + object_id: 10 +- permission_id: 30 creation_date: '2015-07-29 14:36:05' - granted_privilege_id: -30 - grantee_id: -40 - object_id: -10 -- permission_id: -40 + granted_privilege_id: 30 + grantee_id: 40 + object_id: 10 +- permission_id: 40 creation_date: '2015-07-29 14:37:22' - granted_privilege_id: -20 - grantee_id: -10 - object_id: -20 + granted_privilege_id: 20 + grantee_id: 10 + object_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.json index 6b1bcce35..301badc5e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.json @@ -2,19 +2,19 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -28,7 +28,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -39,34 +39,34 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -75,94 +75,94 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -30, - "group_subject_id": -20, - "user_subject_id": -50 + "membership_id": 30, + "group_subject_id": 20, + "user_subject_id": 50 } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" }, { - "privilege_id": -40, + "privilege_id": 40, "label": "unused" } ], "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" } ], "ccm_core.permissions": [ { - "permission_id": -10, + "permission_id": 10, "creation_date": "2015-07-29 14:32:46", - "granted_privilege_id": -10, - "grantee_id": -20 + "granted_privilege_id": 10, + "grantee_id": 20 }, { - "permission_id": -20, + "permission_id": 20, "creation_date": "2015-07-29 14:34:30", - "granted_privilege_id": -20, - "grantee_id": -30, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 30, + "object_id": 10 }, { - "permission_id": -30, + "permission_id": 30, "creation_date": "2015-07-29 14:36:05", - "granted_privilege_id": -30, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 30, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -35, + "permission_id": 35, "creation_date": "2015-07-29 14:57:55", - "granted_privilege_id": -20, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -40, + "permission_id": 40, "creation_date": "2015-07-29 14:37:22", - "granted_privilege_id": -20, - "grantee_id": -30, - "object_id": -20 + "granted_privilege_id": 20, + "grantee_id": 30, + "object_id": 20 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml index f1313d937..9f187f69c 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml @@ -1,10 +1,10 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -23,73 +23,73 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -30 - group_subject_id: -20 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 30 + group_subject_id: 20 + user_subject_id: 50 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write -- privilege_id: -40 +- privilege_id: 40 label: unused ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 ccm_core.permissions: -- permission_id: -10 +- permission_id: 10 creation_date: '2015-07-29 14:32:46' - granted_privilege_id: -10 - grantee_id: -20 -- permission_id: -20 + granted_privilege_id: 10 + grantee_id: 20 +- permission_id: 20 creation_date: '2015-07-29 14:34:30' - granted_privilege_id: -20 - grantee_id: -30 - object_id: -10 -- permission_id: -30 + granted_privilege_id: 20 + grantee_id: 30 + object_id: 10 +- permission_id: 30 creation_date: '2015-07-29 14:36:05' - granted_privilege_id: -30 - grantee_id: -40 - object_id: -10 -- permission_id: -35 + granted_privilege_id: 30 + grantee_id: 40 + object_id: 10 +- permission_id: 35 creation_date: '2015-07-29 14:57:55' - granted_privilege_id: -20 - grantee_id: -40 - object_id: -10 -- permission_id: -40 + granted_privilege_id: 20 + grantee_id: 40 + object_id: 10 +- permission_id: 40 creation_date: '2015-07-29 14:37:22' - granted_privilege_id: -20 - grantee_id: -30 - object_id: -20 + granted_privilege_id: 20 + grantee_id: 30 + object_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.json index c55085efc..e4f4be0db 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.json @@ -2,19 +2,19 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -28,7 +28,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -39,34 +39,34 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -75,106 +75,106 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -30, - "group_subject_id": -20, - "user_subject_id": -50 + "membership_id": 30, + "group_subject_id": 20, + "user_subject_id": 50 } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" }, { - "privilege_id": -40, + "privilege_id": 40, "label": "unused" } ], "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" } ], "ccm_core.permissions": [ { - "permission_id": -10, + "permission_id": 10, "creation_date": "2015-07-29 14:32:46", - "granted_privilege_id": -10, - "grantee_id": -20 + "granted_privilege_id": 10, + "grantee_id": 20 }, { - "permission_id": -20, + "permission_id": 20, "creation_date": "2015-07-29 14:34:30", - "granted_privilege_id": -20, - "grantee_id": -30, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 30, + "object_id": 10 }, { - "permission_id": -30, + "permission_id": 30, "creation_date": "2015-07-29 14:36:05", - "granted_privilege_id": -30, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 30, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -35, + "permission_id": 35, "creation_date": "2015-07-29 14:57:55", - "granted_privilege_id": -20, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -40, + "permission_id": 40, "creation_date": "2015-07-29 14:37:22", - "granted_privilege_id": -20, - "grantee_id": -10, - "object_id": -20 + "granted_privilege_id": 20, + "grantee_id": 10, + "object_id": 20 }, { - "permission_id": -50, - "granted_privilege_id": -20, - "grantee_id": -50, - "object_id": -40 + "permission_id": 50, + "granted_privilege_id": 20, + "grantee_id": 50, + "object_id": 40 }, { - "permission_id": -60, - "granted_privilege_id": -30, - "grantee_id": -50, - "object_id": -40 + "permission_id": 60, + "granted_privilege_id": 30, + "grantee_id": 50, + "object_id": 40 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml index 966dfb0c7..f14ee7189 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml @@ -1,10 +1,10 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -23,81 +23,81 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -30 - group_subject_id: -20 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 30 + group_subject_id: 20 + user_subject_id: 50 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write -- privilege_id: -40 +- privilege_id: 40 label: unused ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 ccm_core.permissions: -- permission_id: -10 +- permission_id: 10 creation_date: '2015-07-29 14:32:46' - granted_privilege_id: -10 - grantee_id: -20 -- permission_id: -20 + granted_privilege_id: 10 + grantee_id: 20 +- permission_id: 20 creation_date: '2015-07-29 14:34:30' - granted_privilege_id: -20 - grantee_id: -30 - object_id: -10 -- permission_id: -30 + granted_privilege_id: 20 + grantee_id: 30 + object_id: 10 +- permission_id: 30 creation_date: '2015-07-29 14:36:05' - granted_privilege_id: -30 - grantee_id: -40 - object_id: -10 -- permission_id: -35 + granted_privilege_id: 30 + grantee_id: 40 + object_id: 10 +- permission_id: 35 creation_date: '2015-07-29 14:57:55' - granted_privilege_id: -20 - grantee_id: -40 - object_id: -10 -- permission_id: -40 + granted_privilege_id: 20 + grantee_id: 40 + object_id: 10 +- permission_id: 40 creation_date: '2015-07-29 14:37:22' - granted_privilege_id: -20 - grantee_id: -10 - object_id: -20 -- permission_id: -50 - granted_privilege_id: -20 - grantee_id: -50 - object_id: -40 -- permission_id: -60 - granted_privilege_id: -30 - grantee_id: -50 - object_id: -40 + granted_privilege_id: 20 + grantee_id: 10 + object_id: 20 +- permission_id: 50 + granted_privilege_id: 20 + grantee_id: 50 + object_id: 40 +- permission_id: 60 + granted_privilege_id: 30 + grantee_id: 50 + object_id: 40 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.json index de6a8ad5a..bbf3f37fe 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.json @@ -2,19 +2,19 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_users": @@ -28,7 +28,7 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -39,34 +39,34 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -50 + "subject_id": 50 } ], "ccm_core.ccm_groups": [ { "name": "admins", - "subject_id": -20 + "subject_id": 20 }, { "name": "users", - "subject_id": -30 + "subject_id": 30 }, { "name": "authors", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -50, + "user_id": 50, "email_address": "max.mustermann@example.com", "bouncing": false, "verified": true @@ -75,94 +75,94 @@ "ccm_core.group_memberships": [ { - "membership_id": -10, - "group_subject_id": -30, - "user_subject_id": -10 + "membership_id": 10, + "group_subject_id": 30, + "user_subject_id": 10 }, { - "membership_id": -20, - "group_subject_id": -40, - "user_subject_id": -10 + "membership_id": 20, + "group_subject_id": 40, + "user_subject_id": 10 }, { - "membership_id": -30, - "group_subject_id": -20, - "user_subject_id": -50 + "membership_id": 30, + "group_subject_id": 20, + "user_subject_id": 50 } ], "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" }, { - "privilege_id": -40, + "privilege_id": 40, "label": "unused" } ], "ccm_core.ccm_objects": [ { - "object_id": -10, + "object_id": 10, "display_name": "Test Object 1" }, { - "object_id": -20, + "object_id": 20, "display_name": "Test Object 2" }, { - "object_id": -30, + "object_id": 30, "display_name": "Test Object 3" }, { - "object_id": -40, + "object_id": 40, "display_name": "Test Object 4" } ], "ccm_core.permissions": [ { - "permission_id": -10, + "permission_id": 10, "creation_date": "2015-07-29 14:32:46", - "granted_privilege_id": -10, - "grantee_id": -20 + "granted_privilege_id": 10, + "grantee_id": 20 }, { - "permission_id": -20, + "permission_id": 20, "creation_date": "2015-07-29 14:34:30", - "granted_privilege_id": -20, - "grantee_id": -30, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 30, + "object_id": 10 }, { - "permission_id": -30, + "permission_id": 30, "creation_date": "2015-07-29 14:36:05", - "granted_privilege_id": -30, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 30, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -35, + "permission_id": 35, "creation_date": "2015-07-29 14:57:55", - "granted_privilege_id": -20, - "grantee_id": -40, - "object_id": -10 + "granted_privilege_id": 20, + "grantee_id": 40, + "object_id": 10 }, { - "permission_id": -40, + "permission_id": 40, "creation_date": "2015-07-29 14:37:22", - "granted_privilege_id": -20, - "grantee_id": -10, - "object_id": -20 + "granted_privilege_id": 20, + "grantee_id": 10, + "object_id": 20 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml index 035787cd6..4a45ea8e4 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml @@ -1,10 +1,10 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -23,73 +23,73 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -50 + subject_id: 50 ccm_core.ccm_groups: - name: admins - subject_id: -20 + subject_id: 20 - name: users - subject_id: -30 + subject_id: 30 - name: authors - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -50 +- user_id: 50 email_address: max.mustermann@example.com bouncing: false verified: true ccm_core.group_memberships: -- membership_id: -10 - group_subject_id: -30 - user_subject_id: -10 -- membership_id: -20 - group_subject_id: -40 - user_subject_id: -10 -- membership_id: -30 - group_subject_id: -20 - user_subject_id: -50 +- membership_id: 10 + group_subject_id: 30 + user_subject_id: 10 +- membership_id: 20 + group_subject_id: 40 + user_subject_id: 10 +- membership_id: 30 + group_subject_id: 20 + user_subject_id: 50 ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write -- privilege_id: -40 +- privilege_id: 40 label: unused ccm_core.ccm_objects: -- object_id: -10 +- object_id: 10 display_name: Test Object 1 -- object_id: -20 +- object_id: 20 display_name: Test Object 2 -- object_id: -30 +- object_id: 30 display_name: Test Object 3 -- object_id: -40 +- object_id: 40 display_name: Test Object 4 ccm_core.permissions: -- permission_id: -10 +- permission_id: 10 creation_date: '2015-07-29 14:32:46' - granted_privilege_id: -10 - grantee_id: -20 -- permission_id: -20 + granted_privilege_id: 10 + grantee_id: 20 +- permission_id: 20 creation_date: '2015-07-29 14:34:30' - granted_privilege_id: -20 - grantee_id: -30 - object_id: -10 -- permission_id: -30 + granted_privilege_id: 20 + grantee_id: 30 + object_id: 10 +- permission_id: 30 creation_date: '2015-07-29 14:36:05' - granted_privilege_id: -30 - grantee_id: -40 - object_id: -10 -- permission_id: -35 + granted_privilege_id: 30 + grantee_id: 40 + object_id: 10 +- permission_id: 35 creation_date: '2015-07-29 14:57:55' - granted_privilege_id: -20 - grantee_id: -40 - object_id: -10 -- permission_id: -40 + granted_privilege_id: 20 + grantee_id: 40 + object_id: 10 +- permission_id: 40 creation_date: '2015-07-29 14:37:22' - granted_privilege_id: -20 - grantee_id: -10 - object_id: -20 + granted_privilege_id: 20 + grantee_id: 10 + object_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.json index 5ce62fde2..9927a94a6 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.json @@ -2,19 +2,19 @@ "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" }, { - "privilege_id": -40, + "privilege_id": 40, "label": "publish" } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml index 4552f5710..a21dc0914 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml @@ -1,10 +1,10 @@ --- ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write -- privilege_id: -40 +- privilege_id: 40 label: publish diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.json index 850c07f41..f263e77db 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.json @@ -2,11 +2,11 @@ "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml index 3b097f8d0..24923dfc3 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml @@ -1,6 +1,6 @@ --- ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.json index 789c0007a..d0413d9c9 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.json @@ -2,15 +2,15 @@ "ccm_core.ccm_privileges": [ { - "privilege_id": -10, + "privilege_id": 10, "label": "admin" }, { - "privilege_id": -20, + "privilege_id": 20, "label": "read" }, { - "privilege_id": -30, + "privilege_id": 30, "label": "write" } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml index fc3950f04..55abf1156 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml @@ -1,8 +1,8 @@ --- ccm_core.ccm_privileges: -- privilege_id: -10 +- privilege_id: 10 label: admin -- privilege_id: -20 +- privilege_id: 20 label: read -- privilege_id: -30 +- privilege_id: 30 label: write diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.json index cb12bfce8..8f17f1759 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.json @@ -2,122 +2,122 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 }, { - "subject_id": -60 + "subject_id": 60 }, { - "subject_id": -70 + "subject_id": 70 }, { - "subject_id": -80 + "subject_id": 80 }, { - "subject_id": -90 + "subject_id": 90 }, { - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_groups": [ { "name": "Site-wide Administrators", - "subject_id": -10 + "subject_id": 10 }, { "name": "info Administration", - "subject_id": -20 + "subject_id": 20 }, { "name": "info Viewers", - "subject_id": -30 + "subject_id": 30 }, { "name": "info Administration Author", - "subject_id": -40 + "subject_id": 40 }, { "name": "info Administration Editor", - "subject_id": -50 + "subject_id": 50 }, { "name": "info Administration Publisher", - "subject_id": -60 + "subject_id": 60 }, { "name": "info Administration Manager", - "subject_id": -70 + "subject_id": 70 }, { "name": "info Administration Trusted User", - "subject_id": -80 + "subject_id": 80 }, { "name": "info Viewers Content Reader", - "subject_id": -90 + "subject_id": 90 }, { "name": "info Administration Alert Recipient", - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_roles": [ { - "role_id": -10, + "role_id": 10, "description": "Creates new content", "name": "Author", - "implicit_group_id": -40, - "source_group_id": -20 + "implicit_group_id": 40, + "source_group_id": 20 }, { - "role_id": -20, + "role_id": 20, "description": "Reviews and approves the author's work", "name": "Editor", - "implicit_group_id": -50, - "source_group_id": -20 + "implicit_group_id": 50, + "source_group_id": 20 }, { - "role_id": -30, + "role_id": 30, "description": "Deploys the content to the web site", "name": "Publisher", - "implicit_group_id": -60, - "source_group_id": -20 + "implicit_group_id": 60, + "source_group_id": 20 }, { - "role_id": -40, + "role_id": 40, "description": "Manages the overall content section", "name": "Manager", - "implicit_group_id": -70, - "source_group_id": -20 + "implicit_group_id": 70, + "source_group_id": 20 }, { - "role_id": -60, + "role_id": 60, "description": "Can view published pages within this section", "name": "Content Reader", - "implicit_group_id": -90, - "source_group_id": -30 + "implicit_group_id": 90, + "source_group_id": 30 }, { - "role_id": -70, + "role_id": 70, "description": "Receive alerts regarding expiration of published content", "name": "Alert Recipient", - "implicit_group_id": -100, - "source_group_id": -30 + "implicit_group_id": 100, + "source_group_id": 30 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml index b0a327cc9..90c76f75b 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml @@ -1,64 +1,64 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 -- subject_id: -60 -- subject_id: -70 -- subject_id: -80 -- subject_id: -90 -- subject_id: -100 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 +- subject_id: 60 +- subject_id: 70 +- subject_id: 80 +- subject_id: 90 +- subject_id: 100 ccm_core.ccm_groups: - name: Site-wide Administrators - subject_id: -10 + subject_id: 10 - name: info Administration - subject_id: -20 + subject_id: 20 - name: info Viewers - subject_id: -30 + subject_id: 30 - name: info Administration Author - subject_id: -40 + subject_id: 40 - name: info Administration Editor - subject_id: -50 + subject_id: 50 - name: info Administration Publisher - subject_id: -60 + subject_id: 60 - name: info Administration Manager - subject_id: -70 + subject_id: 70 - name: info Administration Trusted User - subject_id: -80 + subject_id: 80 - name: info Viewers Content Reader - subject_id: -90 + subject_id: 90 - name: info Administration Alert Recipient - subject_id: -100 + subject_id: 100 ccm_core.ccm_roles: -- role_id: -10 +- role_id: 10 description: Creates new content name: Author - implicit_group_id: -40 - source_group_id: -20 -- role_id: -20 + implicit_group_id: 40 + source_group_id: 20 +- role_id: 20 description: Reviews and approves the author's work name: Editor - implicit_group_id: -50 - source_group_id: -20 -- role_id: -30 + implicit_group_id: 50 + source_group_id: 20 +- role_id: 30 description: Deploys the content to the web site name: Publisher - implicit_group_id: -60 - source_group_id: -20 -- role_id: -40 + implicit_group_id: 60 + source_group_id: 20 +- role_id: 40 description: Manages the overall content section name: Manager - implicit_group_id: -70 - source_group_id: -20 -- role_id: -60 + implicit_group_id: 70 + source_group_id: 20 +- role_id: 60 description: Can view published pages within this section name: Content Reader - implicit_group_id: -90 - source_group_id: -30 -- role_id: -70 + implicit_group_id: 90 + source_group_id: 30 +- role_id: 70 description: Receive alerts regarding expiration of published content name: Alert Recipient - implicit_group_id: -100 - source_group_id: -30 + implicit_group_id: 100 + source_group_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.json index e25ef324e..fb0594465 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.json @@ -2,129 +2,129 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 }, { - "subject_id": -60 + "subject_id": 60 }, { - "subject_id": -70 + "subject_id": 70 }, { - "subject_id": -80 + "subject_id": 80 }, { - "subject_id": -90 + "subject_id": 90 }, { - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_groups": [ { "name": "Site-wide Administrators", - "subject_id": -10 + "subject_id": 10 }, { "name": "info Administration", - "subject_id": -20 + "subject_id": 20 }, { "name": "info Viewers", - "subject_id": -30 + "subject_id": 30 }, { "name": "info Administration Author", - "subject_id": -40 + "subject_id": 40 }, { "name": "info Administration Editor", - "subject_id": -50 + "subject_id": 50 }, { "name": "info Administration Publisher", - "subject_id": -60 + "subject_id": 60 }, { "name": "info Administration Manager", - "subject_id": -70 + "subject_id": 70 }, { "name": "info Administration Trusted User", - "subject_id": -80 + "subject_id": 80 }, { "name": "info Viewers Content Reader", - "subject_id": -90 + "subject_id": 90 }, { "name": "info Administration Alert Recipient", - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_roles": [ { - "role_id": -10, + "role_id": 10, "description": "Creates new content", "name": "Author", - "implicit_group_id": -40, - "source_group_id": -20 + "implicit_group_id": 40, + "source_group_id": 20 }, { - "role_id": -20, + "role_id": 20, "description": "Reviews and approves the author's work", "name": "Editor", - "implicit_group_id": -50, - "source_group_id": -20 + "implicit_group_id": 50, + "source_group_id": 20 }, { - "role_id": -30, + "role_id": 30, "description": "Deploys the content to the web site", "name": "Publisher", - "implicit_group_id": -60, - "source_group_id": -20 + "implicit_group_id": 60, + "source_group_id": 20 }, { - "role_id": -40, + "role_id": 40, "description": "Manages the overall content section", "name": "Manager", - "implicit_group_id": -70, - "source_group_id": -20 + "implicit_group_id": 70, + "source_group_id": 20 }, { - "role_id": -50, + "role_id": 50, "description": "A trusted user is allowed to create and publish items without review", "name": "Trusted User", - "implicit_group_id": -80, - "source_group_id": -20 + "implicit_group_id": 80, + "source_group_id": 20 }, { - "role_id": -60, + "role_id": 60, "description": "Can view published pages within this section", "name": "Reader", - "implicit_group_id": -90, - "source_group_id": -30 + "implicit_group_id": 90, + "source_group_id": 30 }, { - "role_id": -70, + "role_id": 70, "description": "Receive alerts regarding expiration of published content", "name": "Alert Recipient", - "implicit_group_id": -100, - "source_group_id": -30 + "implicit_group_id": 100, + "source_group_id": 30 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml index 0c897b98a..f7df91ede 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml @@ -1,69 +1,69 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 -- subject_id: -60 -- subject_id: -70 -- subject_id: -80 -- subject_id: -90 -- subject_id: -100 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 +- subject_id: 60 +- subject_id: 70 +- subject_id: 80 +- subject_id: 90 +- subject_id: 100 ccm_core.ccm_groups: - name: Site-wide Administrators - subject_id: -10 + subject_id: 10 - name: info Administration - subject_id: -20 + subject_id: 20 - name: info Viewers - subject_id: -30 + subject_id: 30 - name: info Administration Author - subject_id: -40 + subject_id: 40 - name: info Administration Editor - subject_id: -50 + subject_id: 50 - name: info Administration Publisher - subject_id: -60 + subject_id: 60 - name: info Administration Manager - subject_id: -70 + subject_id: 70 - name: info Administration Trusted User - subject_id: -80 + subject_id: 80 - name: info Viewers Content Reader - subject_id: -90 + subject_id: 90 - name: info Administration Alert Recipient - subject_id: -100 + subject_id: 100 ccm_core.ccm_roles: -- role_id: -10 +- role_id: 10 description: Creates new content name: Author - implicit_group_id: -40 - source_group_id: -20 -- role_id: -20 + implicit_group_id: 40 + source_group_id: 20 +- role_id: 20 description: Reviews and approves the author's work name: Editor - implicit_group_id: -50 - source_group_id: -20 -- role_id: -30 + implicit_group_id: 50 + source_group_id: 20 +- role_id: 30 description: Deploys the content to the web site name: Publisher - implicit_group_id: -60 - source_group_id: -20 -- role_id: -40 + implicit_group_id: 60 + source_group_id: 20 +- role_id: 40 description: Manages the overall content section name: Manager - implicit_group_id: -70 - source_group_id: -20 -- role_id: -50 + implicit_group_id: 70 + source_group_id: 20 +- role_id: 50 description: A trusted user is allowed to create and publish items without review name: Trusted User - implicit_group_id: -80 - source_group_id: -20 -- role_id: -60 + implicit_group_id: 80 + source_group_id: 20 +- role_id: 60 description: Can view published pages within this section name: Reader - implicit_group_id: -90 - source_group_id: -30 -- role_id: -70 + implicit_group_id: 90 + source_group_id: 30 +- role_id: 70 description: Receive alerts regarding expiration of published content name: Alert Recipient - implicit_group_id: -100 - source_group_id: -30 + implicit_group_id: 100 + source_group_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.json index e8e4a8d11..2b4ba97d0 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.json @@ -2,136 +2,136 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 }, { - "subject_id": -60 + "subject_id": 60 }, { - "subject_id": -70 + "subject_id": 70 }, { - "subject_id": -80 + "subject_id": 80 }, { - "subject_id": -90 + "subject_id": 90 }, { - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_groups": [ { "name": "Site-wide Administrators", - "subject_id": -10 + "subject_id": 10 }, { "name": "info Administration", - "subject_id": -20 + "subject_id": 20 }, { "name": "info Viewers", - "subject_id": -30 + "subject_id": 30 }, { "name": "info Administration Author", - "subject_id": -40 + "subject_id": 40 }, { "name": "info Administration Editor", - "subject_id": -50 + "subject_id": 50 }, { "name": "info Administration Publisher", - "subject_id": -60 + "subject_id": 60 }, { "name": "info Administration Manager", - "subject_id": -70 + "subject_id": 70 }, { "name": "info Administration Trusted User", - "subject_id": -80 + "subject_id": 80 }, { "name": "info Viewers Content Reader", - "subject_id": -90 + "subject_id": 90 }, { "name": "info Administration Alert Recipient", - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_roles": [ { - "role_id": -10, + "role_id": 10, "description": "Creates new content", "name": "Author", - "implicit_group_id": -40, - "source_group_id": -20 + "implicit_group_id": 40, + "source_group_id": 20 }, { - "role_id": -20, + "role_id": 20, "description": "Reviews and approves the author's work", "name": "Editor", - "implicit_group_id": -50, - "source_group_id": -20 + "implicit_group_id": 50, + "source_group_id": 20 }, { - "role_id": -30, + "role_id": 30, "description": "Deploys the content to the web site", "name": "Publisher", - "implicit_group_id": -60, - "source_group_id": -20 + "implicit_group_id": 60, + "source_group_id": 20 }, { - "role_id": -40, + "role_id": 40, "description": "Manages the overall content section", "name": "Manager", - "implicit_group_id": -70, - "source_group_id": -20 + "implicit_group_id": 70, + "source_group_id": 20 }, { - "role_id": -50, + "role_id": 50, "description": "A trusted user is allowed to create and publish items without review", "name": "Trusted User", - "implicit_group_id": -80, - "source_group_id": -20 + "implicit_group_id": 80, + "source_group_id": 20 }, { - "role_id": -60, + "role_id": 60, "description": "Can view published pages within this section", "name": "Content Reader", - "implicit_group_id": -90, - "source_group_id": -30 + "implicit_group_id": 90, + "source_group_id": 30 }, { - "role_id": -70, + "role_id": 70, "description": "Receive alerts regarding expiration of published content", "name": "Alert Recipient", - "implicit_group_id": -100, - "source_group_id": -30 + "implicit_group_id": 100, + "source_group_id": 30 }, { - "role_id": -80, + "role_id": 80, "description": "New role for testing", "name": "Test", - "implicit_group_id": -20, - "source_group_id": -90 + "implicit_group_id": 20, + "source_group_id": 90 } ] } \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml index 8e8788e56..a4952b11f 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml @@ -1,74 +1,74 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 -- subject_id: -60 -- subject_id: -70 -- subject_id: -80 -- subject_id: -90 -- subject_id: -100 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 +- subject_id: 60 +- subject_id: 70 +- subject_id: 80 +- subject_id: 90 +- subject_id: 100 ccm_core.ccm_groups: - name: Site-wide Administrators - subject_id: -10 + subject_id: 10 - name: info Administration - subject_id: -20 + subject_id: 20 - name: info Viewers - subject_id: -30 + subject_id: 30 - name: info Administration Author - subject_id: -40 + subject_id: 40 - name: info Administration Editor - subject_id: -50 + subject_id: 50 - name: info Administration Publisher - subject_id: -60 + subject_id: 60 - name: info Administration Manager - subject_id: -70 + subject_id: 70 - name: info Administration Trusted User - subject_id: -80 + subject_id: 80 - name: info Viewers Content Reader - subject_id: -90 + subject_id: 90 - name: info Administration Alert Recipient - subject_id: -100 + subject_id: 100 ccm_core.ccm_roles: -- role_id: -10 +- role_id: 10 description: Creates new content name: Author - implicit_group_id: -40 - source_group_id: -20 -- role_id: -20 + implicit_group_id: 40 + source_group_id: 20 +- role_id: 20 description: Reviews and approves the author's work name: Editor - implicit_group_id: -50 - source_group_id: -20 -- role_id: -30 + implicit_group_id: 50 + source_group_id: 20 +- role_id: 30 description: Deploys the content to the web site name: Publisher - implicit_group_id: -60 - source_group_id: -20 -- role_id: -40 + implicit_group_id: 60 + source_group_id: 20 +- role_id: 40 description: Manages the overall content section name: Manager - implicit_group_id: -70 - source_group_id: -20 -- role_id: -50 + implicit_group_id: 70 + source_group_id: 20 +- role_id: 50 description: A trusted user is allowed to create and publish items without review name: Trusted User - implicit_group_id: -80 - source_group_id: -20 -- role_id: -60 + implicit_group_id: 80 + source_group_id: 20 +- role_id: 60 description: Can view published pages within this section name: Content Reader - implicit_group_id: -90 - source_group_id: -30 -- role_id: -70 + implicit_group_id: 90 + source_group_id: 30 +- role_id: 70 description: Receive alerts regarding expiration of published content name: Alert Recipient - implicit_group_id: -100 - source_group_id: -30 -- role_id: -80 + implicit_group_id: 100 + source_group_id: 30 +- role_id: 80 description: New role for testing name: Test - implicit_group_id: -20 - source_group_id: -90 + implicit_group_id: 20 + source_group_id: 90 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.json index fdb4fc8b3..ff0f9b17d 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.json @@ -2,129 +2,129 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 }, { - "subject_id": -50 + "subject_id": 50 }, { - "subject_id": -60 + "subject_id": 60 }, { - "subject_id": -70 + "subject_id": 70 }, { - "subject_id": -80 + "subject_id": 80 }, { - "subject_id": -90 + "subject_id": 90 }, { - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_groups": [ { "name": "Site-wide Administrators", - "subject_id": -10 + "subject_id": 10 }, { "name": "info Administration", - "subject_id": -20 + "subject_id": 20 }, { "name": "info Viewers", - "subject_id": -30 + "subject_id": 30 }, { "name": "info Administration Author", - "subject_id": -40 + "subject_id": 40 }, { "name": "info Administration Editor", - "subject_id": -50 + "subject_id": 50 }, { "name": "info Administration Publisher", - "subject_id": -60 + "subject_id": 60 }, { "name": "info Administration Manager", - "subject_id": -70 + "subject_id": 70 }, { "name": "info Administration Trusted User", - "subject_id": -80 + "subject_id": 80 }, { "name": "info Viewers Content Reader", - "subject_id": -90 + "subject_id": 90 }, { "name": "info Administration Alert Recipient", - "subject_id": -100 + "subject_id": 100 } ], "ccm_core.ccm_roles": [ { - "role_id": -10, + "role_id": 10, "description": "Creates new content", "name": "Author", - "implicit_group_id": -40, - "source_group_id": -20 + "implicit_group_id": 40, + "source_group_id": 20 }, { - "role_id": -20, + "role_id": 20, "description": "Reviews and approves the author's work", "name": "Editor", - "implicit_group_id": -50, - "source_group_id": -20 + "implicit_group_id": 50, + "source_group_id": 20 }, { - "role_id": -30, + "role_id": 30, "description": "Deploys the content to the web site", "name": "Publisher", - "implicit_group_id": -60, - "source_group_id": -20 + "implicit_group_id": 60, + "source_group_id": 20 }, { - "role_id": -40, + "role_id": 40, "description": "Manages the overall content section", "name": "Manager", - "implicit_group_id": -70, - "source_group_id": -20 + "implicit_group_id": 70, + "source_group_id": 20 }, { - "role_id": -50, + "role_id": 50, "description": "A trusted user is allowed to create and publish items without review", "name": "Trusted User", - "implicit_group_id": -80, - "source_group_id": -20 + "implicit_group_id": 80, + "source_group_id": 20 }, { - "role_id": -60, + "role_id": 60, "description": "Can view published pages within this section", "name": "Content Reader", - "implicit_group_id": -90, - "source_group_id": -30 + "implicit_group_id": 90, + "source_group_id": 30 }, { - "role_id": -70, + "role_id": 70, "description": "Receive alerts regarding expiration of published content", "name": "Alert Recipient", - "implicit_group_id": -100, - "source_group_id": -30 + "implicit_group_id": 100, + "source_group_id": 30 } ] diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml index 47bfe8d08..26afa2717 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml @@ -1,69 +1,69 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 -- subject_id: -50 -- subject_id: -60 -- subject_id: -70 -- subject_id: -80 -- subject_id: -90 -- subject_id: -100 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 +- subject_id: 50 +- subject_id: 60 +- subject_id: 70 +- subject_id: 80 +- subject_id: 90 +- subject_id: 100 ccm_core.ccm_groups: - name: Site-wide Administrators - subject_id: -10 + subject_id: 10 - name: info Administration - subject_id: -20 + subject_id: 20 - name: info Viewers - subject_id: -30 + subject_id: 30 - name: info Administration Author - subject_id: -40 + subject_id: 40 - name: info Administration Editor - subject_id: -50 + subject_id: 50 - name: info Administration Publisher - subject_id: -60 + subject_id: 60 - name: info Administration Manager - subject_id: -70 + subject_id: 70 - name: info Administration Trusted User - subject_id: -80 + subject_id: 80 - name: info Viewers Content Reader - subject_id: -90 + subject_id: 90 - name: info Administration Alert Recipient - subject_id: -100 + subject_id: 100 ccm_core.ccm_roles: -- role_id: -10 +- role_id: 10 description: Creates new content name: Author - implicit_group_id: -40 - source_group_id: -20 -- role_id: -20 + implicit_group_id: 40 + source_group_id: 20 +- role_id: 20 description: Reviews and approves the author's work name: Editor - implicit_group_id: -50 - source_group_id: -20 -- role_id: -30 + implicit_group_id: 50 + source_group_id: 20 +- role_id: 30 description: Deploys the content to the web site name: Publisher - implicit_group_id: -60 - source_group_id: -20 -- role_id: -40 + implicit_group_id: 60 + source_group_id: 20 +- role_id: 40 description: Manages the overall content section name: Manager - implicit_group_id: -70 - source_group_id: -20 -- role_id: -50 + implicit_group_id: 70 + source_group_id: 20 +- role_id: 50 description: A trusted user is allowed to create and publish items without review name: Trusted User - implicit_group_id: -80 - source_group_id: -20 -- role_id: -60 + implicit_group_id: 80 + source_group_id: 20 +- role_id: 60 description: Can view published pages within this section name: Content Reader - implicit_group_id: -90 - source_group_id: -30 -- role_id: -70 + implicit_group_id: 90 + source_group_id: 30 +- role_id: 70 description: Receive alerts regarding expiration of published content name: Alert Recipient - implicit_group_id: -100 - source_group_id: -30 + implicit_group_id: 100 + source_group_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.json index fa70cc42a..62378f70d 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.json @@ -2,7 +2,7 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.ccm_users": @@ -16,13 +16,13 @@ "password_reset_required": false, "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml index 3803fa986..9ba6d55b1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml @@ -1,6 +1,6 @@ --- ccm_core.subjects: -- subject_id: -10 +- subject_id: 10 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -10,9 +10,9 @@ ccm_core.ccm_users: password_reset_required: false salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== screen_name: jdoe - subject_id: -10 + subject_id: 10 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.json index 7faff6262..6c6d23d0e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.json @@ -2,10 +2,10 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_users": @@ -19,7 +19,7 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -30,19 +30,19 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "joe", - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -30, + "user_id": 30, "email_address": "joe.public@example.com", "bouncing": true, "verified": false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml index d1c1f8609..99328d3a2 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml @@ -1,7 +1,7 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -30 +- subject_id: 10 +- subject_id: 30 ccm_core.ccm_users: - banned: false hash_algorithm: MD5 @@ -12,7 +12,7 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Public @@ -22,13 +22,13 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: joe - subject_id: -30 + subject_id: 30 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -30 +- user_id: 30 email_address: joe.public@example.com bouncing: true verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.json index 3c78574eb..79695a26a 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.json @@ -2,13 +2,13 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_users": @@ -23,7 +23,7 @@ "password_reset_required": false, "salt": "fafjiaddfja0a", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -34,7 +34,7 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -20 + "subject_id": 20 }, { "banned": false, @@ -45,31 +45,31 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "joe", - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "jd@example.com", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "max.mustermann@example.org", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "mm@example.com", "bouncing": false, "verified": true }, { - "user_id": -30, + "user_id": 30, "email_address": "joe.public@example.com", "bouncing": true, "verified": false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml index 66a095384..22a2a4b83 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml @@ -1,8 +1,8 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: fafjiaddfja0a screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -24,7 +24,7 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -20 + subject_id: 20 - banned: false hash_algorithm: SHA-512 family_name: Public @@ -34,21 +34,21 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: joe - subject_id: -30 + subject_id: 30 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: jd@example.com bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: max.mustermann@example.org bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: mm@example.com bouncing: false verified: true -- user_id: -30 +- user_id: 30 email_address: joe.public@example.com bouncing: true verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.json index 97212f850..e28c915d0 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.json @@ -2,16 +2,16 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 }, { - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.ccm_users": @@ -25,7 +25,7 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -36,7 +36,7 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -20 + "subject_id": 20 }, { "banned": false, @@ -47,7 +47,7 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "joe", - "subject_id": -30 + "subject_id": 30 }, { "banned": false, @@ -60,37 +60,37 @@ "password_reset_required": false, "salt": "maifgaoapafga9", "screen_name": "jane", - "subject_id": -40 + "subject_id": 40 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "max.mustermann@example.org", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "mm@example.com", "bouncing": false, "verified": true }, { - "user_id": -30, + "user_id": 30, "email_address": "joe.public@example.com", "bouncing": true, "verified": false }, { - "user_id": -40, + "user_id": 40, "email_address": "jane.doe@example.org", "bouncing": false, "verified": false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml index afecdb5b1..cd62b684e 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml @@ -1,9 +1,9 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 -- subject_id: -40 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 +- subject_id: 40 ccm_core.ccm_users: - banned: false hash_algorithm: MD5 @@ -14,7 +14,7 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -24,7 +24,7 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -20 + subject_id: 20 - banned: false hash_algorithm: SHA-512 family_name: Public @@ -34,7 +34,7 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: joe - subject_id: -30 + subject_id: 30 - banned: false hash_algorithm: SHA-512 family_name: Doe @@ -46,25 +46,25 @@ ccm_core.ccm_users: password_reset_required: false salt: maifgaoapafga9 screen_name: jane - subject_id: -40 + subject_id: 40 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: max.mustermann@example.org bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: mm@example.com bouncing: false verified: true -- user_id: -30 +- user_id: 30 email_address: joe.public@example.com bouncing: true verified: false -- user_id: -40 +- user_id: 40 email_address: jane.doe@example.org bouncing: false verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.json index d2930e3f8..f4f9306dc 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.json @@ -2,13 +2,13 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_users": @@ -22,7 +22,7 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -33,7 +33,7 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -20 + "subject_id": 20 }, { "banned": false, @@ -44,31 +44,31 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "joe", - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "max.mustermann@example.org", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "mm@example.com", "bouncing": false, "verified": true }, { - "user_id": -30, + "user_id": 30, "email_address": "max.mustermann@example.org", "bouncing": true, "verified": false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml index f16b32d32..ea297a34c 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml @@ -1,8 +1,8 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 ccm_core.ccm_users: - banned: false hash_algorithm: MD5 @@ -12,7 +12,7 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -21,7 +21,7 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -20 + subject_id: 20 - banned: false hash_algorithm: SHA-512 family_name: Public @@ -30,21 +30,21 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: joe - subject_id: -30 + subject_id: 30 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: max.mustermann@example.org bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: mm@example.com bouncing: false verified: true -- user_id: -30 +- user_id: 30 email_address: max.mustermann@example.org bouncing: true verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json index 71f2fcdb9..e9abad8b1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.json @@ -2,13 +2,13 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 }, { - "subject_id": -20 + "subject_id": 20 }, { - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.ccm_users": @@ -22,7 +22,7 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 }, { "banned": false, @@ -33,7 +33,7 @@ "password_reset_required": false, "salt": "fjiajhigafgapoa", "screen_name": "mmuster", - "subject_id": -20 + "subject_id": 20 }, { "banned": false, @@ -44,31 +44,31 @@ "password_reset_required": false, "salt": "axg8ira8fa", "screen_name": "joe", - "subject_id": -30 + "subject_id": 30 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "john.doe@example.com", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "max.mustermann@example.org", "bouncing": false, "verified": true }, { - "user_id": -20, + "user_id": 20, "email_address": "mm@example.com", "bouncing": false, "verified": true }, { - "user_id": -30, + "user_id": 30, "email_address": "joe.public@example.com", "bouncing": true, "verified": false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml index fa555e356..7e3869eb2 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml @@ -1,8 +1,8 @@ --- ccm_core.subjects: -- subject_id: -10 -- subject_id: -20 -- subject_id: -30 +- subject_id: 10 +- subject_id: 20 +- subject_id: 30 ccm_core.ccm_users: - banned: false hash_algorithm: MD5 @@ -13,7 +13,7 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: jdoe - subject_id: -10 + subject_id: 10 - banned: false hash_algorithm: SHA-512 family_name: Mustermann @@ -23,7 +23,7 @@ ccm_core.ccm_users: password_reset_required: false salt: fjiajhigafgapoa screen_name: mmuster - subject_id: -20 + subject_id: 20 - banned: false hash_algorithm: SHA-512 family_name: Public @@ -33,21 +33,21 @@ ccm_core.ccm_users: password_reset_required: false salt: axg8ira8fa screen_name: joe - subject_id: -30 + subject_id: 30 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: john.doe@example.com bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: max.mustermann@example.org bouncing: false verified: true -- user_id: -20 +- user_id: 20 email_address: mm@example.com bouncing: false verified: true -- user_id: -30 +- user_id: 30 email_address: joe.public@example.com bouncing: true verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.json b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.json index 1623595f6..822a06850 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.json +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.json @@ -2,7 +2,7 @@ "ccm_core.subjects": [ { - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.ccm_users": @@ -16,13 +16,13 @@ "salt": "Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA==", "password_reset_required": false, "screen_name": "jdoe", - "subject_id": -10 + "subject_id": 10 } ], "ccm_core.user_email_addresses": [ { - "user_id": -10, + "user_id": 10, "email_address": "jdoe@example.com", "bouncing": false, "verified": true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml index e82d85bbb..8b3d321fd 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml @@ -1,6 +1,6 @@ --- ccm_core.subjects: -- subject_id: -10 +- subject_id: 10 ccm_core.ccm_users: - banned: false hash_algorithm: SHA-512 @@ -10,9 +10,9 @@ ccm_core.ccm_users: salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== password_reset_required: false screen_name: jdoe - subject_id: -10 + subject_id: 10 ccm_core.user_email_addresses: -- user_id: -10 +- user_id: 10 email_address: jdoe@example.com bouncing: false verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/after-import-single-group.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/after-import-single-group.yml index 22f04ec09..6cd709d46 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/after-import-single-group.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/after-import-single-group.yml @@ -1,21 +1,21 @@ ccm_core.parties: # Group 1 - - party_id: -10 + - party_id: 10 uuid: 7200c286-5045-4305-8f40-86cc078b5943 name: group-1 # Group 2 - - party_id: -20 + - party_id: 20 uuid: ebdc9a12-8f4e-48e8-92ec-900c65189895 name: group-2 # Imported group - - party_id: -100 + - party_id: 100 uuid: 696592cd-db19-4aca-bb14-06490cfde243 name: department-23 ccm_core.groups: # Group 1 - - party_id: -10 + - party_id: 10 # Group 2 - - party_id: -20 + - party_id: 20 # Imported group - - party_id: -100 + - party_id: 100 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/data.yml index 9f77c2a96..c88831bcd 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupImportTest/data.yml @@ -1,14 +1,14 @@ ccm_core.parties: # Group 1 - - party_id: -10 + - party_id: 10 uuid: 7200c286-5045-4305-8f40-86cc078b5943 name: group-1 # Group 2 - - party_id: -20 + - party_id: 20 uuid: ebdc9a12-8f4e-48e8-92ec-900c65189895 name: group-2 ccm_core.groups: # Group 1 - - party_id: -10 + - party_id: 10 # Group 2 - - party_id: -20 + - party_id: 20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml index 191dde8a3..cc8672940 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml @@ -1,22 +1,22 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # Group 1 - - party_id: -100 + - party_id: 100 uuid: 7200c286-5045-4305-8f40-86cc078b5943 name: group-1 # Group 2 - - party_id: -200 + - party_id: 200 uuid: ebdc9a12-8f4e-48e8-92ec-900c65189895 name: group-2 ccm_core.users: @@ -26,7 +26,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -37,7 +37,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -48,23 +48,23 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # Group 1 - - party_id: -100 + - party_id: 100 # Group 2 - - party_id: -200 + - party_id: 200 ccm_core.group_memberships: - - membership_id: -1000 + - membership_id: 1000 uuid: b32bd614-00b7-4f1e-b1a3-4fc53f230082 - group_id: -200 - member_id: -30 - - membership_id: -2000 + group_id: 200 + member_id: 30 + - membership_id: 2000 uuid: f8ac4073-447e-4bd6-ac96-3bf92bdc8ce7 - group_id: -100 - member_id: -10 + group_id: 100 + member_id: 10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml index a1de45974..13065290a 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml @@ -1,22 +1,22 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # Group 1 - - party_id: -100 + - party_id: 100 uuid: 7200c286-5045-4305-8f40-86cc078b5943 name: group-1 # Group 2 - - party_id: -200 + - party_id: 200 uuid: ebdc9a12-8f4e-48e8-92ec-900c65189895 name: group-2 ccm_core.users: @@ -26,7 +26,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -37,7 +37,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -48,18 +48,18 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # Group 1 - - party_id: -100 + - party_id: 100 # Group 2 - - party_id: -200 + - party_id: 200 ccm_core.group_memberships: - - membership_id: -1000 + - membership_id: 1000 uuid: b32bd614-00b7-4f1e-b1a3-4fc53f230082 - group_id: -200 - member_id: -30 + group_id: 200 + member_id: 30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml index 4637a94b1..00e5240eb 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml @@ -1,18 +1,18 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # Jane Doe - - party_id: -40 + - party_id: 40 uuid: 7cb9aba4-8071-4f27-af19-096e1473d050 name: janedoe ccm_core.users: @@ -22,7 +22,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -33,7 +33,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -44,7 +44,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true @@ -54,7 +54,7 @@ ccm_core.users: email_address: jane.doe@libreccm.example family_name: Doe given_name: Jane - party_id: -40 + party_id: 40 password: ofafodafa password_reset_required: false verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml index d1e7891d5..db4ff6a87 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -40,7 +40,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/modules/ConfigurationLoaderTest/after-load.yml b/ccm-core/src/test/resources/datasets/org/libreccm/modules/ConfigurationLoaderTest/after-load.yml index 2281b584a..be2bb1406 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/modules/ConfigurationLoaderTest/after-load.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/modules/ConfigurationLoaderTest/after-load.yml @@ -1,23 +1,23 @@ ccm_core.settings: - - setting_id: -100 + - setting_id: 100 configuration_class: org.libreccm.configuration.ExampleConfiguration name: enabled setting_value_boolean: true dtype: BooleanSetting - - setting_id: -110 + - setting_id: 110 configuration_class: org.libreccm.configuration.ExampleConfiguration name: itemsPerPage setting_value_long: 100 dtype: LongSetting - - setting_id: -120 + - setting_id: 120 configuration_class: org.libreccm.configuration.ExampleConfiguration name: title dtype: LocalizedStringSetting ccm_core.settings_l10n_str_values: - - entry_id: -120 + - entry_id: 120 locale: de localized_value: Versuch - - entry_id: -120 + - entry_id: 120 locale: en localized_value: Test diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml index 2956b350b..913b52c26 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id": 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id": 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id": 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # admins - - party_id: -40 + - party_id": 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: admins # users - - party_id: -50 + - party_id": 50 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: users # editors - - party_id: -60 + - party_id": 60 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: editors ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id": 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id": 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,45 +52,45 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id": 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # admins - - party_id: -40 + - party_id": 40 # users - - party_id: -50 + - party_id": 50 # editors - - party_id: -60 + - party_id": 60 ccm_core.group_memberships: # admins <-> jdoe - - membership_id: -100 + - membership_id": 100 uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e - group_id: -40 - member_id: -10 + group_id": 40 + member_id": 10 # users <-> mmuster - - membership_id: -200 + - membership_id": 200 uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df - group_id: -50 - member_id: -20 + group_id": 50 + member_id": 20 # users <-> joe - - membership_id: -300 + - membership_id": 300 uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa - group_id: -50 - member_id: -30 + group_id": 50 + member_id": 30 # editors <-> joe - - membership_id: -400 + - membership_id": 400 uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd - group_id: -60 - member_id: -30 + group_id": 60 + member_id": 30 # admins <-> mmuster - - membership_id: -500 + - membership_id": 500 uuid: 555657c8-e8ce-41e1-a327-f853901c8813 - group_id: -40 - member_id: -20 + group_id": 40 + member_id": 20 # editors <-> jdoe - - membership_id: -600 + - membership_id": 600 uuid: ed78b175-3ff3-4f34-8a5f-829e2113c593 - group_id: -60 - member_id: -10 \ No newline at end of file + group_id": 60 + member_id": 10 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml index 7f1050dad..0fef856a8 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id": 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id": 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id": 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # admins - - party_id: -40 + - party_id": 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: admins # users - - party_id: -50 + - party_id": 50 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: users # editors - - party_id: -60 + - party_id": 60 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: editors ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id": 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id": 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,25 +52,25 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id": 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # admins - - party_id: -40 + - party_id": 40 # users - - party_id: -50 + - party_id": 50 # editors - - party_id: -60 + - party_id": 60 ccm_core.group_memberships: # users <-> joe - - membership_id: -300 + - membership_id": 300 uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa - group_id: -50 - member_id: -30 + group_id": 50 + member_id": 30 # editors <-> joe - - membership_id: -400 + - membership_id": 400 uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd - group_id: -60 - member_id: -30 \ No newline at end of file + group_id": 60 + member_id": 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml index bdb55df75..d4d58fc68 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id": 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id": 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id": 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # admins - - party_id: -40 + - party_id": 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: admins # users - - party_id: -50 + - party_id": 50 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: users # editors - - party_id: -60 + - party_id": 60 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: editors ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id": 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id": 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,35 +52,35 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id": 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # admins - - party_id: -40 + - party_id": 40 # users - - party_id: -50 + - party_id": 50 # editors - - party_id: -60 + - party_id": 60 ccm_core.group_memberships: # admins <-> jdoe - - membership_id: -100 + - membership_id": 100 uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e - group_id: -40 - member_id: -10 + group_id": 40 + member_id": 10 # users <-> mmuster - - membership_id: -200 + - membership_id": 200 uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df - group_id: -50 - member_id: -20 + group_id": 50 + member_id": 20 # users <-> joe - - membership_id: -300 + - membership_id": 300 uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa - group_id: -50 - member_id: -30 + group_id": 50 + member_id": 30 # editors <-> joe - - membership_id: -400 + - membership_id": 400 uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd - group_id: -60 - member_id: -30 \ No newline at end of file + group_id": 60 + member_id": 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-delete.yml index 82955fc3f..2245decbd 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-delete.yml @@ -1,10 +1,10 @@ ccm_core.parties: - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: admins - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: editors ccm_core.groups: - - party_id: -10 - - party_id: -30 \ No newline at end of file + - party_id: 10 + - party_id: 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-changed.yml index 089b16f33..ee97b4ea4 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-changed.yml @@ -1,14 +1,14 @@ ccm_core.parties: - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: admins - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: users - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: authors ccm_core.groups: - - party_id: -10 - - party_id: -20 - - party_id: -30 \ No newline at end of file + - party_id: 10 + - party_id: 20 + - party_id: 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-new.yml index 932213906..00268ba0c 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/after-save-new.yml @@ -1,18 +1,18 @@ ccm_core.parties: - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: admins - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: users - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: editors - - party_id: -40 + - party_id: 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: authors ccm_core.groups: - - party_id: -10 - - party_id: -20 - - party_id: -30 - - party_id: -40 \ No newline at end of file + - party_id: 10 + - party_id: 20 + - party_id: 30 + - party_id: 40 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/data.yml index 2aee550f6..89d59fcf5 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupRepositoryTest/data.yml @@ -1,14 +1,14 @@ ccm_core.parties: - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: admins - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: users - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: editors ccm_core.groups: - - party_id: -10 - - party_id: -20 - - party_id: -30 \ No newline at end of file + - party_id: 10 + - party_id: 20 + - party_id: 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-delete.yml index b7880c6b5..6eea84677 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-delete.yml @@ -1,8 +1,8 @@ ccm_core.parties: - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: admins ccm_core.groups: - - party_id: -20 + - party_id: 20 ccm_core.users: \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml index 197daa080..e75332768 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml @@ -1,13 +1,13 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: managers ccm_core.groups: - - party_id: -20 + - party_id: 20 ccm_core.users: # John Doe - banned: false @@ -15,7 +15,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml index b37a1c6d3..6f4704b0f 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-new.yml @@ -1,20 +1,20 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: admins - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: mmuster - - party_id: -40 + - party_id: 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: users ccm_core.groups: - - party_id: -20 - - party_id: -40 + - party_id: 20 + - party_id: 40 ccm_core.users: # John Doe - banned: false @@ -22,7 +22,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -33,7 +33,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -30 + party_id: 30 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml index 8864a8fa8..d9d3b738b 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/data.yml @@ -1,13 +1,13 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: admins ccm_core.groups: - - party_id: -20 + - party_id: 20 ccm_core.users: # John Doe - banned: false @@ -15,7 +15,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-copy.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-copy.yml index 231d07ac4..63360a657 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-copy.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-copy.yml @@ -1,42 +1,42 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: object1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: object2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: object3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false - - permission_id: -30004 + - permission_id: 30004 uuid: 94efe5ec-94f0-4ffb-a6b1-720018915fd4 granted_privilege: privilege2 - object_id: -20003 - grantee_id: -10002 + object_id: 20003 + grantee_id: 10002 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-inherited.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-inherited.yml index ef84fbc5e..5e5441255 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-inherited.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-inherited.yml @@ -1,94 +1,94 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: category1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: category2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: category3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 - - object_id: -20004 + - object_id: 20004 display_name: objectA ccm_core.categories: - - object_id: -20001 + - object_id: 20001 unique_id: 17239bc1-5db3-4448-b37c-cac0fddd7342 name: category1 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -20002 + - object_id: 20002 unique_id: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 name: category2 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20001 - - object_id: -20003 + parent_category_id: 20001 + - object_id: 20003 unique_id: 1c31700a-f9db-4188-812f-12dba4186c75 name: category3 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20002 + parent_category_id: 20002 ccm_core.categorizations: - - categorization_id: -40001 + - categorization_id: 40001 uuid: 3da32dd7-4f5f-4637-b87e-e431c44d5c14 - category_id: -20003 - object_id: -20004 + category_id: 20003 + object_id: 20004 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false - - permission_id: -30004 + - permission_id: 30004 uuid: 94efe5ec-94f0-4ffb-a6b1-720018915fd4 granted_privilege: privilege4 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30005 + - permission_id: 30005 uuid: a5e89679-6a93-4336-a802-d7120ba1ef5a granted_privilege: privilege4 - object_id: -20002 - grantee_id: -10001 + object_id: 20002 + grantee_id: 10001 inherited: false - - permission_id: -30006 + - permission_id: 30006 uuid: db46a965-c6a9-490a-8dfb-28ddef1aa69a granted_privilege: privilege4 - object_id: -20003 - grantee_id: -10001 + object_id: 20003 + grantee_id: 10001 inherited: true - inherited_from_id: -20002 - - permission_id: -30007 + inherited_from_id: 20002 + - permission_id: 30007 uuid: 152bbdeb-834a-49ea-8087-44e1286ea5c2 granted_privilege: privilege4 - object_id: -20004 - grantee_id: -10001 + object_id: 20004 + grantee_id: 10001 inherited: true - inherited_from_id: -20002 + inherited_from_id: 20002 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-recursivly.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-recursivly.yml index f5954b168..311841012 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-recursivly.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-recursivly.yml @@ -1,97 +1,97 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: category1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: category2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: category3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 - - object_id: -20004 + - object_id: 20004 display_name: objectA ccm_core.categories: - - object_id: -20001 + - object_id: 20001 unique_id: 17239bc1-5db3-4448-b37c-cac0fddd7342 name: category1 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -20002 + - object_id: 20002 unique_id: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 name: category2 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20001 - - object_id: -20003 + parent_category_id: 20001 + - object_id: 20003 unique_id: 1c31700a-f9db-4188-812f-12dba4186c75 name: category3 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20002 + parent_category_id: 20002 ccm_core.categorizations: - - categorization_id: -40001 + - categorization_id: 40001 uuid: 3da32dd7-4f5f-4637-b87e-e431c44d5c14 - category_id: -20003 - object_id: -20004 + category_id: 20003 + object_id: 20004 category_index: false category_order: 0 object_order: 0 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false - - permission_id: -30004 + - permission_id: 30004 uuid: 94efe5ec-94f0-4ffb-a6b1-720018915fd4 granted_privilege: privilege4 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30005 + - permission_id: 30005 uuid: a5e89679-6a93-4336-a802-d7120ba1ef5a granted_privilege: privilege4 - object_id: -20002 - grantee_id: -10001 + object_id: 20002 + grantee_id: 10001 inherited: true - inherited_from_id: -20001 - - permission_id: -30006 + inherited_from_id: 20001 + - permission_id: 30006 uuid: db46a965-c6a9-490a-8dfb-28ddef1aa69a granted_privilege: privilege4 - object_id: -20003 - grantee_id: -10001 + object_id: 20003 + grantee_id: 10001 inherited: true - inherited_from_id: -20001 - - permission_id: -30007 + inherited_from_id: 20001 + - permission_id: 30007 uuid: 152bbdeb-834a-49ea-8087-44e1286ea5c2 granted_privilege: privilege4 - object_id: -20004 - grantee_id: -10001 + object_id: 20004 + grantee_id: 10001 inherited: true - inherited_from_id: -20001 + inherited_from_id: 20001 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant.yml index 5f39fe7ca..453d0af65 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant.yml @@ -1,42 +1,42 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: object1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: object2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: object3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 - - permission_id: -30002 + grantee_id: 10001 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 - - permission_id: -30003 + object_id: 20001 + grantee_id: 10001 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 - - permission_id: -30004 + object_id: 20002 + grantee_id: 10002 + - permission_id: 30004 uuid: 94efe5ec-94f0-4ffb-a6b1-720018915fd4 granted_privilege: privilege2 - object_id: -20003 - grantee_id: -10002 - - permission_id: -30005 + object_id: 20003 + grantee_id: 10002 + - permission_id: 30005 uuid: 598beccb-a891-46e3-95c7-47e91d24668f granted_privilege: privilege3 - grantee_id: -10002 + grantee_id: 10002 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke-recursivly.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke-recursivly.yml index 1cc9c940e..dcf080214 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke-recursivly.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke-recursivly.yml @@ -1,67 +1,67 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: category1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: category2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: category3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 - - object_id: -20004 + - object_id: 20004 display_name: objectA ccm_core.categories: - - object_id: -20001 + - object_id: 20001 unique_id: 17239bc1-5db3-4448-b37c-cac0fddd7342 name: category1 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -20002 + - object_id: 20002 unique_id: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 name: category2 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20001 - - object_id: -20003 + parent_category_id: 20001 + - object_id: 20003 unique_id: 1c31700a-f9db-4188-812f-12dba4186c75 name: category3 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20002 + parent_category_id: 20002 ccm_core.categorizations: - - categorization_id: -40001 + - categorization_id: 40001 uuid: 3da32dd7-4f5f-4637-b87e-e431c44d5c14 - category_id: -20003 - object_id: -20004 + category_id: 20003 + object_id: 20004 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke.yml index c20b76a29..32e9f33b0 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-revoke.yml @@ -1,25 +1,25 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: object1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: object2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: object3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 ccm_core.permissions: - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data-recursivly.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data-recursivly.yml index dc9bae01b..b01778276 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data-recursivly.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data-recursivly.yml @@ -1,70 +1,70 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: category1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: category2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: category3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 - - object_id: -20004 + - object_id: 20004 display_name: objectA ccm_core.categories: - - object_id: -20001 + - object_id: 20001 unique_id: 17239bc1-5db3-4448-b37c-cac0fddd7342 name: category1 enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -20002 + - object_id: 20002 unique_id: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 name: category2 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20001 - - object_id: -20003 + parent_category_id: 20001 + - object_id: 20003 unique_id: 1c31700a-f9db-4188-812f-12dba4186c75 name: category3 enabled: true visible: true abstract_category: false category_order: 0 - parent_category_id: -20002 + parent_category_id: 20002 ccm_core.categorizations: - - categorization_id: -40001 + - categorization_id: 40001 uuid: 3da32dd7-4f5f-4637-b87e-e431c44d5c14 - category_id: -20003 - object_id: -20004 + category_id: 20003 + object_id: 20004 category_index: false category_order: 0 object_order: 0 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data.yml index 1e4711116..6ee6f01ad 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data.yml @@ -1,35 +1,35 @@ ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: object1 uuid: 17239bc1-5db3-4448-b37c-cac0fddd7342 - - object_id: -20002 + - object_id: 20002 display_name: object2 uuid: 686a5d09-36ec-46ba-9c97-a5d6db4b9008 - - object_id: -20003 + - object_id: 20003 display_name: object3 uuid: 1c31700a-f9db-4188-812f-12dba4186c75 ccm_core.permissions: - - permission_id: -30001 + - permission_id: 30001 uuid: 0b6b8076-f88b-4111-880a-780103d06a55 granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false - - permission_id: -30002 + - permission_id: 30002 uuid: 58210e1f-482c-4d69-9746-dd4d0d587491 granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false - - permission_id: -30003 + - permission_id: 30003 uuid: 350d8860-e6b1-4788-82e5-6e579996c983 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml index 64fbbc0ff..9987e7946 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-add.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # group1 - - party_id: -100 + - party_id: 100 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: group1 # group2 - - party_id: -200 + - party_id: 200 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: group2 # group3 - - party_id: -300 + - party_id: 300 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: group3 ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,76 +52,76 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # group1 - - party_id: -100 + - party_id: 100 # group2 - - party_id: -200 + - party_id: 200 # group3 - - party_id: -300 + - party_id: 300 ccm_core.group_memberships: # group1 <-> mmuster - - membership_id: -1000 + - membership_id: 1000 uuid: db6c2569-f97d-4668-b2a0-406cb9c8edd6 - group_id: -100 - member_id: -20 + group_id: 100 + member_id: 20 # group2 <-> jdoe - - membership_id: -1100 + - membership_id: 1100 uuid: d82c3896-e574-49f6-b123-ed517a50f4be - group_id: -200 - member_id: -10 + group_id: 200 + member_id: 10 # group3 <-> mmuster - - membership_id: -1200 + - membership_id: 1200 uuid: 7d7395b9-48f9-4076-9a98-7fde98123bfd - group_id: -300 - member_id: -20 + group_id: 300 + member_id: 20 # group3 <-> joe - - membership_id: -1300 + - membership_id: 1300 uuid: 258610b3-96b0-434a-bc08-3d58ed7525e9 - group_id: -300 - member_id: -30 + group_id: 300 + member_id: 30 ccm_core.ccm_roles: - - role_id: -2000 + - role_id: 2000 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -2100 + - role_id: 2100 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 - - role_id: -2200 + - role_id: 2200 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: role3 ccm_core.role_memberships: # role1 <-> jdoe - - membership_id: -3000 + - membership_id: 3000 uuid: 364220da-f24d-448f-aed5-633e316acc29 - role_id: -2000 - member_id: -10 + role_id: 2000 + member_id: 10 # role1 <-> group3 - - membership_id: -3100 + - membership_id: 3100 uuid: 28b9ee03-645d-4b8d-9b4e-9cc7442ffe77 - role_id: -2000 - member_id: -300 + role_id: 2000 + member_id: 300 # role2 <-> group1 - - membership_id: -3200 + - membership_id: 3200 uuid: da515fdc-560d-44fb-8f6b-8dbc37fca39d - role_id: -2100 - member_id: -100 + role_id: 2100 + member_id: 100 # role3 <-> joe - - membership_id: -3300 + - membership_id: 3300 uuid: 9ee86a1a-5aaf-4e8c-bfd5-77bfc846d0b5 - role_id: -2200 - member_id: -30 + role_id: 2200 + member_id: 30 # role1 <-> joe - - membership_id: -3400 + - membership_id: 3400 uuid: 8d3e7346-afa5-44b0-ae86-aafad4a8ebdd - role_id: -2000 - member_id: -30 + role_id: 2000 + member_id: 30 # role3 <-> group1 - - membership_id: -3500 + - membership_id: 3500 uuid: 4c5007e9-fefc-4f2d-82de-2154c48fd908 - role_id: -2200 - member_id: -100 \ No newline at end of file + role_id: 2200 + member_id: 100 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml index 18b12ec04..1ded282a3 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/after-remove.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # group1 - - party_id: -100 + - party_id: 100 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: group1 # group2 - - party_id: -200 + - party_id: 200 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: group2 # group3 - - party_id: -300 + - party_id: 300 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: group3 ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,56 +52,56 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # group1 - - party_id: -100 + - party_id: 100 # group2 - - party_id: -200 + - party_id: 200 # group3 - - party_id: -300 + - party_id: 300 ccm_core.group_memberships: # group1 <-> mmuster - - membership_id: -1000 + - membership_id: 1000 uuid: db6c2569-f97d-4668-b2a0-406cb9c8edd6 - group_id: -100 - member_id: -20 + group_id: 100 + member_id: 20 # group2 <-> jdoe - - membership_id: -1100 + - membership_id: 1100 uuid: d82c3896-e574-49f6-b123-ed517a50f4be - group_id: -200 - member_id: -10 + group_id: 200 + member_id: 10 # group3 <-> mmuster - - membership_id: -1200 + - membership_id: 1200 uuid: 7d7395b9-48f9-4076-9a98-7fde98123bfd - group_id: -300 - member_id: -20 + group_id: 300 + member_id: 20 # group3 <-> joe - - membership_id: -1300 + - membership_id: 1300 uuid: 258610b3-96b0-434a-bc08-3d58ed7525e9 - group_id: -300 - member_id: -30 + group_id: 300 + member_id: 30 ccm_core.ccm_roles: - - role_id: -2000 + - role_id: 2000 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -2100 + - role_id: 2100 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 - - role_id: -2200 + - role_id: 2200 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: role3 ccm_core.role_memberships: # role1 <-> group3 - - membership_id: -3100 + - membership_id: 3100 uuid: 28b9ee03-645d-4b8d-9b4e-9cc7442ffe77 - role_id: -2000 - member_id: -300 + role_id: 2000 + member_id: 300 # role3 <-> joe - - membership_id: -3300 + - membership_id: 3300 uuid: 9ee86a1a-5aaf-4e8c-bfd5-77bfc846d0b5 - role_id: -2200 - member_id: -30 \ No newline at end of file + role_id: 2200 + member_id: 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml index 9289f6d00..ea19b28bc 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleManagerTest/data.yml @@ -1,26 +1,26 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # group1 - - party_id: -100 + - party_id: 100 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: group1 # group2 - - party_id: -200 + - party_id: 200 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: group2 # group3 - - party_id: -300 + - party_id: 300 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: group3 ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,66 +52,66 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: # group1 - - party_id: -100 + - party_id: 100 # group2 - - party_id: -200 + - party_id: 200 # group3 - - party_id: -300 + - party_id: 300 ccm_core.group_memberships: # group1 <-> mmuster - - membership_id: -1000 + - membership_id: 1000 uuid: db6c2569-f97d-4668-b2a0-406cb9c8edd6 - group_id: -100 - member_id: -20 + group_id: 100 + member_id: 20 # group2 <-> jdoe - - membership_id: -1100 + - membership_id: 1100 uuid: d82c3896-e574-49f6-b123-ed517a50f4be - group_id: -200 - member_id: -10 + group_id: 200 + member_id: 10 # group3 <-> mmuster - - membership_id: -1200 + - membership_id: 1200 uuid: 7d7395b9-48f9-4076-9a98-7fde98123bfd - group_id: -300 - member_id: -20 + group_id: 300 + member_id: 20 # group3 <-> joe - - membership_id: -1300 + - membership_id: 1300 uuid: 258610b3-96b0-434a-bc08-3d58ed7525e9 - group_id: -300 - member_id: -30 + group_id: 300 + member_id: 30 ccm_core.ccm_roles: - - role_id: -2000 + - role_id: 2000 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -2100 + - role_id: 2100 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 - - role_id: -2200 + - role_id: 2200 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: role3 ccm_core.role_memberships: # role1 <-> jdoe - - membership_id: -3000 + - membership_id: 3000 uuid: 364220da-f24d-448f-aed5-633e316acc29 - role_id: -2000 - member_id: -10 + role_id: 2000 + member_id: 10 # role1 <-> group3 - - membership_id: -3100 + - membership_id: 3100 uuid: 28b9ee03-645d-4b8d-9b4e-9cc7442ffe77 - role_id: -2000 - member_id: -300 + role_id: 2000 + member_id: 300 # role2 <-> group1 - - membership_id: -3200 + - membership_id: 3200 uuid: da515fdc-560d-44fb-8f6b-8dbc37fca39d - role_id: -2100 - member_id: -100 + role_id: 2100 + member_id: 100 # role3 <-> joe - - membership_id: -3300 + - membership_id: 3300 uuid: 9ee86a1a-5aaf-4e8c-bfd5-77bfc846d0b5 - role_id: -2200 - member_id: -30 \ No newline at end of file + role_id: 2200 + member_id: 30 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-delete.yml index 7dbd5bf3e..72f045da7 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-delete.yml @@ -1,7 +1,7 @@ ccm_core.ccm_roles: - - role_id: -10 + - role_id: 10 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: administrator - - role_id: -30 + - role_id: 30 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: reader diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-changed.yml index 165226779..d333b2faa 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-changed.yml @@ -1,10 +1,10 @@ ccm_core.ccm_roles: - - role_id: -10 + - role_id: 10 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: administrator - - role_id: -20 + - role_id: 20 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: writer - - role_id: -30 + - role_id: 30 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: reader diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-new.yml index 09cc640bf..593ae7ed9 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/after-save-new.yml @@ -1,13 +1,13 @@ ccm_core.ccm_roles: - - role_id: -10 + - role_id: 10 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: administrator - - role_id: -20 + - role_id: 20 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: user - - role_id: -30 + - role_id: 30 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: reader - - role_id: -40 + - role_id: 40 uuid: 9feb2623-671a-4fd4-bd3f-1adc7f51f62e name: editor diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/data.yml index 0edd7175c..36376c888 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/RoleRepositoryTest/data.yml @@ -1,10 +1,10 @@ ccm_core.ccm_roles: - - role_id: -10 + - role_id: 10 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: administrator - - role_id: -20 + - role_id: 20 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: user - - role_id: -30 + - role_id: 30 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: reader diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml index 2fb32017f..02484c650 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/ShiroTest/data.yml @@ -1,26 +1,26 @@ ccm_core.parties: - - party_id: -41001 + - party_id: 41001 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe - - party_id: -41002 + - party_id: 41002 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster - - party_id: -41003 + - party_id: 41003 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe - - party_id: -41004 + - party_id: 41004 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: public-user - - party_id: -41005 + - party_id: 41005 uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb name: emuster - - party_id: -42001 + - party_id: 42001 uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c name: group1 - - party_id: -42002 + - party_id: 42002 uuid: 32521349-12f0-4d72-8468-c2bc9e33d4f1 name: group2 - - party_id: -42003 + - party_id: 42003 uuid: 9c7c8689-f248-4f8b-a245-41545999395c name: group3 ccm_core.users: @@ -30,7 +30,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -41001 + party_id: 41001 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -41,7 +41,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -41002 + party_id: 41002 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -52,7 +52,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -41003 + party_id: 41003 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true @@ -62,7 +62,7 @@ ccm_core.users: email_address: public-user@example.org family_name: user given_name: public - party_id: -41004 + party_id: 41004 password_reset_required: false verified: true # Erik Mustermann (banned) @@ -71,101 +71,101 @@ ccm_core.users: email_address: erik.mustermann@example.org family_name: Musterman given_name: Erik - party_id: -41005 + party_id: 41005 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.groups: - - party_id: -42001 - - party_id: -42002 - - party_id: -42003 + - party_id: 42001 + - party_id: 42002 + - party_id: 42003 ccm_core.group_memberships: # group1 <-> mmuster - - membership_id: -50001 + - membership_id: 50001 uuid: 488f36d0-f947-4fd9-b31b-98f3aa031d1f - group_id: -42001 - member_id: -41002 + group_id: 42001 + member_id: 41002 # group2 <-> jdoe - - membership_id: -50002 + - membership_id: 50002 uuid: ed169bec-cf86-4b74-9614-69fa93f9dde0 - group_id: -42002 - member_id: -41001 + group_id: 42002 + member_id: 41001 # group3 <-> mmuster - - membership_id: -50003 + - membership_id: 50003 uuid: 9bde3956-c622-41d8-bad6-17074e6b2c6c - group_id: -42003 - member_id: -41002 + group_id: 42003 + member_id: 41002 # group3 <-> joe - - membership_id: -50004 + - membership_id: 50004 uuid: 59424686-dddd-4574-b1f3-8abee245fce4 - group_id: -42003 - member_id: -41003 + group_id: 42003 + member_id: 41003 ccm_core.ccm_roles: - - role_id: -10001 + - role_id: 10001 uuid: 42038ba3-35b9-4894-843f-cb39ae1be763 name: role1 - - role_id: -10002 + - role_id: 10002 uuid: c821a93d-78aa-4b87-ac1b-3e3229e0fdd9 name: role2 - - role_id: -10003 + - role_id: 10003 uuid: 0e73623c-8d6a-4544-88a4-e4b104e7c0b6 name: public-role ccm_core.role_memberships: # role1 <-> group1 - - membership_id: -60001 + - membership_id: 60001 uuid: a0da173a-8825-4262-923f-61b0944d74e5 - role_id: -10001 - member_id: -42001 + role_id: 10001 + member_id: 42001 # role2 <-> jdoe - - membership_id: -60002 + - membership_id: 60002 uuid: d4f4b611-7048-4239-9aa1-dd79e4a22980 - role_id: -10002 - member_id: -41001 + role_id: 10002 + member_id: 41001 # public-role <-> public-user - - membership_id: -60003 + - membership_id: 60003 uuid: 5bee29d5-11d0-4015-b91a-27199ce5190a - role_id: -10003 - member_id: -41004 + role_id: 10003 + member_id: 41004 ccm_core.ccm_objects: - - object_id: -20001 + - object_id: 20001 display_name: object1 uuid: d05fb5f0-7b66-470d-b4f7-d14f4d08d4b6 - - object_id: -20002 + - object_id: 20002 display_name: object2 uuid: bec86ea9-7d28-4faf-992d-0f880dbbd3ea - - object_id: -20003 + - object_id: 20003 display_name: object3 uuid: 142041c0-163f-4359-931a-1faf465ee564 ccm_core.permissions: # permission for privilege1 granted to role1 - - permission_id: -30001 + - permission_id: 30001 uuid: fb5f1353-5138-4570-9143-38bd96d1481e granted_privilege: privilege1 - grantee_id: -10001 + grantee_id: 10001 inherited: false # permission for privilege2 granted on object1 to role1 - - permission_id: -30002 + - permission_id: 30002 uuid: d1d06a40-3394-44d5-910d-a003215f1a7e granted_privilege: privilege2 - object_id: -20001 - grantee_id: -10001 + object_id: 20001 + grantee_id: 10001 inherited: false # permission for privilege2 granted on object2 to role2 - - permission_id: -30003 + - permission_id: 30003 uuid: a714cb3d-af1e-4ee7-bd6e-2c184d629472 granted_privilege: privilege2 - object_id: -20002 - grantee_id: -10002 + object_id: 20002 + grantee_id: 10002 inherited: false # permission for privilege3 granted on object1 to public-role - - permission_id: -30004 + - permission_id: 30004 uuid: 4a724998-28cd-4060-a92a-a6225e7260e4 granted_privilege: privilege3 - object_id: -20001 - grantee_id: -10003 + object_id: 20001 + grantee_id: 10003 inherited: false ccm_core.settings: - - setting_id: -301 + - setting_id: 301 configuration_class: com.arsdigita.kernel.KernelConfig name: primaryUserIdentifier dtype: StringSetting diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml index 5f9d19b50..6f5339283 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/after-create-user.yml @@ -1,23 +1,23 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # mmuster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Jdoe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # Jane Doe - - party_id: -40 + - party_id: 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: jane ccm_core.users: # John Doe - - party_id: -10 + - party_id: 10 banned: false bouncing: false email_address: john.doe@example.com @@ -28,7 +28,7 @@ ccm_core.users: password_reset_required: false verified: true # Max Mustermann - - party_id: -20 + - party_id: 20 banned: false bouncing: false email_address: max.mustermann@example.org @@ -39,7 +39,7 @@ ccm_core.users: password_reset_required: false verified: true # Joe Public - - party_id: -30 + - party_id: 30 banned: false bouncing: false email_address: joe.public@example.com @@ -49,7 +49,7 @@ ccm_core.users: password_reset_required: false verified: true # Jane Doe - - party_id: -40 + - party_id: 40 banned: false bouncing: false email_address: jane.doe@example.org diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml index 6d375f175..086638611 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # mmuster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Jdoe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -40,71 +40,71 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true ccm_core.ccm_objects: - - object_id: -100 + - object_id: 100 display_name: registry uuid: d6186227-7c90-42e6-a5d0-ca274b622df7 - - object_id: -200 + - object_id: 200 display_name: registry-root uuid: c4a64ce4-242a-443a-b5bd-e84d34203e3a - - object_id: -201 + - object_id: 201 display_name: com uuid: 8388e1e3-5878-464a-a9fe-95e95c9331a6 - - object_id: -202 + - object_id: 202 display_name: arsdigita uuid: b2ba60a1-34a0-459e-b6d2-d1be04c0bf3f - - object_id: -203 + - object_id: 203 display_name: kernel uuid: bcba7ad2-22a1-4c94-a5f1-aefc25091038 - - object_id: -204 + - object_id: 204 display_name: KernelConfig uuid: 5643aea7-0abb-4060-bf3d-7365e2a02757 ccm_core.categories: - - object_id: -200 + - object_id: 200 unique_id: bb93a964-bf66-424c-a22d-074d001db3b8 name: registry-root enabled: true visible: true abstract_category: false category_order: 0 - - object_id: -201 + - object_id: 201 unique_id: 35ac50aa-7062-47b9-808d-ac830050d373 - parent_category_id: -200 + parent_category_id: 200 name: com enabled: true visible: true abstract_category: false category_order: 1 - - object_id: -202 + - object_id: 202 unique_id: 28f09d9d-a7fc-4dc3-a53e-670822fa5480 - parent_category_id: -201 + parent_category_id: 201 name: arsdigita enabled: true visible: true abstract_category: false category_order: 1 - - object_id: -203 + - object_id: 203 unique_id: 58c0b235-8762-4ab7-9232-a5a0e39c3a01 - parent_category_id: -202 + parent_category_id: 202 name: kernel enabled: true visible: true abstract_category: false category_order: 1 - - object_id: -204 + - object_id: 204 unique_id: c1a45148-df0a-486f-b4f1-c5a6659081c2 - parent_category_id: -203 + parent_category_id: 203 name: KernelConfig enabled: true visible: true abstract_category: false category_order: 1 ccm_core.category_domains: - - object_id: -100 + - object_id: 100 domain_key: registry - root_category_id: -200 + root_category_id: 200 version: 1.0 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml index 1bc3871f9..1f39866e3 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-delete.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml index 3a6ccfe09..4ec7cc3d4 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: jd@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo1456 password: $shiro1$SHA-512$500000$AH1llRaMHE8W31Q7VG6jsA==$XXgKeyDCsrN23NvszQ5wt+uViQUlVqTAM+05LrE7Bd9sc0eaJT8HlAGvSdY+rqTLbiGm9YS4pohzoUt1x3kmKg== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true @@ -39,7 +39,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml index 94ffb259c..2121a1320 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml @@ -1,23 +1,23 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe # Jane Doe - - party_id: -40 + - party_id: 40 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 name: jane ccm_core.users: # John Doe - - party_id: -10 + - party_id: 10 banned: false bouncing: false email_address: john.doe@example.com @@ -28,7 +28,7 @@ ccm_core.users: password_reset_required: false verified: true # Max Mustermann - - party_id: -20 + - party_id: 20 banned: false bouncing: false email_address: max.mustermann@example.org @@ -39,7 +39,7 @@ ccm_core.users: password_reset_required: false verified: true # Joe Public - - party_id: -30 + - party_id: 30 banned: false bouncing: false email_address: joe.public@example.com @@ -49,7 +49,7 @@ ccm_core.users: password_reset_required: false verified: true # Jane Doe - - party_id: -40 + - party_id: 40 banned: false bouncing: false email_address: jane.doe@example.org diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml index aac0d4c84..3e5486b73 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -40,7 +40,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml index dbc6790b6..b8dd7682b 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data.yml @@ -1,14 +1,14 @@ ccm_core.parties: # John Doe - - party_id: -10 + - party_id: 10 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 name: jdoe # Max Muster - - party_id: -20 + - party_id: 20 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 name: mmuster # Joe Public - - party_id: -30 + - party_id: 30 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 name: joe ccm_core.users: @@ -18,7 +18,7 @@ ccm_core.users: email_address: john.doe@example.com family_name: Doe given_name: John - party_id: -10 + party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false @@ -29,7 +29,7 @@ ccm_core.users: email_address: max.mustermann@example.org family_name: Mustermann given_name: Max - party_id: -20 + party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false @@ -40,7 +40,7 @@ ccm_core.users: email_address: joe.public@example.com family_name: Public given_name: Joe - party_id: -30 + party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false verified: true \ No newline at end of file diff --git a/pom.xml b/pom.xml index 73e7b16d4..74b3baf3c 100644 --- a/pom.xml +++ b/pom.xml @@ -706,6 +706,11 @@ import pom + + org.jboss.arquillian.extension + arquillian-persistence-impl + 1.0.0.Alpha6 + org.jboss.arquillian.extension arquillian-persistence-dbunit