From aee0f81d3cf16ee8eb7fca93ad7aacb82b67805e Mon Sep 17 00:00:00 2001
From: Robbie Antenesse <dev@alamantus.com>
Date: Thu, 23 May 2019 15:07:31 -0600
Subject: [PATCH] Add additional messaging to delete-words error

---
 src/php/api/Dictionary.php |  6 ++++--
 src/php/api/User.php       |  9 ++++++---
 src/php/api/index.php      | 14 ++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/php/api/Dictionary.php b/src/php/api/Dictionary.php
index 8fb51cb..d1ed813 100644
--- a/src/php/api/Dictionary.php
+++ b/src/php/api/Dictionary.php
@@ -301,8 +301,10 @@ created_on=VALUES(created_on)';
     $insert_results = $this->db->execute($insert_query, $insert_params);
     if ($insert_results) {
       $delete_results = $this->db->execute($delete_query, $delete_params);
-      return $delete_results;
+      if ($delete_results) {
+        return $delete_results;
+      }
     }
-    return $insert_results;
+    return $this->db->last_error_info;
   }
 }
\ No newline at end of file
diff --git a/src/php/api/User.php b/src/php/api/User.php
index eb99e88..9d1122b 100644
--- a/src/php/api/User.php
+++ b/src/php/api/User.php
@@ -228,10 +228,13 @@ VALUES (?, ?, ?, ?, ?)';
     if ($user_data !== false) {
       $dictionary = $user_data->dictionary;
       $user = $user_data->id;
-      $deleted_word = $this->dictionary->deleteWords($dictionary, $word_ids);
-      if ($deleted_word) {
-        return true;
+      $deleted_words = $this->dictionary->deleteWords($dictionary, $word_ids);
+      if ($deleted_words === true) {
+        return $deleted_words;
       }
+      return array(
+        'error' => $deleted_words,
+      );
     }
     return false;
   }
diff --git a/src/php/api/index.php b/src/php/api/index.php
index 09a812f..7619659 100644
--- a/src/php/api/index.php
+++ b/src/php/api/index.php
@@ -292,15 +292,21 @@ switch ($action) {
     ), 400);
   }
   case 'delete-words': {
-    if ($token !== false && isset($request['words'])) {
+    if ($token !== false && isset($request['wordIds'])) {
       $user = new User();
-      $delete_word_success = $user->deleteWordsFromCurrentDictionary($token, $request['words']);
-      if ($delete_word_success !== false) {
+      $delete_words_success = $user->deleteWordsFromCurrentDictionary($token, $request['wordIds']);
+      if ($delete_words_success === true) {
         return Response::json(array(
-          'data' => 'Deleted successfully',
+          'data' => $delete_words_success,
           'error' => false,
         ), 200);
       }
+      if (isset($delete_words_success['error'])) {
+        return Response::json(array(
+          'data' => $delete_words_success['error'],
+          'error' => true,
+        ), 500);
+      }
       return Response::json(array(
         'data' => 'Could not delete words: invalid token',
         'error' => true,