Feat/openapi codegen

api/scripts/gen_spring.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# generate code and build files based on openapi spec for springboot backend services
+
+# dependencies:
+#   - npm:
+#       - @openapitools/openapi-generator-cli
+#       - @redocly/cli
+#   - other:
+#       - gradle
+
+# echo linting
+echo "Linting api/openapi.yaml..."
+
+# fail command if any part fails
+set -euo pipefail
+
+# lint openapi spec
+redocly lint api/openapi.yaml
+
+for path in matching user gateway; do
+
+    # echo generating code
+    echo "Generating code for $path..."
+
+    # generate code based on OpenAPI specification
+    openapi-generator-cli generate \
+        -g spring \
+        -i api/openapi.yaml \
+        -o server/$path/generated \
+        --additional-properties=useTags=true,interfaceOnly=true
+
+    # echo generating gradle
+    echo "Generating gradle project files for $path..."
+
+    # generate gradle build files.
+    gradle init \
+        --type pom \
+        --dsl groovy \
+        --no-incubating \
+        --project-dir server/$path/generated
+
+done

deployment/docker/compose.yml

@@ -35,7 +35,7 @@ services:
       - backend
 
   genai-service:
-    build: ../../genai
+    build: ../../server/genai
     container_name: meetatmensa-genai
     expose:
       - "80"
@@ -49,7 +49,7 @@ services:
       - "80:80"
 
   match-database:
-    build: ../../database/matchdb
+    build: ../../server/database/matchdb
     container_name: meetatmensa-matchdb
     # TODO: Implement password passed via secret
     environment:
@@ -62,7 +62,7 @@ services:
       - backend
 
   user-database:
-    build: ../../database/userdb
+    build: ../../server/database/userdb
     container_name: meetatmensa-userdb
     # TODO: Implement password passed via secret
     environment:

server/gateway/Dockerfile

@@ -6,6 +6,11 @@ WORKDIR /app
 COPY build.gradle settings.gradle ./
 COPY src ./src
 
+# Copy only necessary files for generated dependencies
+COPY generated/build.gradle generated/settings.gradle ./generated/
+COPY generated/src ./generated/src
+COPY generated/gradle/libs.versions.toml ./generated/gradle/
+
 # Build the application
 RUN gradle clean bootJar --no-daemon
 

server/gateway/build.gradle

