Merge pull request #3 from MatsMoll/feature/improvments

Feature/improvments

.github/workflows/swift.yml

@@ -22,7 +22,7 @@ jobs:
           POSTGRES_DB: postgres
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1.2.0
     - name: Run unit tests
       run: |
         apt-get -qq update && apt-get install -y \

Sources/App/Practice Session/PracticeSessionWebController.swift

@@ -20,7 +20,7 @@ final class PracticeSessionWebController: RouteCollection {
         router.get("practice-sessions/history", use: getSessions)
     }
 
-    func renderCurrentTask(on req: Request) throws -> Future<HTTPResponse> {
+    func renderCurrentTask(on req: Request) throws -> Future<Response> {
 
         let user = try req.requireAuthenticated(User.self)
 
@@ -40,6 +40,14 @@ final class PracticeSessionWebController: RouteCollection {
                             .taskAt(index: index, on: conn)
                             .flatMap { task in
                                 try task.render(in: session, index: index, for: user, on: req)
+                                    .encode(for: req)
+                        }
+                        .catchFlatMap { _ in
+                            try PracticeSession.Repository
+                                .end(session, for: user, on: conn)
+                                .map { _ in
+                                    try req.redirect(to: "/practice-sessions/\(session.requireID())/result")
+                            }
                         }
                 }
         }

Sources/App/Topic/TopicWebController.swift

@@ -34,13 +34,13 @@ final class TopicWebController: RouteCollection {
             .flatMap { subject in
 
                 try Topic.Repository
-                    .getTopics(in: subject, conn: req)
+                    .getTopicsWithTaskCount(in: subject, conn: req)
                     .flatMap { topics in
 
                         req.withPooledConnection(to: .psql) { conn in
 
                             try TaskResultRepository
-                                .getUserLevel(for: user.requireID(), in: topics.map { try $0.requireID() }, on: conn)
+                                .getUserLevel(for: user.requireID(), in: topics.map { try $0.0.requireID() }, on: conn)
                                 .flatMap { levels in
 
                                     try TaskResultRepository

Tests/AppTests/MultipleChoiseTaskTests.swift

@@ -13,8 +13,7 @@ import KognitaCore
 import KognitaCoreTestable
 
 class MultipleChoiseTaskTests: VaporTestCase {
-
-
+
     // GET /subjects/:id/topics/:id/multiple-choises
 
     func testGetAllTasks() throws {

test-on-linux.sh

@@ -0,0 +1,2 @@
+docker build -t test -f test.dockerfile .
+docker run test

test.dockerfile

@@ -0,0 +1,11 @@
+FROM swift:5.1.2-bionic
+
+WORKDIR /package
+
+COPY . ./
+
+RUN apt-get -qq update && apt-get install -y \
+  libssl-dev zlib1g-dev \
+  && rm -r /var/lib/apt/lists/*
+RUN swift package clean
+CMD swift test