diff --git a/Dockerfile b/Dockerfile index 9212410a58..ac53fd07f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,6 @@ COPY view/pom.xml view/pom.xml COPY war/pom.xml war/pom.xml COPY daisy-integration/pom.xml daisy-integration/pom.xml -# Download dependencies in a separate layer to allow caching for future builds -RUN ./mvnw dependency:go-offline \ - --batch-mode \ - --define includeScope=compile \ - --activate-profiles docker-dependencies - COPY api/src/ api/src/ COPY core/src/ core/src/ COPY view/src/ view/src/ @@ -26,7 +20,6 @@ COPY war/src/ war/src/ COPY daisy-integration/src/ daisy-integration/src/ RUN ./mvnw package \ - --offline \ --define skipTests \ --activate-profiles branch,DEV \ --define skip.npm \ diff --git a/compose-branch-deploy.yaml b/compose-branch-deploy.yaml index aba04bbb51..05ba4bd181 100644 --- a/compose-branch-deploy.yaml +++ b/compose-branch-deploy.yaml @@ -21,6 +21,8 @@ services: - OAUTH2_RESOURCE_SERVER_ID=scipro_api_client - OAUTH2_RESOURCE_SERVER_SECRET=scipro_api_secret - OAUTH2_RESOURCE_SERVER_INTROSPECTION_URI=https://oauth2-${VHOST}/introspect + - OAUTH2_GS_AUTHORIZATION_URI=https://oauth2-gs-${VHOST} + - OAUTH2_GS_CLIENT_REDIRECT_URI=https://${VHOST}/oauth/callback networks: - traefik - internal @@ -64,6 +66,25 @@ services: - "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.rule=Host(`oauth2-${VHOST}`)" - "traefik.http.routers.oauth2-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt" + oauth2-gs: + build: + context: https://github.com/dsv-su/toker.git + dockerfile: embedded.Dockerfile + restart: unless-stopped + environment: + - CLIENT_ID=scipro_client + - CLIENT_SECRET=scipro_secret + - CLIENT_REDIRECT_URI=https://${VHOST}/oauth/callback + - RESOURCE_SERVER_ID=scipro_api_client + - RESOURCE_SERVER_SECRET=scipro_api_secret + - CLIENT_SCOPES=grade:read grade:write + networks: + - traefik + labels: + - "traefik.enable=true" + - "traefik.http.routers.oauth2-gs-${COMPOSE_PROJECT_NAME}.rule=Host(`oauth2-gs-${VHOST}`)" + - "traefik.http.routers.oauth2-gs-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt" + networks: traefik: name: traefik diff --git a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java b/core/src/main/java/se/su/dsv/scipro/DataInitializer.java index 54d464cee6..7807205f64 100644 --- a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java +++ b/core/src/main/java/se/su/dsv/scipro/DataInitializer.java @@ -4,11 +4,15 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.persistence.EntityManager; import jakarta.transaction.Transactional; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.time.LocalDate; import java.time.LocalTime; import java.time.Month; import java.util.*; +import java.util.function.Function; import se.su.dsv.scipro.checklist.ChecklistCategory; +import se.su.dsv.scipro.file.FileUpload; import se.su.dsv.scipro.match.ApplicationPeriod; import se.su.dsv.scipro.match.Idea; import se.su.dsv.scipro.match.IdeaService; @@ -22,6 +26,8 @@ import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.report.AbstractGradingCriterion; import se.su.dsv.scipro.report.GradingCriterionPointTemplate; import se.su.dsv.scipro.report.GradingReportTemplate; +import se.su.dsv.scipro.reviewing.ReviewerAssignmentService; +import se.su.dsv.scipro.reviewing.RoughDraftApprovalService; import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.system.*; import se.su.dsv.scipro.util.Pair; @@ -51,6 +57,12 @@ public class DataInitializer implements Lifecycle { @Inject private Provider<EntityManager> em; + @Inject + private RoughDraftApprovalService roughDraftApprovalService; + + @Inject + private ReviewerAssignmentService reviewerAssignmentService; + private static final String MAIL = "@example.com"; private static final String ADMIN = "admin"; @@ -77,12 +89,13 @@ public class DataInitializer implements Lifecycle { private Set<ResearchArea> researchAreas; private Long researchAreaId = RESEARCH_AREA_ID; private Set<Language> languages; + private ApplicationPeriod applicationPeriod; + private Keyword keyword1; private ResearchArea researchArea1; private ResearchArea researchArea2; private ProjectType masterClass; private ProjectType magisterClass; - private ApplicationPeriod applicationPeriod; - private Keyword keyword1; + private Project project2; @Transactional @Override @@ -98,12 +111,23 @@ public class DataInitializer implements Lifecycle { createUsers(); createMatchedIdea(); createProjects(); + createRoughDraftApproval(); } if (profile.getCurrentProfile() == Profiles.DEV && noAdminUser()) { createAdmin(); } } + private void createRoughDraftApproval() { + roughDraftApprovalService.requestApproval( + project2, + new SimpleTextFile(project2.getHeadSupervisor(), "thesis.txt", "text/plain"), + "Please approve" + ); + + reviewerAssignmentService.assignReviewer(project2, eric_employee); + } + @Override public void stop() {} @@ -155,10 +179,10 @@ public class DataInitializer implements Lifecycle { private void createProjects() { createProject(PROJECT_1, eric_employee, sture_student, stina_student, eve_employee); - createProject(PROJECT_2, eve_employee, sid_student, simon_student, eric_employee); + project2 = createProject(PROJECT_2, eve_employee, sid_student, simon_student, eric_employee); } - private void createProject(String title, User headSupervisor, User student1, User student2, User reviewer) { + private Project createProject(String title, User headSupervisor, User student1, User student2, User reviewer) { Project project = Project.builder() .title(title) .projectType(bachelorClass) @@ -169,6 +193,7 @@ public class DataInitializer implements Lifecycle { project.addProjectParticipant(student1); project.addReviewer(reviewer); save(project); + return project; } private void createUsers() { @@ -1932,4 +1957,42 @@ public class DataInitializer implements Lifecycle { em.get().persist(entity); return entity; } + + private static final class SimpleTextFile implements FileUpload { + + private final User uploader; + private final String fileName; + private final String content; + + private SimpleTextFile(User uploader, String fileName, String content) { + this.uploader = uploader; + this.fileName = fileName; + this.content = content; + } + + @Override + public String getFileName() { + return fileName; + } + + @Override + public String getContentType() { + return "text/plain"; + } + + @Override + public User getUploader() { + return uploader; + } + + @Override + public long getSize() { + return content.length(); + } + + @Override + public <T> T handleData(Function<InputStream, T> handler) { + return handler.apply(new ByteArrayInputStream(content.getBytes())); + } + } } diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html index dfbda44988..b67dc4bcbb 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html @@ -4,6 +4,7 @@ <wicket:panel> <strong>Current thesis:</strong> <span wicket:id="currentThesis">[thesis.pdf (2014-08-08)]</span><br> <strong>Status:</strong> <span wicket:id="currentStatus">[Undecided]</span> <br> + <strong>Deadline:</strong> <span wicket:id="deadline">[Undecided]</span> <br> <strong>Supervisor comment:</strong> <span wicket:id="currentDecision.comment">[Undecided]</span> <br> <wicket:enclosure> <strong>Reason:</strong> <span wicket:id="currentReason">[I need more time]</span><br> diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java index 00ba26aa74..6781c946d9 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java @@ -28,6 +28,7 @@ public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerAppro ) ); add(new EnumLabel<>("currentStatus", process.map(ReviewerApproval::getCurrentStatus))); + add(new DateLabel("deadline", process.map(ReviewerApproval::getCurrentDeadline))); add( new MultiLineLabel( "currentDecision.comment", diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java index 35269ebf7a..753f2db147 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java @@ -10,6 +10,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import se.su.dsv.scipro.SciProTest; +import se.su.dsv.scipro.components.DateLabel; import se.su.dsv.scipro.file.FileDescription; import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.project.Project; @@ -44,6 +45,12 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { tester.assertModelValue(path(panel, "currentStatus"), finalSeminarApproval.getCurrentStatus()); } + @Test + public void shows_deadline() { + tester.assertComponent(path(panel, "deadline"), DateLabel.class); + tester.assertModelValue(path(panel, "deadline"), finalSeminarApproval.getCurrentDeadline()); + } + @Test public void shows_current_reason_if_a_decision_has_been_made() { startPanelWithApprovedFinalSeminar(); diff --git a/war/pom.xml b/war/pom.xml index 19e7317b23..c1dd889587 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -140,46 +140,5 @@ <spring.profile.active>branch</spring.profile.active> </properties> </profile> - <profile> - <id>docker-dependencies</id> - <!-- - Some dependencies are not discovered by default when running dependency:go-offline. - They are added here manually to allow Docker build layers to be cached properly. - --> - <dependencies> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>classmate</artifactId> - </dependency> - <dependency> - <groupId>net.bytebuddy</groupId> - <artifactId>byte-buddy-agent</artifactId> - </dependency> - <dependency> - <groupId>com.querydsl</groupId> - <artifactId>querydsl-apt</artifactId> - <version>${querydsl.version}</version> - <classifier>jakarta</classifier> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> diff --git a/war/src/main/resources/application-branch.properties b/war/src/main/resources/application-branch.properties index 0d6cb9b213..47d660c18a 100644 --- a/war/src/main/resources/application-branch.properties +++ b/war/src/main/resources/application-branch.properties @@ -7,10 +7,10 @@ profile=DEV # No secrets available for branch deployment to branch.dsv.su.se # Will have to set up some mock API for this later service.grading.url= -oauth.uri= -oauth.clientId= -oauth.clientSecret= -oauth.redirectUri= +oauth.uri=${OAUTH2_GS_AUTHORIZATION_URI:http://localhost:59734/authorize} +oauth.clientId=${OAUTH2_CLIENT_ID:scipro} +oauth.clientSecret=${OAUTH2_CLIENT_SECRET:s3cr3t} +oauth.redirectUri=${OAUTH2_GS_CLIENT_REDIRECT_URI} # No secrets available for branch deployment to branch.dsv.su.se # Will have to set up some mock API for this later