@@ -28,7 +28,7 @@ repositories {
 // }
 
 dependencies {
-	implementation 'org.springframework.cloud:spring-cloud-starter-gateway:4.2.2'
+	implementation 'org.openapitools:openapi-spring'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'io.projectreactor:reactor-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

server/gateway/generated/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

server/gateway/generated/.openapi-generator/FILES

@@ -0,0 +1,25 @@
+.openapi-generator-ignore
+README.md
+pom.xml
+src/main/java/org/openapitools/api/ApiUtil.java
+src/main/java/org/openapitools/api/GenAiApi.java
+src/main/java/org/openapitools/api/MatchingApi.java
+src/main/java/org/openapitools/api/UserApi.java
+src/main/java/org/openapitools/model/ConversationStarter.java
+src/main/java/org/openapitools/model/ConversationStarter1.java
+src/main/java/org/openapitools/model/GetApiV2GenaiConversationStarter200Response.java
+src/main/java/org/openapitools/model/GetApiV2GenaiConversationStarterRequest.java
+src/main/java/org/openapitools/model/GetApiV2MatchingMatchesUserID200Response.java
+src/main/java/org/openapitools/model/GetApiV2MatchingRequestsUserID200Response.java
+src/main/java/org/openapitools/model/Group.java
+src/main/java/org/openapitools/model/Match.java
+src/main/java/org/openapitools/model/MatchPreferences.java
+src/main/java/org/openapitools/model/MatchPreferences1.java
+src/main/java/org/openapitools/model/MatchPreferences2.java
+src/main/java/org/openapitools/model/MatchRequest.java
+src/main/java/org/openapitools/model/MatchStatus.java
+src/main/java/org/openapitools/model/PostApiV2MatchingRequestRequest.java
+src/main/java/org/openapitools/model/PostApiV2UserRegisterRequest.java
+src/main/java/org/openapitools/model/PutApiV2MatchingRequestRequestIdRequest.java
+src/main/java/org/openapitools/model/PutApiV2UserUserIDRequest.java
+src/main/java/org/openapitools/model/User.java

server/gateway/generated/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.14.0

server/gateway/generated/README.md

@@ -0,0 +1,27 @@
+
+# OpenAPI generated API stub
+
+Spring Framework stub
+
+
+## Overview
+This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
+By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub.
+This is an example of building API stub interfaces in Java using the Spring framework.
+
+The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints
+by adding ```@Controller``` classes that implement the interface. Eg:
+```java
+@Controller
+public class PetController implements PetApi {
+// implement all PetApi methods
+}
+```
+
+You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg:
+```java
+@FeignClient(name="pet", url="http://petstore.swagger.io/v2")
+public interface PetClient extends PetApi {
+
+}
+```

server/gateway/generated/build.gradle

@@ -0,0 +1,53 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ */
+
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri('https://repo.maven.apache.org/maven2/')
+    }
+}
+
+dependencies {
+    api libs.org.springframework.boot.spring.boot.starter.web
+    api libs.org.springframework.data.spring.data.commons
+    api libs.org.springdoc.springdoc.openapi.ui
+    api libs.com.google.code.findbugs.jsr305
+    api libs.com.fasterxml.jackson.dataformat.jackson.dataformat.yaml
+    api libs.com.fasterxml.jackson.datatype.jackson.datatype.jsr310
+    api libs.org.openapitools.jackson.databind.nullable
+    api libs.org.springframework.boot.spring.boot.starter.validation
+    api libs.com.fasterxml.jackson.core.jackson.databind
+    testImplementation libs.org.springframework.boot.spring.boot.starter.test
+}
+
+group = 'org.openapitools'
+version = '1.0.0'
+description = 'openapi-spring'
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+
+java {
+    withSourcesJar()
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from(components.java)
+        }
+    }
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+}

server/gateway/generated/gradle.properties

@@ -0,0 +1,5 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+
+org.gradle.configuration-cache=true
+

server/gateway/generated/gradle/libs.versions.toml

@@ -0,0 +1,26 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+com-fasterxml-jackson-core-jackson-databind = "2.13.5"
+com-fasterxml-jackson-dataformat-jackson-dataformat-yaml = "2.13.5"
+com-fasterxml-jackson-datatype-jackson-datatype-jsr310 = "2.13.5"
+com-google-code-findbugs-jsr305 = "3.0.2"
+org-openapitools-jackson-databind-nullable = "0.2.6"
+org-springdoc-springdoc-openapi-ui = "1.6.14"
+org-springframework-boot-spring-boot-starter-test = "2.7.15"
+org-springframework-boot-spring-boot-starter-validation = "2.7.15"
+org-springframework-boot-spring-boot-starter-web = "2.7.15"
+org-springframework-data-spring-data-commons = "2.7.15"
+
+[libraries]
+com-fasterxml-jackson-core-jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "com-fasterxml-jackson-core-jackson-databind" }
+com-fasterxml-jackson-dataformat-jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "com-fasterxml-jackson-dataformat-jackson-dataformat-yaml" }
+com-fasterxml-jackson-datatype-jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "com-fasterxml-jackson-datatype-jackson-datatype-jsr310" }
+com-google-code-findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "com-google-code-findbugs-jsr305" }
+org-openapitools-jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version.ref = "org-openapitools-jackson-databind-nullable" }
+org-springdoc-springdoc-openapi-ui = { module = "org.springdoc:springdoc-openapi-ui", version.ref = "org-springdoc-springdoc-openapi-ui" }
+org-springframework-boot-spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "org-springframework-boot-spring-boot-starter-test" }
+org-springframework-boot-spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "org-springframework-boot-spring-boot-starter-validation" }
+org-springframework-boot-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "org-springframework-boot-spring-boot-starter-web" }
+org-springframework-data-spring-data-commons = { module = "org.springframework.data:spring-data-commons", version.ref = "org-springframework-data-spring-data-commons" }

server/gateway/generated/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists