Merge pull request #10 from IlyaLisov/#5

IlyaLisov · web-flow · commit 51ed34bc01d4 · 2023-08-01T20:45:12.000+03:00
#5 Implement GraphQL
diff --git a/pom.xml b/pom.xml
@@ -29,6 +29,8 @@
         <minio.version>8.5.3</minio.version>
         <xml-format.version>3.2.2</xml-format.version>
         <checkstyle.version>3.2.2</checkstyle.version>
+        <graphql-java-kickstart.version>15.0.0</graphql-java-kickstart.version>
+        <graphql-java-extended-scalars.version>20.2</graphql-java-extended-scalars.version>
     </properties>
 
     <dependencies>
@@ -58,6 +60,23 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-graphql</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.graphql-java-kickstart</groupId>
+            <artifactId>graphql-java-kickstart</artifactId>
+            <version>${graphql-java-kickstart.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.graphql-java</groupId>
+            <artifactId>graphql-java-extended-scalars</artifactId>
+            <version>${graphql-java-extended-scalars.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/src/main/java/com/example/tasklist/config/ApplicationConfig.java b/src/main/java/com/example/tasklist/config/ApplicationConfig.java
@@ -129,6 +129,8 @@ public SecurityFilterChain filterChain(final HttpSecurity httpSecurity)
                                 .permitAll()
                                 .requestMatchers("/v3/api-docs/**")
                                 .permitAll()
+                                .requestMatchers("/graphiql")
+                                .permitAll()
                                 .anyRequest().authenticated())
                 .anonymous(AbstractHttpConfigurer::disable)
                 .addFilterBefore(new JwtTokenFilter(tokenProvider),
diff --git a/src/main/java/com/example/tasklist/config/GraphqlConfig.java b/src/main/java/com/example/tasklist/config/GraphqlConfig.java
@@ -0,0 +1,27 @@
+package com.example.tasklist.config;
+
+import graphql.schema.GraphQLScalarType;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.graphql.execution.RuntimeWiringConfigurer;
+
+@Configuration
+public class GraphqlConfig {
+
+    @Bean
+    public GraphQLScalarType localDateTimeScalar() {
+        return GraphQLScalarType.newScalar()
+                .name("LocalDateTime")
+                .description("LocalDateTime scalar")
+                .coercing(new LocalDateTimeCoercing())
+                .build();
+    }
+
+    @Bean
+    public RuntimeWiringConfigurer runtimeWiringConfigurer() {
+        return wiringBuilder -> wiringBuilder
+                .scalar(localDateTimeScalar())
+                .build();
+    }
+
+}
diff --git a/src/main/java/com/example/tasklist/config/LocalDateTimeCoercing.java b/src/main/java/com/example/tasklist/config/LocalDateTimeCoercing.java
@@ -0,0 +1,60 @@
+package com.example.tasklist.config;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
+import graphql.language.StringValue;
+import graphql.language.Value;
+import graphql.schema.Coercing;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.Locale;
+
+public class LocalDateTimeCoercing implements Coercing<LocalDateTime, String> {
+
+    @Override
+    public @Nullable
+    String serialize(
+            @NotNull final Object dataFetcherResult,
+            @NotNull final GraphQLContext graphQLContext,
+            @NotNull final Locale locale
+    ) throws CoercingSerializeException {
+        SimpleDateFormat formatter
+                = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
+                Locale.ENGLISH);
+        return formatter.format(
+                Date.from(((LocalDateTime) dataFetcherResult)
+                        .atZone(ZoneId.systemDefault())
+                        .toInstant())
+        );
+    }
+
+    @Override
+    public @Nullable
+    LocalDateTime parseValue(
+            @NotNull final Object input,
+            @NotNull final GraphQLContext graphQLContext,
+            @NotNull final Locale locale
+    ) throws CoercingParseValueException {
+        return LocalDateTime.parse((String) input);
+    }
+
+    @Override
+    public @Nullable
+    LocalDateTime parseLiteral(
+            @NotNull final Value<?> input,
+            @NotNull final CoercedVariables variables,
+            @NotNull final GraphQLContext graphQLContext,
+            @NotNull final Locale locale
+    ) throws CoercingParseLiteralException {
+        return LocalDateTime.parse(((StringValue) input).getValue());
+    }
+
+}
diff --git a/src/main/java/com/example/tasklist/domain/task/Task.java b/src/main/java/com/example/tasklist/domain/task/Task.java
@@ -6,6 +6,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -22,7 +23,7 @@
 public class Task implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     private String title;
@@ -35,7 +36,7 @@ public class Task implements Serializable {
 
     @Column(name = "image")
     @CollectionTable(name = "tasks_images")
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     private List<String> images;
 
 }
diff --git a/src/main/java/com/example/tasklist/domain/user/User.java b/src/main/java/com/example/tasklist/domain/user/User.java
@@ -12,6 +12,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
@@ -27,7 +28,7 @@
 public class User implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     private String name;
@@ -43,9 +44,8 @@ public class User implements Serializable {
     @Enumerated(value = EnumType.STRING)
     private Set<Role> roles;
 
-    @CollectionTable(name = "users_tasks")
-    @OneToMany
-    @JoinColumn(name = "task_id")
+    @OneToMany(fetch = FetchType.EAGER)
+    @JoinTable(inverseJoinColumns = @JoinColumn(name = "task_id"))
     private List<Task> tasks;
 
 }
diff --git a/src/main/java/com/example/tasklist/service/impl/TaskServiceImpl.java b/src/main/java/com/example/tasklist/service/impl/TaskServiceImpl.java
@@ -54,10 +54,13 @@ public Task update(final Task task) {
 
     @Override
     @Transactional
-    @Cacheable(value = "TaskService::getById", key = "#task.id")
+    @Cacheable(value = "TaskService::getById",
+            condition = "#task.id!=null",
+            key = "#task.id")
     public Task create(final Task task, final Long userId) {
         User user = userService.getById(userId);
         task.setStatus(Status.TODO);
+        taskRepository.save(task);
         user.getTasks().add(task);
         userService.update(user);
         return task;
diff --git a/src/main/java/com/example/tasklist/service/impl/UserServiceImpl.java b/src/main/java/com/example/tasklist/service/impl/UserServiceImpl.java
@@ -24,7 +24,6 @@ public class UserServiceImpl implements UserService {
     private final PasswordEncoder passwordEncoder;
 
     @Override
-    @Transactional(readOnly = true)
     @Cacheable(value = "UserService::getById", key = "#id")
     public User getById(final Long id) {
         return userRepository.findById(id)
@@ -59,8 +58,10 @@ public User update(final User user) {
     @Transactional
     @Caching(cacheable = {
             @Cacheable(value = "UserService::getById",
+                    condition = "#user.id!=null",
                     key = "#user.id"),
             @Cacheable(value = "UserService::getByUsername",
+                    condition = "#user.username!=null",
                     key = "#user.username")
     })
     public User create(final User user) {
diff --git a/src/main/java/com/example/tasklist/web/controller/TaskController.java b/src/main/java/com/example/tasklist/web/controller/TaskController.java
@@ -11,6 +11,9 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.graphql.data.method.annotation.Argument;
+import org.springframework.graphql.data.method.annotation.MutationMapping;
+import org.springframework.graphql.data.method.annotation.QueryMapping;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -36,27 +39,30 @@ public class TaskController {
     private final TaskImageMapper taskImageMapper;
 
     @PutMapping
+    @MutationMapping(name = "updateTask")
     @Operation(summary = "Update task")
     @PreAuthorize("canAccessTask(#dto.id)")
     public TaskDto update(@Validated(OnUpdate.class)
-                          @RequestBody final TaskDto dto) {
+                          @RequestBody @Argument final TaskDto dto) {
         Task task = taskMapper.toEntity(dto);
         Task updatedTask = taskService.update(task);
         return taskMapper.toDto(updatedTask);
     }
 
     @GetMapping("/{id}")
+    @QueryMapping(name = "taskById")
     @Operation(summary = "Get TaskDto by id")
     @PreAuthorize("canAccessTask(#id)")
-    public TaskDto getById(@PathVariable final Long id) {
+    public TaskDto getById(@PathVariable @Argument final Long id) {
         Task task = taskService.getById(id);
         return taskMapper.toDto(task);
     }
 
     @DeleteMapping("/{id}")
+    @MutationMapping(name = "deleteTask")
     @Operation(summary = "Delete task")
     @PreAuthorize("canAccessTask(#id)")
-    public void deleteById(@PathVariable final Long id) {
+    public void deleteById(@PathVariable @Argument final Long id) {
         taskService.delete(id);
     }
 
diff --git a/src/main/java/com/example/tasklist/web/controller/UserController.java b/src/main/java/com/example/tasklist/web/controller/UserController.java
@@ -13,6 +13,9 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.graphql.data.method.annotation.Argument;
+import org.springframework.graphql.data.method.annotation.MutationMapping;
+import org.springframework.graphql.data.method.annotation.QueryMapping;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -40,44 +43,50 @@ public class UserController {
     private final TaskMapper taskMapper;
 
     @PutMapping
+    @MutationMapping(name = "updateUser")
     @Operation(summary = "Update user")
     @PreAuthorize("@customSecurityExpression.canAccessUser(#dto.id)")
     public UserDto update(@Validated(OnUpdate.class)
-                          @RequestBody final UserDto dto) {
+                          @RequestBody @Argument final UserDto dto) {
         User user = userMapper.toEntity(dto);
         User updatedUser = userService.update(user);
         return userMapper.toDto(updatedUser);
     }
 
     @GetMapping("/{id}")
+    @QueryMapping(name = "userById")
     @Operation(summary = "Get UserDto by id")
     @PreAuthorize("@customSecurityExpression.canAccessUser(#id)")
-    public UserDto getById(@PathVariable final Long id) {
+    public UserDto getById(@PathVariable @Argument final Long id) {
         User user = userService.getById(id);
         return userMapper.toDto(user);
     }
 
     @DeleteMapping("/{id}")
+    @MutationMapping(name = "deleteUserById")
     @Operation(summary = "Delete user by id")
     @PreAuthorize("@customSecurityExpression.canAccessUser(#id)")
-    public void deleteById(@PathVariable final Long id) {
+    public void deleteById(@PathVariable @Argument final Long id) {
         userService.delete(id);
     }
 
     @GetMapping("/{id}/tasks")
+    @QueryMapping(name = "tasksByUserId")
     @Operation(summary = "Get all User tasks")
     @PreAuthorize("@customSecurityExpression.canAccessUser(#id)")
-    public List<TaskDto> getTasksByUserId(@PathVariable final Long id) {
+    public List<TaskDto> getTasksByUserId(@PathVariable
+                                          @Argument final Long id) {
         List<Task> tasks = taskService.getAllByUserId(id);
         return taskMapper.toDto(tasks);
     }
 
     @PostMapping("/{id}/tasks")
+    @MutationMapping(name = "createTask")
     @Operation(summary = "Add task to user")
     @PreAuthorize("@customSecurityExpression.canAccessUser(#id)")
-    public TaskDto createTask(@PathVariable final Long id,
+    public TaskDto createTask(@PathVariable @Argument final Long id,
                               @Validated(OnCreate.class)
-                              @RequestBody final TaskDto dto) {
+                              @RequestBody @Argument final TaskDto dto) {
         Task task = taskMapper.toEntity(dto);
         Task createdTask = taskService.create(task, id);
         return taskMapper.toDto(createdTask);
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -18,6 +18,9 @@ spring:
     change-log: classpath:liquibase/db.changelog.yaml
     enabled: true
     default-schema: tasklist
+  graphql:
+    graphiql:
+      enabled: true
 security:
   jwt:
     secret: ${JWT_SECRET}
diff --git a/src/main/resources/graphql/schema.graphqls b/src/main/resources/graphql/schema.graphqls
@@ -0,0 +1,13 @@
+type Query {
+    userById(id: ID): User
+    tasksByUserId(id: ID): [Task]
+    taskById(id: ID): Task
+}
+
+type Mutation {
+    updateUser(dto: InputUser): User
+    deleteUser(id: ID): Boolean
+    createTask(id: ID dto: InputTask): Task
+    updateTask(dto: InputTask): Task
+    deleteTask(id: ID): Boolean
+}
diff --git a/src/main/resources/graphql/types.graphqls b/src/main/resources/graphql/types.graphqls
@@ -0,0 +1,37 @@
+scalar LocalDateTime
+
+type User {
+    id: ID
+    name: String
+    username: String
+}
+
+input InputUser {
+    id: ID
+    name: String
+    username: String
+    password: String
+    passwordConfirmation: String
+}
+
+type Task {
+    id: ID
+    title: String
+    description: String
+    status: Status
+    expirationDate: LocalDateTime
+    images: [String]
+}
+
+input InputTask {
+    id: ID
+    title: String
+    description: String
+    expirationDate: LocalDateTime
+}
+
+enum Status {
+    TODO,
+    IN_PROGRESS,
+    DONE
+}
