Merge pull request #149 from devcordde/events

Implement #9 and some refactoring

Author: Goldmensch

backend/src/main/java/club/devcord/devmarkt/DevelopmentStartup.java

@@ -16,14 +16,11 @@
 
 package club.devcord.devmarkt;
 
-import club.devcord.devmarkt.repositories.TemplateRepo;
-import io.micronaut.context.BeanContext;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.context.event.StartupEvent;
 import io.micronaut.json.JsonMapper;
 import io.micronaut.security.token.jwt.generator.JwtTokenGenerator;
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import java.util.Map;
 import org.slf4j.Logger;

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

@@ -16,6 +16,7 @@
 
 package club.devcord.devmarkt.auth;
 
+import club.devcord.devmarkt.ws.SessionMetaData;
 import graphql.ExecutionInput;
 import io.micronaut.configuration.graphql.GraphQLExecutionInputCustomizer;
 import io.micronaut.http.HttpRequest;
@@ -28,17 +29,26 @@
 public class InvocationDataCustomizer implements GraphQLExecutionInputCustomizer {
 
   private final UserProvider provider;
+  private final SessionMetaData sessionMetaData;
 
-  public InvocationDataCustomizer(UserProvider provider) {
+  public InvocationDataCustomizer(UserProvider provider, SessionMetaData sessionMetaData) {
     this.provider = provider;
+    this.sessionMetaData = sessionMetaData;
   }
 
   @Override
   public Publisher<ExecutionInput> customize(ExecutionInput executionInput, HttpRequest httpRequest,
       MutableHttpResponse<String> httpResponse) {
     httpRequest.getHeaders().getAuthorization()
         .flatMap(provider::validate)
-        .ifPresent(user -> executionInput.getGraphQLContext().put("user", user));
+        .ifPresent(user -> {
+          executionInput.getGraphQLContext().put("user", user);
+          var session = sessionMetaData.getHttpRequestWebSocketSessionMap().get(httpRequest);
+          if (session != null) {
+            sessionMetaData.getUserSessions().put(user.id(), session);
+          }
+        });
+    sessionMetaData.getHttpRequestWebSocketSessionMap().remove(httpRequest);
     return Mono.just(executionInput);
   }
 }

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

@@ -18,7 +18,7 @@
 
 import club.devcord.devmarkt.auth.error.UnauthorizedError;
 import club.devcord.devmarkt.entities.auth.User;
-import club.devcord.devmarkt.responses.Failure;
+import club.devcord.devmarkt.responses.FailureException;
 import club.devcord.devmarkt.responses.failure.application.ErrorCode;
 import club.devcord.devmarkt.services.ApplicationService;
 import graphql.execution.DataFetcherResult;
@@ -69,11 +69,10 @@ public GraphQLFieldDefinition onField(
       }
       LOGGER.info("Rejecting request because user {} doesn't own application id: {}",
           user.id(), value);
-      return fieldBooleanReturn
-          ? false
-          : DataFetcherResult.newResult()
-          .data(new Failure<>(ErrorCode.NOT_FOUND))
-          .build();
+      if (fieldBooleanReturn) {
+        return false;
+      }
+      throw new FailureException(ErrorCode.NOT_FOUND);
     };
 
     environment.setFieldDataFetcher(authDataFetcher);

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

@@ -53,7 +53,7 @@ public GraphQLFieldDefinition onField(
       }
 
       if (user.role() == expectedRole || user.role() == Role.ADMIN) {
-        return originalDataFetcher.get(env);
+          return originalDataFetcher.get(env);
       }
       LOGGER.info("Rejecting forbidden request for user {}", user.id());
       return DataFetcherResult.newResult()

backend/src/main/java/club/devcord/devmarkt/responses/Response.java renamed to backend/src/main/java/club/devcord/devmarkt/entities/application/ApplicationProcessEvent.java

@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package club.devcord.devmarkt.responses;
+package club.devcord.devmarkt.entities.application;
 
