From 5259841bfa9f8aebf5d0abf00a84755494dbd79e Mon Sep 17 00:00:00 2001
From: vidvidvid <weetopol@gmail.com>
Date: Tue, 1 Feb 2022 23:28:48 +0100
Subject: [PATCH] chore: roles_id -> roleIds

---
 hasura/metadata/actions.graphql                    |  4 ++--
 .../actions/quests/createQuest/createQuest.ts      | 14 +++-----------
 packages/web/pages/quest/create.tsx                | 12 +++---------
 schema.graphql                                     | 10 ++--------
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
index c22a2b90..bf92547c 100644
--- a/hasura/metadata/actions.graphql
+++ b/hasura/metadata/actions.graphql
@@ -73,8 +73,8 @@ input CreateQuestInput {
   externalLink : String
   repetition : QuestRepetition_ActionEnum
   cooldown : Int
-  skillsId : [uuid]!
-  roles_id : [uuid]!
+  roleIds : [uuid]!
+  skillIds : [uuid]!
 }
 
 input CreateQuestCompletionInput {
diff --git a/packages/backend/src/handlers/actions/quests/createQuest/createQuest.ts b/packages/backend/src/handlers/actions/quests/createQuest/createQuest.ts
index dc40a663..f82a695d 100644
--- a/packages/backend/src/handlers/actions/quests/createQuest/createQuest.ts
+++ b/packages/backend/src/handlers/actions/quests/createQuest/createQuest.ts
@@ -35,25 +35,17 @@ export async function createQuest(
     throw new Error('Player not allowed to create quests');
   }
 
-<<<<<<< develop
-  const { skillsId, ...questValues } = quest;
-=======
-  const { skills_id: skillsId, roles_id: rolesId, ...questValues } = quest;
->>>>>>> chore: add createQuest changes
+  const { skillIds, roleIds, ...questValues } = quest;
 
   const questInput: Quest_Insert_Input = {
     ...questValues,
     repetition: questRepetition,
-<<<<<<< develop
     createdByPlayerId: playerId,
-=======
-    created_by_player_id: playerId,
     quest_roles: {
-      data: rolesId.map((r, i) => ({ role: r, rank: i + 1 })),
+      data: roleIds.map((r, i) => ({ role: r, rank: i + 1 })),
     },
->>>>>>> chore: add createQuest changes
     quest_skills: {
-      data: skillsId.map((s) => ({ skillId: s })),
+      data: skillIds.map((s) => ({ skillId: s })),
     },
   };
 
diff --git a/packages/web/pages/quest/create.tsx b/packages/web/pages/quest/create.tsx
index e02cc062..ff7c5c8d 100644
--- a/packages/web/pages/quest/create.tsx
+++ b/packages/web/pages/quest/create.tsx
@@ -30,7 +30,8 @@ const CreateQuestPage: React.FC<Props> = ({ guilds, skillChoices }) => {
       ...createQuestInputs,
       repetition: (data.repetition as unknown) as QuestRepetition_ActionEnum,
       cooldown: transformCooldownForBackend(cooldown, repetition),
-      skillsId: skills.map((s) => s.id),
+      roleIds: [],
+      skillIds: skills.map((s) => s.id),
       roles_id: [],
     };
 
@@ -71,14 +72,7 @@ const CreateQuestPage: React.FC<Props> = ({ guilds, skillChoices }) => {
       <MetaHeading mb={4}>Create a Quest</MetaHeading>
 
       <QuestForm
-<<<<<<< develop
-        {...{ guilds, skillChoices, onSubmit }}
-=======
-        guilds={guilds}
-        skillChoices={skillChoices}
-        roleChoices={[]}
-        onSubmit={onSubmit}
->>>>>>> fix: lint
+        {...{ guilds, skillChoices, roleChoices: [],  onSubmit }}
         success={!!createQuestState.data?.createQuest?.success}
         fetching={createQuestState.fetching}
         submitLabel="Create Quest"
diff --git a/schema.graphql b/schema.graphql
index 2a05a2b8..71454c02 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -576,8 +576,8 @@ input CreateQuestInput {
   externalLink: String
   guildId: uuid!
   repetition: QuestRepetition_ActionEnum
-  skillsId: [uuid]!
-  skills_id: [uuid]!
+  roleIds: [uuid]!
+  skillIds: [uuid]!
   title: String!
 }
 
@@ -7980,9 +7980,6 @@ columns and relationships of "quest_completion"
 type quest_completion {
   """An object relationship"""
   QuestCompletionStatus: QuestCompletionStatus!
-
-  """An object relationship"""
-  completed: quest
   completedByPlayerId: uuid!
   id: uuid!
 
@@ -8040,7 +8037,6 @@ input quest_completion_bool_exp {
   _and: [quest_completion_bool_exp]
   _not: quest_completion_bool_exp
   _or: [quest_completion_bool_exp]
-  completed: quest_bool_exp
   completedByPlayerId: uuid_comparison_exp
   id: uuid_comparison_exp
   player: player_bool_exp
@@ -8065,7 +8061,6 @@ input type for inserting data into table "quest_completion"
 """
 input quest_completion_insert_input {
   QuestCompletionStatus: QuestCompletionStatus_obj_rel_insert_input
-  completed: quest_obj_rel_insert_input
   completedByPlayerId: uuid
   id: uuid
   player: player_obj_rel_insert_input
@@ -8154,7 +8149,6 @@ ordering options when selecting data from "quest_completion"
 """
 input quest_completion_order_by {
   QuestCompletionStatus: QuestCompletionStatus_order_by
-  completed: quest_order_by
   completedByPlayerId: order_by
   id: order_by
   player: player_order_by