From 5f4387a8ffe64d5a0bc563eea826386eb33ef73b Mon Sep 17 00:00:00 2001
From: johnthagen <johnthagen@users.noreply.github.com>
Date: Fri, 5 Feb 2021 14:57:36 -0500
Subject: [PATCH] Remove unused MergeWords MergedBy and Time fields (#989)

---
 Backend.Tests/Controllers/WordControllerTests.cs | 1 -
 Backend/Models/Word.cs                           | 4 ----
 src/backend/index.tsx                            | 5 ++---
 src/types/word.tsx                               | 9 ++++-----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Backend.Tests/Controllers/WordControllerTests.cs b/Backend.Tests/Controllers/WordControllerTests.cs
index a878ba08db..7c7f7f6952 100644
--- a/Backend.Tests/Controllers/WordControllerTests.cs
+++ b/Backend.Tests/Controllers/WordControllerTests.cs
@@ -229,7 +229,6 @@ public void MergeWords()
             var parentChildMergeObject = new MergeWords
             {
                 Parent = RandomWord(),
-                Time = Util.RandString(),
                 ChildrenWords = new List<MergeSourceWord>()
             };
 
diff --git a/Backend/Models/Word.cs b/Backend/Models/Word.cs
index 7a495eac70..e2d00ffc89 100644
--- a/Backend/Models/Word.cs
+++ b/Backend/Models/Word.cs
@@ -404,15 +404,11 @@ public class MergeWords
     {
         public Word Parent { get; set; }
         public List<MergeSourceWord> ChildrenWords { get; set; }
-        public string MergedBy { get; set; }
-        public string Time { get; set; }
 
         public MergeWords()
         {
             Parent = new Word();
             ChildrenWords = new List<MergeSourceWord>();
-            MergedBy = "";
-            Time = "";
         }
     }
 
diff --git a/src/backend/index.tsx b/src/backend/index.tsx
index fb6f8c83e0..2636e3c824 100644
--- a/src/backend/index.tsx
+++ b/src/backend/index.tsx
@@ -99,14 +99,13 @@ export async function mergeWords(
     SrcWordID: child.wordID,
     SenseStates: child.senses,
   }));
-  let merge = {
+  let mergeWords = {
     Parent: parent,
     ChildrenWords: childrenWords,
-    Time: Date.now().toString(),
   };
   let resp = await backendServer.put(
     `projects/${LocalStorage.getProjectId()}/words`,
-    merge,
+    mergeWords,
     { headers: authHeader() }
   );
   return resp.data;
diff --git a/src/types/word.tsx b/src/types/word.tsx
index 489a3c10b2..21e65a1df2 100644
--- a/src/types/word.tsx
+++ b/src/types/word.tsx
@@ -60,10 +60,9 @@ export interface MergeWord {
   senses: State[];
 }
 
-export interface Merge {
+export interface MergeWords {
   parent: Word;
   children: MergeWord[];
-  time: string;
 }
 
 //used in ExistingDataTable
@@ -73,12 +72,12 @@ export interface DomainWord {
 }
 
 export function hasSenses(word: Word): boolean {
-  let returnval =
+  return (
     word.senses &&
     word.senses.length > 0 &&
     word.senses[0].glosses &&
-    word.senses[0].glosses.length > 0;
-  return returnval;
+    word.senses[0].glosses.length > 0
+  );
 }
 
 export function simpleWord(vern: string, gloss: string): Word {