async/await対応ともうなんか全部

.env.testing

@@ -1,5 +1,5 @@
 DATABASE_HOST=127.0.0.1
-DATABASE_PORT=3306
+DATABASE_PORT=5432
 DATABASE_USERNAME=vapor_username
 DATABASE_PASSWORD=vapor_password
 DATABASE_NAME=test_agqr_program_guide

.github/workflows/build-push.yml

@@ -12,18 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1.5.1
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ github.event.inputs.version }}

.github/workflows/test.yaml

@@ -6,10 +6,23 @@ on:
       - master
 
 jobs:
-  setup:
-    runs-on: macos-latest
+  build:
+    name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        swift: ["5.9"]
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: swift-actions/setup-swift@v1
+        with:
+          swift-version: ${{ matrix.swift }}
+      - uses: actions/checkout@v4
       - run: swift package resolve
-      - name: swift test
+      - name: Build
+        run: swift build
+      - name: setup service
+        run: |
+          docker compose up -d db --wait
+      - name: Run tests
         run: swift test

Dockerfile

@@ -60,4 +60,4 @@ EXPOSE 8080
 
 # Start the Vapor service when the image is run, default to listening on 8080 in production environment
 ENTRYPOINT ["./Run"]
-CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Makefile

@@ -21,6 +21,6 @@ migrate:
 build:
 	docker-compose build --no-cache
 up:
-	docker-compose up -d db redis
+	docker-compose up -d db
 down:
 	docker-compose down

Package.resolved

@@ -47,12 +47,12 @@
         }
       },
       {
-        "package": "fluent-mysql-driver",
-        "repositoryURL": "https://github.com/vapor/fluent-mysql-driver.git",
+        "package": "fluent-postgres-driver",
+        "repositoryURL": "https://github.com/vapor/fluent-postgres-driver.git",
         "state": {
           "branch": null,
-          "revision": "f86bf9c80a1c176234a16796c19add399a266c38",
-          "version": "4.0.2"
+          "revision": "7c266b539f71331ad6e53ea8fae587ccdaf972f2",
+          "version": "2.2.6"
         }
       },
       {
@@ -92,57 +92,21 @@
         }
       },
       {
-        "package": "mysql-kit",
-        "repositoryURL": "https://github.com/vapor/mysql-kit.git",
+        "package": "postgres-kit",
+        "repositoryURL": "https://github.com/vapor/postgres-kit.git",
         "state": {
           "branch": null,
-          "revision": "f54e0876fce2d68551be0e704b3a94f78eedb9f8",
-          "version": "4.5.0"
+          "revision": "35deea5c28a7d402f3280d81dee37bed5c56b9fe",
+          "version": "2.8.3"
         }
       },
       {
-        "package": "mysql-nio",
-        "repositoryURL": "https://github.com/vapor/mysql-nio.git",
+        "package": "postgres-nio",
+        "repositoryURL": "https://github.com/vapor/postgres-nio.git",
         "state": {
           "branch": null,
-          "revision": "f0e8ad7e18e870e8665311d70bf3f01dcd6024a8",
-          "version": "1.4.0"
-        }
-      },
-      {
-        "package": "queues",
-        "repositoryURL": "https://github.com/vapor/queues.git",
-        "state": {
-          "branch": null,
-          "revision": "58b2d785118d164b38c59beb595cbffbea7608ef",
-          "version": "1.8.1"
-        }
-      },
-      {
-        "package": "queues-redis-driver",
-        "repositoryURL": "https://github.com/vapor/queues-redis-driver.git",
-        "state": {
-          "branch": null,
-          "revision": "2728477b50e24be82f5bc0bd0722c35656e1c5b1",
-          "version": "1.0.3"
-        }
-      },
-      {
-        "package": "redis",
-        "repositoryURL": "https://github.com/vapor/redis.git",
-        "state": {
-          "branch": null,
-          "revision": "e955843b08064071f465a6b1ca9e04bebad8623a",
-          "version": "4.6.0"
-        }
-      },
-      {
-        "package": "RediStack",
-        "repositoryURL": "https://gitlab.com/mordil/RediStack.git",
-        "state": {
-          "branch": null,
-          "revision": "5458d6476e05d5f1b43097f1bc9b599e936b5f2f",
-          "version": "1.3.0"
+          "revision": "d648c5b4594ffbc2f6173318f70f5531e05ccb4e",
+          "version": "1.11.0"
         }
       },
       {
@@ -163,6 +127,15 @@
           "version": "3.18.0"
         }
       },
