Changeset 4276


Ignore:
Timestamp:
01/16/14 15:57:00 (10 years ago)
Author:
olhsha
Message:

Updated (and tested) according to the updated schema

Location:
DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/DBIntegrityService.java

    r4264 r4276  
    239239     */
    240240   
     241    public boolean updateAccount(UUID userExternalID, String account);
    241242   
    242243   

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/UserDao.java

    r4264 r4276  
    1818package eu.dasish.annotation.backend.dao;
    1919
    20 import eu.dasish.annotation.schema.CurrentUserInfo;
    2120import eu.dasish.annotation.schema.User;
     21import java.util.UUID;
    2222
    2323
    … …  
    4545     public Number getUserInternalIDFromRemoteID(String remoteID);
    4646     
     47     public boolean updateAccount(UUID externalID, String account);
     48     
    4749     public Number updateUser(User user);
    4850   

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java

    r4264 r4276  
    371371
    372372    ///// UPDATERS /////////////////
     373   
     374    @Override
     375    public boolean updateAccount(UUID userExternalID, String account) {
     376        return userDao.updateAccount(userExternalID, account);
     377    }
     378   
    373379    @Override
    374380    public int updateAnnotationPrincipalPermission(Number annotationID, Number userID, Permission permission) {
    … …  
    456462        Number annotationID = annotationDao.addAnnotation(annotation);
    457463        int affectedAnnotRows = addTargets(annotation, annotationID);
     464        int addedPrincipalsPermissions = addPrincipalsPermissions(annotation.getPermissions().getUserWithPermission(), annotationID);
    458465        int affectedPermissions = annotationDao.addAnnotationPrincipalPermission(annotationID, userID, Permission.OWNER);
    459466        return annotationID;
    … …  
    556563        } else {
    557564            if (annotation.getBody().getTextBody() != null) {
    558                 bodyText = annotation.getBody().getTextBody().getValue();
     565                bodyText = annotation.getBody().getTextBody().getBody();
    559566                mimeType = annotationBody.getTextBody().getMimeType();
    560567            } else {

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDao.java

    r4264 r4276  
    292292                TextBody textBody = new TextBody();
    293293                textBody.setMimeType(rs.getString(body_mimetype));
    294                 textBody.setValue(rs.getString(body_text));
     294                textBody.setBody(rs.getString(body_text));
    295295                body.setTextBody(textBody);
    296296            }
    … …  
    509509            TextBody textBody = annotationBody.getTextBody();
    510510            if (textBody != null) {
    511                 result[0] = textBody.getValue();
     511                result[0] = textBody.getBody();
    512512                result[1] = textBody.getMimeType();
    513513            } else {

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcResourceDao.java

    r4264 r4276  
    5151    // base string constants: field Names
    5252    final static protected String account = "account";
     53    final static protected String admin = "admin";
     54    final static protected String developer = "developer";
     55    final static protected String user = "user";
    5356    final static protected String annotation_id = "annotation_id";
    5457    final static protected String notebook_id = "notebook_id";
    … …  
    199202        }
    200203    };
    201    
    202204    protected final RowMapper<Number> notebookOwnerIDRowMapper = new RowMapper<Number>() {
    203205        @Override

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcUserDao.java

    r4264 r4276  
    4242
    4343    @Override
    44     public void setServiceURI(String serviceURI){
     44    public void setServiceURI(String serviceURI) {
    4545        _serviceURI = serviceURI;
    4646    }
    47    
     47
    4848    /////////// GETTERS //////////////////////
    49     @Override 
    50     public User getUser(Number internalID){
    51         StringBuilder sql  = new StringBuilder("SELECT ");
     49    @Override
     50    public User getUser(Number internalID) {
     51        StringBuilder sql = new StringBuilder("SELECT ");
    5252        sql.append(principalStar).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
    5353        List<User> result = getSimpleJdbcTemplate().query(sql.toString(), userRowMapper, internalID);
    5454        return (!result.isEmpty() ? result.get(0) : null);
    55      }
    56    
     55    }
    5756    private final RowMapper<User> userRowMapper = new RowMapper<User>() {
    5857        @Override
    … …  
    6564        }
    6665    };
    67    
    68     @Override 
    69     public User getUserByInfo(String eMail){
    70         StringBuilder sql  = new StringBuilder("SELECT ");
     66
     67    @Override
     68    public User getUserByInfo(String eMail) {
     69        StringBuilder sql = new StringBuilder("SELECT ");
    7170        sql.append(principalStar).append(" FROM ").append(principalTableName).append(" WHERE ").append(e_mail).append("= ? LIMIT 1");
    7271        List<User> result = getSimpleJdbcTemplate().query(sql.toString(), userRowMapper, eMail.toLowerCase());
    7372        return (!result.isEmpty() ? result.get(0) : null);
    74      }
    75    
    76    
    77    
     73    }
     74
    7875    @Override
    7976    public boolean userIsInUse(Number userID) {
    80         StringBuilder sqlPermissions  = new StringBuilder("SELECT ");
     77        StringBuilder sqlPermissions = new StringBuilder("SELECT ");
    8178        sqlPermissions.append(principal_id).append(" FROM ").append(permissionsTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
    8279        List<Number> resultTargets = getSimpleJdbcTemplate().query(sqlPermissions.toString(), principalIDRowMapper, userID);
    … …  
    8481            return true;
    8582        };
    86        
    87         StringBuilder sqlNotebooks  = new StringBuilder("SELECT ");
     83
     84        StringBuilder sqlNotebooks = new StringBuilder("SELECT ");
    8885        sqlNotebooks.append(notebookOwner_id).append(" FROM ").append(notebookTableName).append(" WHERE ").append(notebookOwner_id).append("= ? LIMIT 1");
    8986        List<Number> resultNotebooks = getSimpleJdbcTemplate().query(sqlNotebooks.toString(), notebookOwnerIDRowMapper, userID);
    … …  
    9390        return false;
    9491    }
    95    
    96    
    97     @Override
    98     public boolean userExists(User user){
     92
     93    @Override
     94    public boolean userExists(User user) {
    9995        String emailCriterion = user.getEMail().toLowerCase();
    100         StringBuilder sqlTargets  = new StringBuilder("SELECT ");
     96        StringBuilder sqlTargets = new StringBuilder("SELECT ");
    10197        sqlTargets.append(principal_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(e_mail).append("= ? LIMIT 1");
    10298        List<Number> resultTargets = getSimpleJdbcTemplate().query(sqlTargets.toString(), principalIDRowMapper, emailCriterion);
    10399        if (resultTargets.size() > 0) {
    104100            return true;
    105         }
    106         else {
     101        } else {
    107102            return false;
    108103        }
    109104    }
    110105
    111     @Override 
    112     public String getRemoteID(Number internalID){
    113         StringBuilder requestDB  = new StringBuilder("SELECT ");
     106    @Override
     107    public String getRemoteID(Number internalID) {
     108        StringBuilder requestDB = new StringBuilder("SELECT ");
    114109        requestDB.append(remote_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
    115110        List<String> result = getSimpleJdbcTemplate().query(requestDB.toString(), remoteIDRowMapper, internalID);
    116        return  (result.size() > 0) ? result.get(0) :null;
     111        return (result.size() > 0) ? result.get(0) : null;
    117112    }
    118113    private final RowMapper<String> remoteIDRowMapper = new RowMapper<String>() {
    … …  
    122117        }
    123118    };
    124    
    125     @Override
    126     public Number getUserInternalIDFromRemoteID(String remoteID){
    127        StringBuilder requestDB = new StringBuilder("SELECT ");
    128        requestDB.append(principal_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(remote_id).append("= ? LIMIT 1");
    129        List<Number> result = getSimpleJdbcTemplate().query(requestDB.toString(), internalIDRowMapper, remoteID);
    130        return  (result.size() > 0) ? result.get(0) :null;
    131     }
    132    
    133     @Override
    134     public String getTypeOfUserAccount(Number internalID){
    135        StringBuilder requestDB = new StringBuilder("SELECT ");
    136        requestDB.append(account).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
    137        List<String> result = getSimpleJdbcTemplate().query(requestDB.toString(), adminRightsRowMapper, internalID);
    138        return  (result.size() > 0) ? result.get(0) :null;   
    139     }
    140      private final RowMapper<String> adminRightsRowMapper = new RowMapper<String>() {
     119
     120    @Override
     121    public Number getUserInternalIDFromRemoteID(String remoteID) {
     122        StringBuilder requestDB = new StringBuilder("SELECT ");
     123        requestDB.append(principal_id).append(" FROM ").append(principalTableName).append(" WHERE ").append(remote_id).append("= ? LIMIT 1");
     124        List<Number> result = getSimpleJdbcTemplate().query(requestDB.toString(), internalIDRowMapper, remoteID);
     125        return (result.size() > 0) ? result.get(0) : null;
     126    }
     127
     128    @Override
     129    public String getTypeOfUserAccount(Number internalID) {
     130        StringBuilder requestDB = new StringBuilder("SELECT ");
     131        requestDB.append(account).append(" FROM ").append(principalTableName).append(" WHERE ").append(principal_id).append("= ? LIMIT 1");
     132        List<String> result = getSimpleJdbcTemplate().query(requestDB.toString(), adminRightsRowMapper, internalID);
     133        return (result.size() > 0) ? result.get(0) : null;
     134    }
     135    private final RowMapper<String> adminRightsRowMapper = new RowMapper<String>() {
    141136        @Override
    142137        public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
    … …  
    144139        }
    145140    };
    146    
    147      ///////////////////// ADDERS ////////////////////////////
    148      @Override
    149      public Number addUser(User user, String remoteID){
     141
     142    ///////////////////// ADDERS ////////////////////////////
     143    @Override
     144    public Number addUser(User user, String remoteID) {
    150145        UUID externalIdentifier = UUID.randomUUID();
    151146        String newExternalIdentifier = externalIdentifier.toString();
    … …  
    155150        params.put("email", user.getEMail().toLowerCase());
    156151        params.put("remoteID", remoteID);
     152        params.put("accountType", this.user);
    157153        StringBuilder sql = new StringBuilder("INSERT INTO ");
    158         sql.append(principalTableName).append("(").append(external_id).append(",").append(principal_name).append(",").append(e_mail).append(",").append(remote_id).append(" ) VALUES (:externalId, :principalName, :email, :remoteID)");
     154        sql.append(principalTableName).append("(").append(external_id).append(",").
     155                append(principal_name).append(",").append(e_mail).append(",").
     156                append(remote_id).append(",").append(account).append(" ) VALUES (:externalId, :principalName, :email, :remoteID, :accountType)");
    159157        final int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), params);
    160         return (affectedRows>0 ? getInternalID(externalIdentifier) : null);
    161      }
    162      
    163      ////////// UPDATERS ///////////////////////
    164       @Override
    165       public Number updateUser(User user){
     158        return (affectedRows > 0 ? getInternalID(externalIdentifier) : null);
     159    }
     160
     161    ////////// UPDATERS ///////////////////////
     162    @Override
     163    public boolean updateAccount(UUID externalID, String account) {
     164        if (!account.equals(admin) && !account.equals(developer) && !account.equals(user)) {
     165            logger.error("the given type of account '" + account + "' does not exist.");
     166            return false;
     167        }
     168        Number principalID = this.getInternalID(externalID);
     169        if (principalID != null) {
     170            Map<String, Object> params = new HashMap<String, Object>();
     171            params.put("externalId", externalID.toString());
     172            params.put("accountType", account);
     173            StringBuilder sql = new StringBuilder("UPDATE ");
     174            sql.append(principalTableName).append(" SET ").
     175                    append(this.account).append("= :accountType").
     176                    append(" WHERE ").append(external_id).append("= :externalId");
     177            int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), params);
     178            if (affectedRows > 0) {
     179                return true;
     180            } else {
     181                logger.error("For some reason the database refuses update the account of " + externalID.toString() + " . Consult the servers' respond.");
     182                return false;
     183            }
     184        } else {
     185            logger.error("The user with external ID " + externalID.toString() + " is not found in the data base");
     186            return false;
     187        }
     188
     189    }
     190
     191    @Override
     192    public Number updateUser(User user) {
    166193        Number principalID = this.getInternalIDFromURI(user.getURI());
    167194        StringBuilder sql = new StringBuilder("UPDATE ");
    … …  
    172199        int affectedRows = getSimpleJdbcTemplate().update(sql.toString(), principalID);
    173200        return principalID;
    174       }
    175      
    176      
    177      ////// DELETERS ////////////
    178      @Override
    179      public int deleteUser(Number internalID){
    180            
     201    }
     202
     203    ////// DELETERS ////////////
     204    @Override
     205    public int deleteUser(Number internalID) {
     206
    181207        StringBuilder sql = new StringBuilder("DELETE FROM ");
    182208        sql.append(principalTableName).append(" where ").append(principal_id).append(" = ?");
    183209        return getSimpleJdbcTemplate().update(sql.toString(), internalID);
    184210
    185      }
    186      
    187     @Override 
    188     public int deleteUserSafe(Number internalID){
    189           if (userIsInUse(internalID)) {
     211    }
     212
     213    @Override
     214    public int deleteUserSafe(Number internalID) {
     215        if (userIsInUse(internalID)) {
    190216            return 0;
    191         }       
     217        }
    192218        StringBuilder sql = new StringBuilder("DELETE FROM ");
    193219        sql.append(principalTableName).append(" where ").append(principal_id).append(" = ?");
    194220        return getSimpleJdbcTemplate().update(sql.toString(), internalID);
    195221
    196      }
     222    }
    197223}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/AnnotationResource.java

    r4267 r4276  
    3333import eu.dasish.annotation.schema.ResponseBody;
    3434import eu.dasish.annotation.schema.UserWithPermission;
    35 import java.io.BufferedReader;
    36 import java.io.FileReader;
    3735import java.io.IOException;
    3836import java.net.URI;
    … …  
    8886    final String default_permission = "reader";
    8987    private final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
    90     private final String admin = "admin";
    91     private final String developer = "developer";
    92 
     88   
    9389    public void setUriInfo(UriInfo uriInfo) {
    9490        this.uriInfo = uriInfo;

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/DebugResource.java

    r4267 r4276  
    11/*
    2  * Copyright (C) 2014 DASISH
     2 * Copyright (C) 2013 DASISH
    33 *
    44 * This program is free software; you can redistribute it and/or
    … …  
    2626import java.util.ArrayList;
    2727import java.util.List;
     28import java.util.UUID;
    2829import javax.servlet.ServletContext;
    2930import javax.servlet.http.HttpServletRequest;
    3031import javax.servlet.http.HttpServletResponse;
    3132import javax.ws.rs.GET;
     33import javax.ws.rs.PUT;
    3234import javax.ws.rs.Path;
    3335import javax.ws.rs.PathParam;
    … …  
    3638import javax.ws.rs.core.MediaType;
    3739import javax.ws.rs.core.UriInfo;
    38 import javax.ws.rs.ext.Providers;
    3940import javax.xml.bind.JAXBElement;
    4041import org.slf4j.Logger;
    … …  
    6465   
    6566    final String default_permission = "reader";
    66     private final Logger logger = LoggerFactory.getLogger(AnnotationResource.class);
     67    private final Logger logger = LoggerFactory.getLogger(DebugResource.class);
    6768    private final String admin = "admin";
    6869    private final String developer = "developer";
    … …  
    128129    }
    129130   
     131    @PUT
     132    @Produces(MediaType.TEXT_XML)
     133    @Path("account/{userId}/make/{account}")
     134    @Transactional(readOnly = true)
     135    public String updateUsersAccount(@PathParam("userId") String userId, @PathParam("account") String account) throws IOException {
     136        dbIntegrityService.setServiceURI(uriInfo.getBaseUri().toString());
     137        Number userID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
     138        if (userID != null) {
     139            String typeOfAccount = dbIntegrityService.getTypeOfUserAccount(userID);
     140            if (typeOfAccount.equals(admin)) {
     141                final boolean update = dbIntegrityService.updateAccount(UUID.fromString(userId), account);
     142                return (update ? "The account is updated" : "The account is not updated, see the log.");
     143            } else {
     144                httpServletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "The logged in user is not admin, and therefore cannot perform this request.");
     145                return null;
     146            }
     147        } else {
     148            httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The logged in user is not found in the database");
     149            return null;
     150        }
     151
     152    }
     153
     154   
    130155}

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/sql/DashishAnnotatorCreate.sql

    r4262 r4276  
    4444    remote_id text UNIQUE NOT NULL,
    4545    principal_name text,
    46     e_mail text
     46    e_mail text,
     47    account text
    4748);
    4849

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/TestInstances.java

    r4173 r4276  
    7575        body.setTextBody(textBody);
    7676        textBody.setMimeType(bodyMimeType);
    77         textBody.setValue(bodyTxt);
     77        textBody.setBody(bodyTxt);
    7878       
    7979        result.setHeadline(headline);

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceTest.java

    r4262 r4276  
    1818package eu.dasish.annotation.backend.dao.impl;
    1919
    20 import eu.dasish.annotation.backend.Helpers;
    2120import eu.dasish.annotation.backend.TestBackendConstants;
    2221import eu.dasish.annotation.backend.TestInstances;
    … …  
    4443import java.util.Map;
    4544import java.util.UUID;
    46 import javax.sql.rowset.serial.SerialBlob;
    4745import javax.sql.rowset.serial.SerialException;
    4846import javax.xml.datatype.DatatypeFactory;
    … …  
    180178        mockBody.setTextBody(textBody);
    181179        textBody.setMimeType("text/plain");
    182         textBody.setValue(TestBackendConstants._TEST_ANNOT_2_BODY);
     180        textBody.setBody(TestBackendConstants._TEST_ANNOT_2_BODY);
    183181        mockAnnotation.setBody(mockBody);
    184182        mockAnnotation.setTargets(null);
    … …  
    254252        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations+TestBackendConstants._TEST_ANNOT_2_EXT, result.getURI());
    255253        assertEquals("text/plain", result.getBody().getTextBody().getMimeType());
    256         assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, result.getBody().getTextBody().getValue());
     254        assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, result.getBody().getTextBody().getBody());
    257255        assertEquals(TestBackendConstants._TEST_ANNOT_2_HEADLINE, result.getHeadline());
    258256        assertEquals(TestBackendConstants._TEST_ANNOT_2_TIME_STAMP, result.getLastModified().toString());
    … …  
    688686                ///////////
    689687
    690                 oneOf(annotationDao).updateAnnotationBody(6, testAnnotation.getBody().getTextBody().getValue(), testAnnotation.getBody().getTextBody().getMimeType(), false);
     688                oneOf(annotationDao).updateAnnotationBody(6, testAnnotation.getBody().getTextBody().getBody(), testAnnotation.getBody().getTextBody().getMimeType(), false);
    691689                will(returnValue(1)); // the DB update will be called at perform anyway, even if the body is not changed (can be optimized)
    692690

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcAnnotationDaoTest.java

    r4262 r4276  
    235235       
    236236        assertEquals(TestBackendConstants._TEST_ANNOT_2_HEADLINE, result.getHeadline());
    237         assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, result.getBody().getTextBody().getValue());
     237        assertEquals(TestBackendConstants._TEST_ANNOT_2_BODY, result.getBody().getTextBody().getBody());
    238238        assertEquals(TestBackendConstants._TEST_BODY_MIMETYPE_HTML, result.getBody().getTextBody().getMimeType());
    239239        assertEquals(TestBackendConstants._TEST_SERVLET_URI_annotations+
    … …  
    281281        assertFalse(null == addedAnnotation.getLastModified());
    282282        assertEquals(annotationToAdd.getBody().getTextBody().getMimeType(), addedAnnotation.getBody().getTextBody().getMimeType());
    283         assertEquals(annotationToAdd.getBody().getTextBody().getValue(), addedAnnotation.getBody().getTextBody().getValue());
     283        assertEquals(annotationToAdd.getBody().getTextBody().getBody(), addedAnnotation.getBody().getTextBody().getBody());
    284284        assertEquals(annotationToAdd.getHeadline(), addedAnnotation.getHeadline());
    285285        System.out.println("creation time "+addedAnnotation.getLastModified());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationResourceTest.java

    r4173 r4276  
    193193        body.setTextBody(textBody);
    194194        textBody.setMimeType("text/plain");
    195         textBody.setValue("blah");
     195        textBody.setBody("blah");
    196196       
    197197        TargetInfo TargetInfo = new TargetInfo();

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/rest/AnnotationsTest.java

    r4209 r4276  
    158158        assertEquals(200, response.getStatus());
    159159        Annotation entity = response.getEntity(Annotation.class);
    160         assertEquals(testAnnotation.getBody().getTextBody().getValue(), entity.getBody().getTextBody().getValue());
     160        assertEquals(testAnnotation.getBody().getTextBody().getBody(), entity.getBody().getTextBody().getBody());
    161161        assertEquals(testAnnotation.getHeadline(), entity.getHeadline());
    162162        assertEquals(testAnnotation.getOwnerRef(), entity.getOwnerRef());
    … …  
    220220        TextBody textBody = new TextBody();
    221221        textBody.setMimeType("plain/text");
    222         textBody.setValue("yanuk - zek");
     222        textBody.setBody("yanuk - zek");
    223223        annotationBody.setTextBody(textBody);
    224224        annotationToAdd.setBody(annotationBody);
    … …  
    230230        ResponseBody entity = response.getEntity(ResponseBody.class);       
    231231        Annotation entityA = entity.getAnnotation();
    232         assertEquals(annotationToAdd.getBody().getTextBody().getValue(), entityA.getBody().getTextBody().getValue());
     232        assertEquals(annotationToAdd.getBody().getTextBody().getBody(), entityA.getBody().getTextBody().getBody());
    233233        assertEquals(annotationToAdd.getBody().getTextBody().getMimeType(), entityA.getBody().getTextBody().getMimeType());
    234234        assertEquals(annotationToAdd.getHeadline(), entityA.getHeadline());

  • DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/resources/test-data/InsertTestData.sql

    r4262 r4276  
    2121--
    2222
    23 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('a user', '00000000-0000-0000-0000-000000000003', 'a1', 'a.user@gmail.com'); -- 1
    24 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('b user', '00000000-0000-0000-0000-000000000004', 'b2', 'b.user@gmail.com');-- 2
     23INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('a user', '00000000-0000-0000-0000-000000000003', 'a1', 'a.user@gmail.com', 'user'); -- 1
     24INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('b user', '00000000-0000-0000-0000-000000000004', 'b2', 'b.user@gmail.com', 'user');-- 2
    2525
    2626INSERT INTO notebook (title, owner_id, external_id) VALUES ('a notebook', 2, '00000000-0000-0000-0000-000000000001'); -- 1
    … …  
    3737-- Test data for jdbcAnnotationDao --
    3838
    39 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('Twan', '00000000-0000-0000-0000-000000000111', 'x3', 'twagoo@mpi.nl'); --3
    40 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('Peter', '00000000-0000-0000-0000-000000000112', 'y4', 'Peter.Withers@mpi.nl'); -- 4
    41 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('Olha', '00000000-0000-0000-0000-000000000113', 'JUnit@test.com', 'olhsha@mpi.nl'); -- 5
    42 INSERT INTO principal (principal_name, external_id, remote_id, e_mail) VALUES ('Eric', '00000000-0000-0000-0000-000000000114', 'v6', 'eriaue@mpi.nl'); -- 6
     39INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Twan', '00000000-0000-0000-0000-000000000111', 'x3', 'twagoo@mpi.nl', 'developer'); --3
     40INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Peter', '00000000-0000-0000-0000-000000000112', 'y4', 'Peter.Withers@mpi.nl', 'developer'); -- 4
     41INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Olha', '00000000-0000-0000-0000-000000000113', 'JUnit@test.com', 'olhsha@mpi.nl', 'admin'); -- 5
     42INSERT INTO principal (principal_name, external_id, remote_id, e_mail, account) VALUES ('Eric', '00000000-0000-0000-0000-000000000114', 'v6', 'eriaue@mpi.nl', 'developer'); -- 6
    4343
    4444
Note: See TracChangeset for help on using the changeset viewer.