Merge branch 'main' into replace-ignore-where-with-true

Author: Goldmensch

.gitignore

@@ -42,3 +42,4 @@ build
 node_modules/
 
 .graphqlconfig
+.application.log*

backend/src/main/java/club/devcord/devmarkt/auth/OwnApplicationDirective.java

@@ -18,7 +18,8 @@
 
 import club.devcord.devmarkt.auth.error.UnauthorizedError;
 import club.devcord.devmarkt.entities.auth.User;
-import club.devcord.devmarkt.responses.Applications;
+import club.devcord.devmarkt.responses.Failure;
+import club.devcord.devmarkt.responses.failure.application.ErrorCode;
 import club.devcord.devmarkt.services.ApplicationService;
 import graphql.execution.DataFetcherResult;
 import graphql.schema.DataFetcher;
@@ -71,7 +72,7 @@ public GraphQLFieldDefinition onField(
       return fieldBooleanReturn
           ? false
           : DataFetcherResult.newResult()
-          .data(Applications.notFound(value))
+          .data(new Failure<>(ErrorCode.NOT_FOUND))
           .build();
     };
 

backend/src/main/java/club/devcord/devmarkt/graphql/GraphQLFactory.java

@@ -105,10 +105,14 @@ private Class<?> resolverClass(GraphQLResolver<?> resolver) {
   private void registerTypes(SchemaParserBuilder builder, BeanContext context) {
     context.getBeanDefinitions(Qualifiers.byStereotype(GraphQLType.class))
         .forEach(beanDefinition -> {
-          var type = beanDefinition.stringValue(GraphQLType.class).orElseThrow();
+          var type = beanDefinition.stringValue(GraphQLType.class);
           var beanType = beanDefinition.getBeanType();
-          builder.dictionary(type, beanType);
-          LOGGER.info("GraphQL Type {} mapped to class {}.", type, beanType);
+
+          var typeName = type.isEmpty()
+              ? beanType.getSimpleName()
+              : type.get();
+          builder.dictionary(typeName, beanType);
+          LOGGER.info("GraphQL Type {} mapped to class {}.", typeName, beanType);
         });
   }
 

backend/src/main/java/club/devcord/devmarkt/graphql/GraphQLType.java

@@ -24,5 +24,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface GraphQLType {
 
-  String value();
+  String value() default "";
 }

backend/src/main/java/club/devcord/devmarkt/logging/LoggingUtil.java

@@ -19,16 +19,21 @@
 import club.devcord.devmarkt.responses.Failure;
 import club.devcord.devmarkt.responses.Response;
 import club.devcord.devmarkt.responses.Success;
+import club.devcord.devmarkt.responses.failure.Error;
+import java.util.Arrays;
 
 public class LoggingUtil {
 
   private LoggingUtil() {
 
   }
 
-  public static String responseStatus(Response response) {
-    if (response instanceof Failure fail) {
-      return fail.errorCode();
+  public static <T> String responseStatus(Response<T> response) {
+    if (response instanceof Failure<T> fail) {
+      return Arrays.toString(fail.errors()
+          .stream()
+          .map(Error::code)
+          .toArray());
     } else if (response instanceof Success) {
       return "success";
     }

backend/src/main/java/club/devcord/devmarkt/qa/DatabaseSeedingController.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 Contributors to the Devmarkt-Backend project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package club.devcord.devmarkt.qa;
+
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Post;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Controller("qa")
+@Requires(env = "qa")
+public class DatabaseSeedingController {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSeedingController.class);
+  private final QaDatabaseSeeding qaDatabaseSeeding;
+
+  public DatabaseSeedingController(QaDatabaseSeeding qaDatabaseSeeding) {
+    this.qaDatabaseSeeding = qaDatabaseSeeding;
+  }
+
+  @Post("seedDatabase")
+  public void seedDatabase() {
+    LOGGER.info("requested database seeding");
+    qaDatabaseSeeding.reseedDatabase();
+  }
+
+}

…/devcord/devmarkt/QaDatabaseSeeding.java …vcord/devmarkt/qa/QaDatabaseSeeding.javabackend/src/main/java/club/devcord/devmarkt/QaDatabaseSeeding.java renamed to backend/src/main/java/club/devcord/devmarkt/qa/QaDatabaseSeeding.java backend/src/main/java/club/devcord/devmarkt/QaDatabaseSeeding.java renamed to backend/src/main/java/club/devcord/devmarkt/qa/QaDatabaseSeeding.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package club.devcord.devmarkt;
+package club.devcord.devmarkt.qa;
 
 import club.devcord.devmarkt.auth.Role;
 import club.devcord.devmarkt.entities.application.Answer;
@@ -30,8 +30,11 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.runtime.event.ApplicationStartupEvent;
+import io.micronaut.transaction.exceptions.TransactionSystemException;
+import io.micronaut.transaction.jdbc.DataSourceTransactionManager;
 import jakarta.inject.Singleton;
 import java.util.List;
+import org.flywaydb.core.Flyway;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,6 +48,10 @@ public class QaDatabaseSeeding implements ApplicationEventListener<ApplicationSt
   private final UserRepo userRepo;
   private final ApplicationRepo applicationRepo;
 
+  private final DataSourceTransactionManager dataSourceTransactionManager;
+
+  private final Flyway flyway;
+
   private Template devSearched;
   private Template devOffered;
   private Template emptyTemplate;
@@ -54,14 +61,35 @@ public class QaDatabaseSeeding implements ApplicationEventListener<ApplicationSt
   private User secondUserUser;
 
   public QaDatabaseSeeding(TemplateRepo templateRepo,
-      UserRepo userRepo, ApplicationRepo applicationRepo) {
+      UserRepo userRepo, ApplicationRepo applicationRepo,
+      DataSourceTransactionManager dataSourceTransactionManager, Flyway flyway) {
     this.templateRepo = templateRepo;
     this.userRepo = userRepo;
     this.applicationRepo = applicationRepo;
+    this.dataSourceTransactionManager = dataSourceTransactionManager;
+    this.flyway = flyway;
   }
 
   @Override
   public void onApplicationEvent(ApplicationStartupEvent event) {
+    seed();
+  }
+
+  public void reseedDatabase() {
+    LOGGER.info("Reseeding database");
+    try {
+      flyway.clean();
+      flyway.migrate();
+      seed();
+    } catch (TransactionSystemException e) {
+      LOGGER.info("TransactionSystemException occurred, might be have something to do with prepared statement caching."
+          + "Retrying...");
+      // As this is only used for qa tests, this should be fine to avoid errors with caching (retrying solves them usually here)
+      reseedDatabase();
+    }
+  }
+
+  private void seed() {
     LOGGER.info("Starting database seeding");
     seedTemplates();
     seedUsers();

backend/src/main/java/club/devcord/devmarkt/responses/Applications.java

@@ -17,11 +17,26 @@
 package club.devcord.devmarkt.responses;
 
 import club.devcord.devmarkt.graphql.GraphQLType;
+import club.devcord.devmarkt.responses.failure.Error;
+import club.devcord.devmarkt.responses.failure.ErrorCode;
+import club.devcord.devmarkt.responses.failure.ErrorData;
+import java.util.Collection;
+import java.util.Collections;
 
-@GraphQLType("Failure")
+@GraphQLType
 public record Failure<T>(
-    String errorCode,
-    String message
+    Collection<Error<T>> errors
 ) implements Response<T> {
 
+  public Failure(ErrorCode<T> code) {
+    this(code, (ErrorData<T>) null);
+  }
+  public Failure(ErrorCode<T> code, ErrorData<T> data) {
+    this(Collections.singletonList(new Error<>(code, data)));
+  }
+
+  public Failure(ErrorCode<T> code, Collection<ErrorData<T>> data) {
+    this(data.stream().map(eD -> new Error<>(code, eD)).toList());
+  }
+
 }