From 83477a99467c73acbcebb78e023ad241a14efe9e Mon Sep 17 00:00:00 2001
From: Sambo Chea <sombochea@cubetiqs.com>
Date: Sun, 8 Aug 2021 11:51:24 +0700
Subject: [PATCH] Task: Changed types for DgsConstants support

---
 .../graphql/demo/resolver/mutation/AccountMutationResolver.kt  | 3 ++-
 .../graphql/demo/resolver/mutation/UserMutationResolver.kt     | 3 ++-
 .../graphql/demo/resolver/query/AccountQueryResolver.kt        | 3 ++-
 .../cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
index 62ea55f..ae38ebf 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/AccountMutationResolver.kt
@@ -1,6 +1,7 @@
 package com.cubetiqs.graphql.demo.resolver.mutation
 
 import com.cubetiqs.graphql.demo.context.GMutation
+import com.cubetiqs.graphql.demo.dgmodel.DgsConstants
 import com.cubetiqs.graphql.demo.domain.account.Account
 import com.cubetiqs.graphql.demo.domain.account.AccountInput
 import com.cubetiqs.graphql.demo.domain.account.AccountMapper
@@ -20,7 +21,7 @@ class AccountMutationResolver {
     @Autowired
     private lateinit var userRepository: UserRepository
 
-    @DgsData(parentType = "Mutation", field = "openAccount")
+    @DgsMutation(field = DgsConstants.MUTATION.OpenAccount)
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     fun openAccount(input: AccountInput): Account {
         val account = AccountMapper.fromInputToAccount(input)
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
index e2348cf..8ce7bb8 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt
@@ -1,6 +1,7 @@
 package com.cubetiqs.graphql.demo.resolver.mutation
 
 import com.cubetiqs.graphql.demo.context.GMutation
+import com.cubetiqs.graphql.demo.dgmodel.DgsConstants
 import com.cubetiqs.graphql.demo.domain.user.User
 import com.cubetiqs.graphql.demo.domain.user.UserInput
 import com.cubetiqs.graphql.demo.domain.user.UserMapper
@@ -14,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional
 class UserMutationResolver @Autowired constructor(
     private val userRepository: UserRepository,
 ) {
-    @DgsMutation(field = "createUser")
+    @DgsMutation(field = DgsConstants.MUTATION.CreateUser)
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     fun createUser(input: UserInput): User {
         if (userRepository.existsAllByUsername(input.username ?: "")) throw Exception("Username has been already existed!")
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
index 51c807b..4d688e6 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/AccountQueryResolver.kt
@@ -1,6 +1,7 @@
 package com.cubetiqs.graphql.demo.resolver.query
 
 import com.cubetiqs.graphql.demo.context.GQuery
+import com.cubetiqs.graphql.demo.dgmodel.DgsConstants
 import com.cubetiqs.graphql.demo.domain.account.Account
 import com.cubetiqs.graphql.demo.repository.AccountRepository
 import com.netflix.graphql.dgs.DgsQuery
@@ -11,7 +12,7 @@ import org.springframework.data.domain.Pageable
 class AccountQueryResolver @Autowired constructor(
     private val accountRepository: AccountRepository,
 ) {
-    @DgsQuery(field = "fetchAccounts")
+    @DgsQuery(field = DgsConstants.QUERY.FetchAccounts)
     fun fetchAccounts(): Collection<Account> {
         val accounts = accountRepository.findAll(Pageable.unpaged())
         return accounts.content
diff --git a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
index ecb5c5e..a625c10 100644
--- a/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
+++ b/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/query/UserQueryResolver.kt
@@ -1,6 +1,7 @@
 package com.cubetiqs.graphql.demo.resolver.query
 
 import com.cubetiqs.graphql.demo.context.GQuery
+import com.cubetiqs.graphql.demo.dgmodel.DgsConstants
 import com.cubetiqs.graphql.demo.domain.user.User
 import com.cubetiqs.graphql.demo.repository.UserRepository
 import com.netflix.graphql.dgs.DgsQuery
@@ -11,7 +12,7 @@ import org.springframework.data.domain.Pageable
 class UserQueryResolver @Autowired constructor(
     private val userRepository: UserRepository,
 ) {
-    @DgsQuery(field = "fetchUsers")
+    @DgsQuery(field = DgsConstants.QUERY.FetchUsers)
     fun fetchUsers(): Collection<User> {
         val users = userRepository.queryAllByEnabledIsTrue(Pageable.unpaged())
         return users.content