From 152ad8e420d44dcd474e4952e2f30af7be635f2e Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Sun, 18 Sep 2016 10:53:47 -0400
Subject: [PATCH] Use lodash implementations instead of polyfills for .values
 and .entries

---
 src/Controllers/SchemaController.js   |  1 -
 src/LiveQuery/ParseLiveQueryServer.js | 11 ++++++-----
 src/Routers/ClassesRouter.js          |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Controllers/SchemaController.js b/src/Controllers/SchemaController.js
index d84f45ede2..8ceea8fad8 100644
--- a/src/Controllers/SchemaController.js
+++ b/src/Controllers/SchemaController.js
@@ -520,7 +520,6 @@ export default class SchemaController {
       }
     })
     .catch(error => {
-      console.error(error);
       // The schema still doesn't validate. Give up
       throw new Parse.Error(Parse.Error.INVALID_JSON, 'schema class name does not revalidate');
     });
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index 6f737f6d58..54c72dce2a 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -8,6 +8,7 @@ import RequestSchema from './RequestSchema';
 import { matchesQuery, queryHash } from './QueryTools';
 import { ParsePubSub } from './ParsePubSub';
 import { SessionTokenCache } from './SessionTokenCache';
+import _ from 'lodash';
 
 class ParseLiveQueryServer {
   clientId: number;
@@ -111,12 +112,12 @@ class ParseLiveQueryServer {
       logger.debug('Can not find subscriptions under this class ' + className);
       return;
     }
-    for (let subscription of classSubscriptions.values()) {
+    for (let subscription of _.values(classSubscriptions)) {
       let isSubscriptionMatched = this._matchesSubscription(deletedParseObject, subscription);
       if (!isSubscriptionMatched) {
         continue;
       }
-      for (let [clientId, requestIds] of subscription.clientRequestIds.entries()) {
+      for (let [clientId, requestIds] of _.entries(subscription.clientRequestIds)) {
         let client = this.clients.get(clientId);
         if (typeof client === 'undefined') {
           continue;
@@ -156,10 +157,10 @@ class ParseLiveQueryServer {
       logger.debug('Can not find subscriptions under this class ' + className);
       return;
     }
-    for (let subscription of classSubscriptions.values()) {
+    for (let subscription of _.values(classSubscriptions)) {
       let isOriginalSubscriptionMatched = this._matchesSubscription(originalParseObject, subscription);
       let isCurrentSubscriptionMatched = this._matchesSubscription(currentParseObject, subscription);
-      for (let [clientId, requestIds] of subscription.clientRequestIds.entries()) {
+      for (let [clientId, requestIds] of _.entries(subscription.clientRequestIds)) {
         let client = this.clients.get(clientId);
         if (typeof client === 'undefined') {
           continue;
@@ -269,7 +270,7 @@ class ParseLiveQueryServer {
       this.clients.delete(clientId);
 
       // Delete client from subscriptions
-      for (let [requestId, subscriptionInfo] of client.subscriptionInfos.entries()) {
+      for (let [requestId, subscriptionInfo] of _.entries(client.subscriptionInfos)) {
         let subscription = subscriptionInfo.subscription;
         subscription.deleteClientSubscription(clientId, requestId);
 
diff --git a/src/Routers/ClassesRouter.js b/src/Routers/ClassesRouter.js
index e1d186c1ae..c3b235efbc 100644
--- a/src/Routers/ClassesRouter.js
+++ b/src/Routers/ClassesRouter.js
@@ -1,8 +1,8 @@
 
 import PromiseRouter from '../PromiseRouter';
 import rest          from '../rest';
-
 import url           from 'url';
+import _             from 'lodash';
 
 const ALLOWED_GET_QUERY_KEYS = ['keys', 'include'];
 
@@ -115,7 +115,7 @@ export class ClassesRouter extends PromiseRouter {
 
   static JSONFromQuery(query) {
     let json = {};
-    for (let [key, value] of Object.entries(query)) {
+    for (let [key, value] of _.entries(query)) {
       try {
         json[key] = JSON.parse(value);
       } catch (e) {