From 1eb3854d9c66189365e73af2410033ca1e981684 Mon Sep 17 00:00:00 2001 From: Kavoos Bojnourdi Date: Sat, 29 Aug 2015 15:34:47 +0200 Subject: [PATCH] Fixe a bug introduced in last commit (EclipseLink does not correctly support @CacheIndexes in this version) Fixe StudyClientDao Added test for the "list" method of Study service --- .../src/com/edf/gde/dao/StudyDaoClient.java | 4 +- .../src/com/edf/gde/dao/UserDaoClient.java | 5 ++- .../com/edf/gde/test/dao/StudyDaoTest.java | 27 +++++++++++ .../com/edf/gde/test/dao/UserDaoTest.java | 1 + .../java/com/edf/gde/entities/Attribute.java | 2 +- .../com/edf/gde/entities/AttributeGroup.java | 2 +- .../src/java/com/edf/gde/entities/Chunk.java | 2 +- .../java/com/edf/gde/entities/ChunkInfo.java | 2 +- .../java/com/edf/gde/entities/GDEFile.java | 2 +- .../src/java/com/edf/gde/entities/Group.java | 2 +- .../com/edf/gde/entities/GroupPermission.java | 9 +--- .../java/com/edf/gde/entities/Profile.java | 2 +- .../edf/gde/entities/ProfileAttribute.java | 2 +- .../src/java/com/edf/gde/entities/Study.java | 2 +- .../src/java/com/edf/gde/entities/User.java | 2 +- .../java/com/edf/gde/entities/UserGroup.java | 13 +++--- .../GDE-ejb/src/java/com/edf/gde/sql/init.sql | 45 ++++++++++--------- 17 files changed, 73 insertions(+), 51 deletions(-) diff --git a/projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java index 270c96d..09b2c02 100644 --- a/projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java +++ b/projects/GDE-test/src/com/edf/gde/dao/StudyDaoClient.java @@ -7,6 +7,7 @@ import com.edf.gde.transferables.CommandTO; import com.edf.gde.transferables.StudyTO; import com.edf.gde.transferables.responses.CommandResultTO; import java.io.IOException; +import java.util.Arrays; import java.util.List; import restapi.RestContext; @@ -86,6 +87,7 @@ public class StudyDaoClient extends BaseDao { public List list() throws IOException { CommandTO commandTO = createCommand(LISTSTUDIES); - return postCommand(commandTO, null, List.class); + StudyTO[] stos = postCommand(commandTO, null, StudyTO[].class); + return Arrays.asList(stos); } } diff --git a/projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java b/projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java index 14bcae0..0ea52db 100644 --- a/projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java +++ b/projects/GDE-test/src/com/edf/gde/dao/UserDaoClient.java @@ -151,15 +151,16 @@ public class UserDaoClient extends BaseDao { public boolean addToGroup(long groupId, long userId) throws IOException { CommandTO commandTO = createCommand(ADDTOGROUP); + CommandResultTO resultTO = null; commandTO.setLong("groupId", groupId); commandTO.setLong("userId", userId); if (postAsJSonData(commandTO,daoResponseHandler)) { - CommandResultTO resultTO = daoResponseHandler.getResultTO(); + resultTO = daoResponseHandler.getResultTO(); if (resultTO.getCode() == CommandResultTO.OK) { return true; } } - return false; + throw new RuntimeException(resultTO.getMsg()); } public boolean removeFromGroup(long groupId, long userId) throws IOException { diff --git a/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java index 3d99f8d..e17cf6d 100644 --- a/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/StudyDaoTest.java @@ -7,8 +7,10 @@ import com.edf.gde.dao.StudyDaoClient; import com.edf.gde.base.BaseTest; import com.edf.gde.transferables.StudyTO; import java.util.Date; +import java.util.List; import org.junit.After; import org.junit.AfterClass; +import org.junit.Assert; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -88,6 +90,30 @@ public class StudyDaoTest extends BaseTest { passed(); } + @Test + public void listStudyTest() throws Exception { + /* Create new study */ + StudyDaoClient daoClient = new StudyDaoClient(); + StudyTO studyTO = createStudyTO("List study"); + StudyTO newStudyTO = daoClient.createStudy(studyTO); + /* list studies */ + List l = daoClient.list(); + assertNotNull(l); + assertTrue(l.size()>0); + boolean f=false; + for (StudyTO sto : l) { + if (sto.getId() == newStudyTO.getId()) { + f=true; + break; + } + } + if (f) { + passed(); + } else { + Assert.fail("Study not found in the list"); + } + } + private StudyTO createStudyTO(String name) { StudyTO studyTO = new StudyTO(); studyTO.setName(name); @@ -95,4 +121,5 @@ public class StudyDaoTest extends BaseTest { studyTO.setValid(false); return studyTO; } + } diff --git a/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java b/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java index 68d1b7e..ad665cd 100644 --- a/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java +++ b/projects/GDE-test/test/com/edf/gde/test/dao/UserDaoTest.java @@ -90,6 +90,7 @@ public class UserDaoTest extends BaseTest { /** * Test of createUser method, of class UserDao. + * @throws java.lang.Exception */ @Test public void testCreateUser() throws Exception { diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java index 68523f5..c2c0f32 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Attribute.java @@ -45,7 +45,7 @@ public class Attribute implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java index 1228fdd..39e0abb 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/AttributeGroup.java @@ -44,7 +44,7 @@ public class AttributeGroup implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private long id; @OneToMany(fetch = FetchType.LAZY, orphanRemoval = true, cascade = {CascadeType.ALL}, mappedBy = "attributeGroup") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java index 3aed7b7..7f90a6d 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Chunk.java @@ -45,7 +45,7 @@ public class Chunk implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private long id; @Column(name = "file_id", nullable = false) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ChunkInfo.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ChunkInfo.java index 1be620c..a3bd1c8 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ChunkInfo.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ChunkInfo.java @@ -38,7 +38,7 @@ public class ChunkInfo implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private long id; @Column(name = "file_id", nullable = false) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java index a17e85a..31348dc 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GDEFile.java @@ -54,7 +54,7 @@ public class GDEFile implements Serializable { @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private long id; @Size(max = 255) @Column(name = "name") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java index 5e3335b..30b2811 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Group.java @@ -35,7 +35,7 @@ public class Group { @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private Long id; @Size(max = 255) @Column(name = "groupName") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java index 2678e32..b6ea114 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/GroupPermission.java @@ -14,8 +14,6 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.NotNull; import org.eclipse.persistence.annotations.Cache; -import org.eclipse.persistence.annotations.CacheIndex; -import org.eclipse.persistence.annotations.CacheIndexes; import org.eclipse.persistence.annotations.Index; import org.eclipse.persistence.annotations.Indexes; import org.eclipse.persistence.config.CacheIsolationType; @@ -40,11 +38,6 @@ import org.eclipse.persistence.config.CacheIsolationType; @Index(columnNames = "serviceName"), @Index(columnNames = "methodIndex") }) -@CacheIndexes({ - @CacheIndex(columnNames = "groupId"), - @CacheIndex(columnNames = "serviceName"), - @CacheIndex(columnNames = "methodIndex") -}) @Cache(size = 100, isolation = CacheIsolationType.SHARED) public class GroupPermission implements Serializable { @@ -53,7 +46,7 @@ public class GroupPermission implements Serializable { @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private Long id; @Column(name = "groupId") long groupId; diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java index dc5730c..9e6d53f 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Profile.java @@ -47,7 +47,7 @@ public class Profile implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private Long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java index 247714f..f3c6002 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/ProfileAttribute.java @@ -42,7 +42,7 @@ public class ProfileAttribute implements Serializable { @Basic(optional = false) @NotNull @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) @Column(name = "id") private Long id; @Size(max = 255) diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java index 2444a68..d48f9da 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/Study.java @@ -53,7 +53,7 @@ public class Study implements Serializable { @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private long id; @Size(max = 255) @Column(name = "name") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java index d82d3d0..68264a2 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/User.java @@ -40,7 +40,7 @@ public class User implements Serializable { @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private Long id; @Size(max = 255) @Column(name = "userName") diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java index ddf78d5..5ee7d92 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/entities/UserGroup.java @@ -3,6 +3,7 @@ */ package com.edf.gde.entities; +import java.io.Serializable; import java.util.Objects; import javax.persistence.Basic; import javax.persistence.Column; @@ -16,8 +17,6 @@ import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.validation.constraints.NotNull; import org.eclipse.persistence.annotations.Cache; -import org.eclipse.persistence.annotations.CacheIndex; -import org.eclipse.persistence.annotations.CacheIndexes; import org.eclipse.persistence.annotations.Index; import org.eclipse.persistence.annotations.Indexes; import org.eclipse.persistence.config.CacheIsolationType; @@ -28,7 +27,7 @@ import org.eclipse.persistence.config.CacheIsolationType; */ @Entity(name = "UserGroup") @Table(name = "USERGROUP") -@Cache(size = 100, isolation = CacheIsolationType.SHARED) + @NamedQueries({ @NamedQuery(name = "UserGroup.findById", query = "SELECT ug FROM UserGroup ug where ug.id = :id"), @NamedQuery(name = "UserGroup.findByUserId", query = "SELECT ug FROM UserGroup ug where ug.userId=:userId"), @@ -39,17 +38,15 @@ import org.eclipse.persistence.config.CacheIsolationType; @Index(columnNames = "userId"), @Index(columnNames = "groupId") }) -@CacheIndexes({ - @CacheIndex(columnNames = {"userId"}), - @CacheIndex(columnNames = "groupId")}) -public class UserGroup { +@Cache(size = 100, isolation = CacheIsolationType.SHARED) +public class UserGroup implements Serializable { @Id @Basic(optional = false) @NotNull @Column(name = "id") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_GEN_SEQUENCE") - @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50) + @SequenceGenerator(name = "SEQ_GEN_SEQUENCE", allocationSize = 50, initialValue = 1000) private Long id; @Column(name = "userId") long userId; diff --git a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/sql/init.sql b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/sql/init.sql index 41b2614..ed444a1 100644 --- a/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/sql/init.sql +++ b/projects/GDE_App/GDE-ejb/src/java/com/edf/gde/sql/init.sql @@ -16,30 +16,31 @@ INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (11, 1, INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (12, 1, 'StudyService',2); -- Set study state INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (13, 1, 'StudyService',3); -- Read study INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (14, 1, 'StudyService',4); -- Delete study +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (15, 1, 'StudyService',5); -- List studies /* Profiles services */ -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (15, 1, 'ProfilesService',1); -- Create profile -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (16, 1, 'ProfilesService',2); -- Delete profile -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (17, 1, 'ProfilesService',3); -- Read profile -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (18, 1, 'ProfilesService',4); -- Update profile -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (19, 1, 'ProfilesService',5); -- Create profile attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (20, 1, 'ProfilesService',6); -- Delete profile attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (21, 1, 'ProfilesService',7); -- Read profile attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (22, 1, 'ProfilesService',8); -- Update profile attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (16, 1, 'ProfilesService',1); -- Create profile +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (17, 1, 'ProfilesService',2); -- Delete profile +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (18, 1, 'ProfilesService',3); -- Read profile +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (19, 1, 'ProfilesService',4); -- Update profile +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (20, 1, 'ProfilesService',5); -- Create profile attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (21, 1, 'ProfilesService',6); -- Delete profile attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (22, 1, 'ProfilesService',7); -- Read profile attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (23, 1, 'ProfilesService',8); -- Update profile attribute /* Attributes services */ -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (23, 1, 'AttributesService',1); -- Create attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (24, 1, 'AttributesService',2); -- Delete attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (25, 1, 'AttributesService',3); -- Read attribute -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (26, 1, 'AttributesService',4); -- Create attribute group -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (27, 1, 'AttributesService',5); -- Delete attribute group -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (28, 1, 'AttributesService',6); -- Update attribute group -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (29, 1, 'AttributesService',7); -- Read attribute group +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (24, 1, 'AttributesService',1); -- Create attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (25, 1, 'AttributesService',2); -- Delete attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (26, 1, 'AttributesService',3); -- Read attribute +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (27, 1, 'AttributesService',4); -- Create attribute group +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (28, 1, 'AttributesService',5); -- Delete attribute group +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (29, 1, 'AttributesService',6); -- Update attribute group +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (30, 1, 'AttributesService',7); -- Read attribute group /* File services */ -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (30, 1, 'FileService',1); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (31, 1, 'FileService',2); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (32, 1, 'FileService',3); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (33, 1, 'FileService',4); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (34, 1, 'FileService',5); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (35, 1, 'FileService',6); -- -INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (36, 1, 'FileService',7); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (31, 1, 'FileService',1); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (32, 1, 'FileService',2); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (33, 1, 'FileService',3); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (34, 1, 'FileService',4); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (35, 1, 'FileService',5); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (36, 1, 'FileService',6); -- +INSERT INTO GROUPPERMISSIONS (id,groupid,servicename,methodindex) VALUES (37, 1, 'FileService',7); -- -- 2.39.2