Merge pull request #266 from sohosai/develop

deploy 20240427

.github/workflows/cd-beta.yaml

@@ -24,7 +24,7 @@ on:
 jobs:
   push-image:
     if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false'
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -72,7 +72,7 @@ jobs:
           cache-to: type=gha,mode=max
 
   deploy:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: push-image
     if: |
       (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) ||
@@ -81,6 +81,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: develop
+      - name: ubuntu mirror
+        run: sudo sed -i.bak -r 's@http://(jp\.)?archive\.ubuntu\.com/ubuntu/?@https://ftp.udx.icscoe.jp/Linux/ubuntu/@g' /etc/apt/sources.list
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: sudo apt-get update && sudo apt-get install -y jq
       - name: Deploy to Portainer
         run: |
           # List stacks
@@ -122,9 +128,9 @@ jobs:
           VERIFY_SSL: "true"
 
   notify:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: [push-image, deploy]
-    if: always() && !failure() && !cancelled()
+    if: always() && !cancelled()
     steps:
       - name: Notify
         uses: sarisia/actions-status-discord@v1

.github/workflows/cd-staging.yaml

@@ -24,7 +24,7 @@ on:
 jobs:
   push-image:
     if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false'
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -75,7 +75,7 @@ jobs:
           cache-to: type=gha,mode=max
 
   deploy:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: push-image
     if: |
       (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) ||
@@ -84,6 +84,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: develop
+      - name: ubuntu mirror
+        run: sudo sed -i.bak -r 's@http://(jp\.)?archive\.ubuntu\.com/ubuntu/?@https://ftp.udx.icscoe.jp/Linux/ubuntu/@g' /etc/apt/sources.list
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: sudo apt-get update && sudo apt-get install -y jq
       - name: Deploy to Portainer
         run: |
           # List stacks
@@ -125,9 +131,9 @@ jobs:
           VERIFY_SSL: "true"
 
   notify:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: [push-image, deploy]
-    if: always() && !failure() && !cancelled()
+    if: always() && !cancelled()
     steps:
       - name: Notify
         uses: sarisia/actions-status-discord@v1

.github/workflows/cd.yaml

@@ -23,7 +23,7 @@ on:
 jobs:
   push-image:
     if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false'
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -71,7 +71,7 @@ jobs:
           cache-to: type=gha,mode=max
 
   deploy:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: push-image
     if: |
       (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) ||
@@ -123,9 +123,9 @@ jobs:
           rm .env"
 
   notify:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     needs: [push-image, deploy]
-    if: always() && !failure() && !cancelled()
+    if: always() && !cancelled()
     steps:
       - name: Notify
         uses: sarisia/actions-status-discord@v1

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: [self-hosted, portainer]
+    runs-on: [self-hosted, garm]
     steps:
       - uses: actions/checkout@v4
       - name: Symlink

Cargo.toml

@@ -51,6 +51,7 @@ tower-http = { version = "0.5.1", features = ["cors", "trace"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 unicode-segmentation = "1.11.0"
+utoipa = { version = "4.2.0", features = ["axum_extras", "yaml"] }
 uuid = { version = "1.7.0", features = ["v4", "serde"] }
 url = "2.5.0"
 percent-encoding = "2.3.1"

crates/sos24-presentation/Cargo.toml

@@ -27,3 +27,4 @@ tower.workspace = true
 tower-http.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
+utoipa.workspace = true

crates/sos24-presentation/src/bin/gen-openapi.rs

@@ -0,0 +1,11 @@
+use sos24_presentation::route::ApiDoc;
+use utoipa::OpenApi;
+
+fn main() {
+    let doc = generate_openapi();
+    print!("{doc}");
+}
+
+fn generate_openapi() -> String {
+    ApiDoc::openapi().to_yaml().unwrap()
+}

crates/sos24-presentation/src/error.rs

@@ -4,6 +4,7 @@ use axum::{
     Json,
 };
 use serde::Serialize;
+use utoipa::ToSchema;
 
 pub mod convert_error;
 
@@ -23,7 +24,8 @@ impl AppError {
     }
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, ToSchema)]
+#[schema(as = Error)]
 pub struct ErrorResponse {
     code: String,
     message: String,

crates/sos24-presentation/src/model/file.rs

@@ -1,15 +1,22 @@
 use serde::{Deserialize, Serialize};
 
 use sos24_use_case::dto::file::{FileDto, FileInfoDto};
+use utoipa::{IntoParams, ToSchema};
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct File {
+    #[schema(format = "uuid")]
     pub id: String,
+    #[schema(format = "uri")]
     pub url: String,
     pub name: String,
+    #[schema(format = "uuid")]
     pub owner: Option<String>,
+    #[schema(format = "date-time")]
     pub created_at: String,
+    #[schema(format = "date-time")]
     pub updated_at: String,
+    #[schema(format = "date-time")]
     pub deleted_at: Option<String>,
 }
 
@@ -27,25 +34,37 @@ impl From<FileDto> for File {
     }
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, IntoParams)]
 pub struct CreateFileQuery {
+    #[param(inline)]
     pub visibility: Visibility,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(ToSchema)]
+pub struct CreateFile {
+    #[schema(format = "binary")]
+    pub file: String,
+}
+
+#[derive(Debug, Deserialize, ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum Visibility {
     Private,
     Public,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, ToSchema)]
 pub struct FileInfo {
+    #[schema(format = "uuid")]
     pub id: String,
     pub filename: String,
+    #[schema(format = "uuid")]
     pub owner: Option<String>,
+    #[schema(format = "date-time")]
     pub created_at: String,
+    #[schema(format = "date-time")]
     pub updated_at: String,
+    #[schema(format = "date-time")]
     pub deleted_at: Option<String>,
 }
 
@@ -62,13 +81,16 @@ impl From<FileInfoDto> for FileInfo {
     }
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, ToSchema)]
 pub struct CreatedFile {
+    #[schema(format = "uuid")]
     pub ids: Vec<String>,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, IntoParams)]
 pub struct ExportFileQuery {
+    #[param(format = "uuid")]
     pub project_id: Option<String>,
+    #[param(format = "uuid")]
     pub form_id: Option<String>,
 }