Commit 1b4952a9 authored by Diamantis Tziotzios's avatar Diamantis Tziotzios
Browse files

Merge branch 'Development'

parents 3ada5a0d f5de71d0

dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java

+5 −2
Original line number Diff line number Diff line 
package eu.eudat.data.converters;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.format.datetime.DateFormatter;



import javax.persistence.AttributeConverter;
@@ -15,6 +17,7 @@ import java.util.TimeZone; 
 */

@Converter

public class DateToUTCConverter implements AttributeConverter<Date, Date> {

    private static final Logger logger = LoggerFactory.getLogger(DateToUTCConverter.class);



    @Override

    public Date convertToDatabaseColumn(Date attribute) {
@@ -25,7 +28,7 @@ public class DateToUTCConverter implements AttributeConverter<Date, Date> { 
            String date = formatterIST.format(attribute);

            return formatterIST.parse(date);

        } catch (ParseException e) {

            e.printStackTrace();

            logger.error(e.getMessage(), e);

        }

        return null;

    }
@@ -39,7 +42,7 @@ public class DateToUTCConverter implements AttributeConverter<Date, Date> { 
            String date = formatterIST.format(dbData);

            return formatterIST.parse(date);

        } catch (ParseException e) {

            e.printStackTrace();

            logger.error(e.getMessage(), e);

        }

        return null;

    }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java

+16 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ public class DataManagementPlanPublicCriteria extends Criteria<DMP> { 
    public List<UUID> datasetProfile;

    private List<String> dmpOrganisations;

    private Integer role;

    private boolean allVersions;

    private List<UUID> groupIds;



    public GrantStateType getGrantStatus() {

        return grantStatus;
@@ -47,4 +49,18 @@ public class DataManagementPlanPublicCriteria extends Criteria<DMP> { 
    public void setRole(Integer role) {

        this.role = role;

    }



    public boolean getAllVersions() {

        return allVersions;

    }

    public void setAllVersions(boolean allVersions) {

        this.allVersions = allVersions;

    }



    public List<UUID> getGroupIds() {

        return groupIds;

    }

    public void setGroupIds(List<UUID> groupIds) {

        this.groupIds = groupIds;

    }

}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ public class DatasetCriteria extends Criteria<Dataset> { 
    private List<UUID> grants;

    private List<UUID> collaborators;

    private List<UUID> datasetTemplates;

    private List<UUID> groupIds;



    public boolean getAllVersions() {

        return allVersions;
@@ -105,4 +106,11 @@ public class DatasetCriteria extends Criteria<Dataset> { 
    public void setDatasetTemplates(List<UUID> datasetTemplates) {

        this.datasetTemplates = datasetTemplates;

    }



    public List<UUID> getGroupIds() {

        return groupIds;

    }

    public void setGroupIds(List<UUID> groupIds) {

        this.groupIds = groupIds;

    }

}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> { 
    private List<UUID> groupIds;

    private Short filter;

    private UUID userId;

    private boolean finalized;



    public boolean getAllVersions() { return allVersions; }

    public void setAllVersions(boolean allVersions) { this.allVersions = allVersions; }
@@ -52,4 +53,11 @@ public class DatasetProfileCriteria extends Criteria<DatasetProfile> { 
    public void setUserId(UUID userId) {

        this.userId = userId;

    }



    public boolean getFinalized() {

        return finalized;

    }

    public void setFinalized(boolean finalized) {

        this.finalized = finalized;

    }

}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java

+2 −1
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ import eu.eudat.data.entities.Dataset; 
import eu.eudat.data.entities.UserInfo;

import eu.eudat.queryable.QueryableList;



import java.util.List;

import java.util.UUID;



public interface DatasetDao extends DatabaseAccessLayer<Dataset, UUID> {



    QueryableList<Dataset> getWithCriteria(DatasetCriteria criteria);



    QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal);

    QueryableList<Dataset> getAuthenticated(QueryableList<Dataset> query, UserInfo principal, List<Integer> roles);



    Dataset isPublicDataset(UUID id);