+      {
+        "package": "swift-atomics",
+        "repositoryURL": "https://github.com/apple/swift-atomics.git",
+        "state": {
+          "branch": null,
+          "revision": "cd142fd2f64be2100422d658e7411e39489da985",
+          "version": "1.2.0"
+        }
+      },
       {
         "package": "swift-backtrace",
         "repositoryURL": "https://github.com/swift-server/swift-backtrace.git",

Package.swift

@@ -1,19 +1,17 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
     name: "agqr-program-guide",
     platforms: [
-       .macOS(.v10_15)
+        .macOS(.v12)
     ],
     dependencies: [
         // 💧 A server-side Swift web framework.
         .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/fluent-mysql-driver.git", from: "4.0.0"),
+        .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0"),
         .package(url: "https://github.com/vapor/leaf.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/redis.git", from: "4.0.0"),
-        .package(url: "https://github.com/vapor/queues-redis-driver.git", from: "1.0.0"),
         // HTML Parser
         .package(url: "https://github.com/tid-kijyun/Kanna.git", .upToNextMajor(from: "5.2.4"))
     ],
@@ -22,10 +20,8 @@ let package = Package(
             name: "App",
             dependencies: [
                 .product(name: "Fluent", package: "fluent"),
-                .product(name: "FluentMySQLDriver", package: "fluent-mysql-driver"),
+                .product(name: "FluentPostgresDriver", package: "fluent-postgres-driver"),
                 .product(name: "Leaf", package: "leaf"),
-                .product(name: "Redis", package: "redis"),
-                .product(name: "QueuesRedisDriver", package: "queues-redis-driver"),
                 .product(name: "Vapor", package: "vapor"),
                 .product(name: "Kanna", package: "Kanna"),
 

Sources/App/Commands/ImportWeeklyPGCommand.swift

@@ -0,0 +1,49 @@
+import Fluent
+import Vapor
+
+struct ImportWeeklyPGCommand: Command {
+    let parser: ProgramGuideParsing
+    let repository: ProgramGuideSaving
+    let client = DownloadAgqrProgramGuide()
+
+    struct Signature: CommandSignature {}
+
+    var help: String = "Import weekly program guides into db"
+
+    func run(using context: CommandContext, signature: Signature) throws {
+        context.console.info("Start Process")
+        defer {
+            context.console.info("End Process")
+        }
+
+        let promise = context.application.eventLoopGroup.next().makePromise(of: Void.self)
+        promise.completeWithTask {
+            await self.asyncRun(using: context, signature: signature)
+        }
+
+        try promise.futureResult.wait()
+    }
+
+    func asyncRun(using context: CommandContext, signature: Signature) async {
+        let responses = await client.fetchWeekly(app: context.application)
+        for response in responses {
+            guard let response = response else {
+                context.console.error("NotFound program data")
+                continue
+            }
+            do {
+                let programGuide = try self.parser.parse(response)
+                guard programGuide.count > 0 else {
+                    context.console.error("parsed programs length is 0")
+                    continue
+                }
+                await self.repository.save(programGuide, app: context.application)
+                context.console.info("success: \(programGuide[0].program.startDatetime)")
+            } catch let error as AgqrParseError {
+                context.console.error(.init(stringLiteral: error.message))
+            } catch {
+                context.console.error(.init(stringLiteral: error.localizedDescription))
+            }
+        }
+    }
+}

Sources/App/Commands/ScrapingAgqrCommand.swift

@@ -7,8 +7,8 @@ struct ScrapingAgqr: Command {
     let client = DownloadAgqrProgramGuide()
 
     struct Signature: CommandSignature {
-        @Option(name: "url")
-        var url: String?
+        @Argument(name: "url")
+        var url: String
     }
 
     var help: String = "Download program guide and parse to json."
@@ -18,23 +18,27 @@ struct ScrapingAgqr: Command {
         defer {
             context.console.info("End Process")
         }
-        let future = client.execute(app: context.application, url: signature.url)
-            .unwrap(or: fatalError("htmlデータの取得に失敗しました"))
-            .flatMap { res -> EventLoopFuture<Void> in
-                do {
-                    let programGuide = try self.parser.parse(res)
-                    context.console.info(programGuide.map { element in element.program.startDatetime.toString() }.joined(separator: ","))
-                    return context.application.eventLoopGroup.future()
-                } catch {
-                    return context.application.eventLoopGroup.future(error: error)
-                }
-            }
 
+        let promise = context.application.eventLoopGroup.next().makePromise(of: Void.self)
+        promise.completeWithTask {
+            await self.asyncRun(using: context, signature: signature)
+        }
+
+        try promise.futureResult.wait()
+    }
+
+    func asyncRun(using context: CommandContext, signature: Signature) async {
+        let response = await client.execute(app: context.application, url: signature.url)
+        guard let response = response else {
+            context.console.error("htmlデータの取得に失敗しました")
+            return
+        }
         do {
-            try future.wait()
+            let programGuide = try parser.parse(response)
+            context.console.info(programGuide.map { element in element.program.startDatetime.toString() }.joined(separator: "\n"))
+            await repository.save(programGuide, app: context.application)
         } catch {
-            print("Batch failure")
-            print(error.localizedDescription)
+            context.console.error(.init(stringLiteral: error.localizedDescription))
         }
     }
 }