Skip to content

to work with schedule template upload #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LukeLoze1 wants to merge 7 commits into
base: main
Choose a base branch
from
Open

to work with schedule template upload #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
020242c
to work with schedule template upload
LukeLoze1 Feb 15, 2022
857877b
Merge branch 'main' into 3267-get-a-rough-version-of-lifecycle-stuff-…
LukeLoze1 Feb 15, 2022
dd6b014
Merge branch 'main' into 3267-get-a-rough-version-of-lifecycle-stuff-…
LukeLoze1 Apr 20, 2022
1e606a6
Update pom.xml
LukeLoze1 Apr 20, 2022
cc1e2ea
add back PGObject
LukeLoze1 Apr 26, 2022
415b68c
write as JSON
LukeLoze1 Apr 26, 2022
a5f0507
Fix scheduleTemplate
LukeLoze1 Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>uk.gov.ons.ssdc</groupId>
<artifactId>ssdc-rm-common-entity-model</artifactId>
<version>4.16.1-SNAPSHOT</version>
<version>4.17.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.gov.ons.ssdc</groupId>
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/uk/gov/ons/ssdc/supporttool/endpoint/SurveyEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package uk.gov.ons.ssdc.supporttool.endpoint;

import com.fasterxml.jackson.core.JsonProcessingException;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -75,7 +77,8 @@ public SurveyDto getSurvey(
@Transactional
public ResponseEntity<UUID> createSurvey(
@RequestBody SurveyDto surveyDto,
@Value("#{request.getAttribute('userEmail')}") String userEmail) {
@Value("#{request.getAttribute('userEmail')}") String userEmail)
throws JsonProcessingException, SQLException {
userIdentity.checkGlobalUserPermission(
userEmail, UserGroupAuthorisedActivityType.CREATE_SURVEY);

Expand All @@ -87,6 +90,8 @@ public ResponseEntity<UUID> createSurvey(
survey.setSampleWithHeaderRow(surveyDto.isSampleWithHeaderRow());
survey.setSampleDefinitionUrl(surveyDto.getSampleDefinitionUrl());
survey.setMetadata(surveyDto.getMetadata());
survey.setScheduleTemplate(surveyDto.getScheduleTemplate());

survey = surveyRepository.saveAndFlush(survey);

surveyService.publishSurveyUpdate(survey, userEmail);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/uk/gov/ons/ssdc/supporttool/model/dto/ui/SurveyDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.UUID;
import lombok.Data;
import src.main.java.uk.gov.ons.ssdc.common.model.entity.ScheduleTemplate;
import uk.gov.ons.ssdc.common.validation.ColumnValidator;

@Data
Expand All @@ -13,4 +14,5 @@ public class SurveyDto {
private char sampleSeparator;
private String sampleDefinitionUrl;
private Object metadata;
private ScheduleTemplate scheduleTemplate;
}