-public sealed interface Response<T> permits Failure, Success {
+import club.devcord.devmarkt.graphql.GraphQLType;
+import io.micronaut.core.annotation.Introspected;
 
-  default Object graphQlUnion() {
-    return this instanceof Success<T> success
-        ? success.value()
-        : this;
-  }
+@Introspected
+@GraphQLType("ApplicationProcessEvent")
+public record ApplicationProcessEvent(
+    Integer id,
+    ApplicationStatus status
+) {
 
 }

backend/src/main/java/club/devcord/devmarkt/responses/Success.java renamed to backend/src/main/java/club/devcord/devmarkt/graphql/CustomInstrumentation.java

@@ -14,14 +14,19 @@
  * limitations under the License.
  */
 
-package club.devcord.devmarkt.responses;
+package club.devcord.devmarkt.graphql;
 
-public record Success<T>(
-    T value
-) implements Response<T> {
+import graphql.execution.instrumentation.SimpleInstrumentation;
+import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters;
+import graphql.schema.DataFetcher;
+import jakarta.inject.Singleton;
 
-  public static <T> Response<T> response(T value) {
-    return new Success<>(value);
-  }
+@Singleton
+public class CustomInstrumentation extends SimpleInstrumentation {
 
+  @Override
+  public DataFetcher<?> instrumentDataFetcher(DataFetcher<?> dataFetcher,
+      InstrumentationFieldFetchParameters parameters) {
+    return new ProxyDataFetcher<>(dataFetcher);
+  }
 }

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

@@ -54,7 +54,8 @@ public GraphQL graphQL(
       ResourceResolver resourceResolver,
       BeanContext context,
       RoleDirective roleDirective,
-      OwnApplicationDirective ownApplicationDirective) {
+      OwnApplicationDirective ownApplicationDirective,
+      CustomInstrumentation customInstrumentation) {
     var builder = new SchemaParserBuilder()
         .scalars(JavaPrimitives.GraphQLLong, TemplateNameScalar.TEMPLATE_NAME,
             ExtendedScalars.NonNegativeInt, ExtendedScalars.PositiveInt, ExtendedScalars.DateTime,
@@ -72,6 +73,7 @@ public GraphQL graphQL(
         .makeExecutableSchema();
 
     return GraphQL.newGraphQL(schema)
+        .instrumentation(customInstrumentation)
         .build();
   }
 

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

@@ -0,0 +1,57 @@
+/*
+ * 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.graphql;
+
+import club.devcord.devmarkt.logging.LogMsgGenerator;
+import club.devcord.devmarkt.responses.Failure;
+import club.devcord.devmarkt.responses.FailureException;
+import graphql.execution.DataFetcherResult;
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLObjectType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProxyDataFetcher<T> implements DataFetcher<Object> {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ProxyDataFetcher.class);
+
+  private final DataFetcher<T> originalDataFetcher;
+  public ProxyDataFetcher(DataFetcher<T> originalDataFetcher) {
+    this.originalDataFetcher = originalDataFetcher;
+  }
+
+  @Override
+  public Object get(DataFetchingEnvironment environment) throws Exception {
+    var schema = environment.getGraphQLSchema();
+    Object result;
+    try {
+      result = originalDataFetcher.get(environment);
+    } catch (FailureException exception) {
+      result = DataFetcherResult.newResult()
+          .data(new Failure(exception.errors()))
+          .build();
+    }
+    if (environment.getParentType() instanceof GraphQLObjectType type
+      && (type == schema.getSubscriptionType()
+      || (type == schema.getMutationType())
+      || (type == schema.getQueryType()))) {
+      LOGGER.info(LogMsgGenerator.generateMsg(environment, result));
+    }
+    return result;
+  }
+}

backend/src/main/java/club/devcord/devmarkt/graphql/application/ApplicationMutation.java

@@ -17,9 +17,9 @@
 package club.devcord.devmarkt.graphql.application;
 
 import club.devcord.devmarkt.entities.application.Answer;
+import club.devcord.devmarkt.entities.application.Application;
 import club.devcord.devmarkt.entities.application.ApplicationStatus;
 import club.devcord.devmarkt.entities.auth.User;
-import club.devcord.devmarkt.logging.LoggingUtil;
 import club.devcord.devmarkt.services.ApplicationService;
 import graphql.kickstart.tools.GraphQLMutationResolver;
 import graphql.schema.DataFetchingEnvironment;
@@ -39,33 +39,22 @@ public ApplicationMutation(ApplicationService service) {
     this.service = service;
   }
 
-  public Object createApplication(String templateName, ArrayList<Answer> answers,
+  public Application createApplication(String templateName, ArrayList<Answer> answers,
       DataFetchingEnvironment environment) {
     var user = (User) environment.getGraphQlContext().get("user");
-    var response = service.createApplication(templateName, answers, user);
-    LOGGER.info("Application creation: User: {}, TemplateName: {}, Successful: {}",
-        user.id(), templateName, LoggingUtil.responseStatus(response));
-    return response.graphQlUnion();
+    return service.createApplication(templateName, answers, user);
   }
 
   public boolean deleteApplication(int id) {
-    var response = service.deleteApplication(id);
-    LOGGER.info("Application deletion. ID: {}, Successful: {}", id, response);
-    return response;
+    return service.deleteApplication(id);
   }
 
-  public Object updateApplication(int id, ArrayList<Answer> updatedAnswers) {
-    var response = service.updateApplication(id, updatedAnswers);
-    LOGGER.info("Application update. ID: {}, AnswerNumbers: {}, Response: {}", id,
-        updatedAnswers.stream().map(Answer::number).toArray(),
-        LoggingUtil.responseStatus(response));
-    return response.graphQlUnion();
+  public Application updateApplication(int id, ArrayList<Answer> updatedAnswers) {
+    return service.updateApplication(id, updatedAnswers);
   }
 
   public boolean processApplication(int id, ApplicationStatus status) {
-    var response = service.processApplication(id, status);
-    LOGGER.info("Application process. ID: {}, Successful: {}, Status: {}", id, response, status);
-    return response;
+    return service.processApplication(id, status);
   }
 
 }

backend/src/main/java/club/devcord/devmarkt/graphql/application/ApplicationQuery.java

@@ -16,7 +16,7 @@
 
 package club.devcord.devmarkt.graphql.application;
 
-import club.devcord.devmarkt.logging.LoggingUtil;
+import club.devcord.devmarkt.entities.application.Application;
 import club.devcord.devmarkt.services.ApplicationService;
 import graphql.kickstart.tools.GraphQLQueryResolver;
 import jakarta.inject.Singleton;
@@ -34,10 +34,7 @@ public ApplicationQuery(ApplicationService service) {
     this.service = service;
   }
 
-  public Object application(int id) {
-    var response = service.application(id);
-    LOGGER.info("Application fetched with id: {} Successful: {}", id,
-        LoggingUtil.responseStatus(response));
-    return response.graphQlUnion();
+  public Application application(int id) {
+    return  service.application(id);
   }
 }