feat: draft branch can be merged with changes from git

Author: slisson

api-client-ktor/build.gradle.kts

@@ -0,0 +1,53 @@
+import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
+
+plugins {
+    base
+    `maven-publish`
+    alias(libs.plugins.openapi.generator)
+    alias(libs.plugins.kotlin.serialization)
+    kotlin("jvm")
+}
+
+val generatorTask = tasks.register("generateKtorClient", GenerateTask::class) {
+    dependsOn(":redocly:npm_run_bundle")
+    group = "openapi tools"
+    configOptions = mapOf(
+        "library" to "jvm-ktor",
+        "serializationLibrary" to "kotlinx_serialization"
+    )
+    gitUserId = "modelix"
+    gitRepoId = "modelix.openapi"
+    generatorName = "kotlin"
+    inputSpec = project(":redocly")
+        .layout.projectDirectory
+        .file("bundled/git-connector-v1.yaml")
+        .asFile.absolutePath
+    outputDir =
+        layout.buildDirectory
+            .dir("generated/ktor")
+            .get()
+            .asFile.absolutePath
+    //importMappings.put("UUID", "kotlin.uuid.Uuid")
+}
+
+val generatedKotlinSrc = project.layout.buildDirectory.dir("generated/ktor/src/main/kotlin")
+sourceSets.main {
+    kotlin.srcDir(generatedKotlinSrc)
+}
+
+dependencies {
+    api(libs.ktor.client.core)
+    implementation(libs.ktor.client.content.negotiation)
+}
+
+tasks.compileKotlin {
+    dependsOn(generatorTask)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("apiClientKtor") {
+            from(components["java"])
+        }
+    }
+}

gradle/libs.versions.toml

@@ -8,7 +8,17 @@ logback = "1.5.18"
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
 ktor-server-auth = { group = "io.ktor", name = "ktor-server-auth", version.ref = "ktor" }
 ktor-server-data-conversion = { group = "io.ktor", name = "ktor-server-data-conversion", version.ref = "ktor" }
+
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
+ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
+ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" }
+ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
+ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref = "ktor" }
+
+ktor-serialization = { group = "io.ktor", name = "ktor-serialization", version.ref = "ktor" }
+ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 [plugins]
 gitVersion = { id = "com.palantir.git-version", version = "4.0.0" }

settings.gradle.kts

@@ -1,6 +1,7 @@
 
 rootProject.name = "modelix.openapi"
 
+include("api-client-ktor")
 include("redocly")
 //include("client-ts")
 include("api-server-stubs-ktor")

specifications/git-connector/v1/git.yaml

@@ -218,6 +218,79 @@ paths:
       responses:
         "200":
           description: OK
+  /drafts/{draftId}/rebaseJob:
+    get:
+      operationId: getDraftRebaseJob
+      tags: [Drafts]
+      parameters:
+        - name: draftId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DraftRebaseJob'
+    post:
+      operationId: rebaseDraft
+      tags: [Drafts]
+      parameters:
+        - name: draftId
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DraftRebaseJob'
+      responses:
+        "200":
+          description: OK
+
+  /drafts/{draftId}/preparationJob:
+    get:
+      operationId: getDraftBranchPreparationJob
+      tags: [Drafts]
+      parameters:
+        - name: draftId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DraftPreparationJob'
+    post:
+      operationId: prepareDraftBranch
+      tags: [Drafts]
+      parameters:
+        - name: draftId
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DraftPreparationJob'
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DraftPreparationJob'
 
 components:
   schemas:
@@ -318,6 +391,21 @@ components:
         modelixBranchName: { type: string }
         defaultWorkspace: { type: string }
 
+    DraftRebaseJob:
+      type: object
+      required: [baseGitCommit]
+      properties:
+        baseGitCommit: { type: string }
+        gitBranchName: { type: string }
+        active: { type: boolean }
+        errorMessage: { type: string }
+
+    DraftPreparationJob:
+      type: object
+      properties:
+        active: { type: boolean }
+        errorMessage: { type: string }
+
   securitySchemes:
     modelixJwtAuth:
       type: http