Eslint config and fixes

Author: henriquecarv

.eslintrc.json

@@ -1,7 +1,7 @@
 {
-  "extends": "airbnb-base",
-  "rules": {
-    "sort-keys": "warn",
-    "sort-vars": "warn"
+  "extends": "loopback",
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
   }
 }

lib/google-cloud-datastore-database.js

@@ -1,12 +1,3 @@
-/* eslint-disable radix */
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable no-param-reassign */
-/* eslint-disable no-use-before-define */
-/* eslint-disable prefer-destructuring */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable consistent-return */
 const Datastore = require('@google-cloud/datastore');
 const util = require('util');
 const Connector = require('loopback-connector').Connector;
@@ -47,8 +38,13 @@ class GoogleCloudDatastore {
    * @param {String} key The id value for this document
    */
   createEntity(obj, key) {
-    const data = Object.assign(obj, { id: key.name });
-    return { data, key };
+    const data = Object.assign(obj, {
+      id: key.name,
+    });
+    return {
+      data,
+      key,
+    };
   }
 
   /**
@@ -164,12 +160,14 @@ class GoogleCloudDatastore {
    * @param {Object} where The filter
    */
   buildQuery(model, where) {
-    const filters = Object.keys(where).map(key => ({ [key]: where[key] }));
+    const filters = Object.keys(where).map((key) => ({
+      [key]: where[key],
+    }));
 
     let query = this.db.createQuery(model);
 
     for (let i = 0; i < filters.length; i += 1) {
-      query = this.addFilterToQuery(query, filter[i]);
+      query = this.addFilterToQuery(query, filters[i]);
     }
 
     return query;
@@ -240,8 +238,13 @@ class GoogleCloudDatastore {
    */
   async findOrCreate(model, filter, data, options, callback) {
     try {
-      const newData = Object.assign(data, { id: filter.where.id });
-      const find = await this.findById(model, newData.id);
+      const where = filter ? filter.where : undefined;
+      const id = where ? where.id : 0;
+
+      const newData = Object.assign(data, {
+        id,
+      });
+      const find = await this.findById(model, id);
 
       if (find.length > 0) {
         callback(null, find);
@@ -321,7 +324,9 @@ class GoogleCloudDatastore {
 
       if (!exist) throw new Error('Entity not found');
 
-      const newData = Object.assign(data, { id });
+      const newData = Object.assign(data, {
+        id,
+      });
 
       await this.addOrUpdateEntity(model, newData, 'update');
 
@@ -376,6 +381,7 @@ class GoogleCloudDatastore {
    */
   async updateOrCreate(model, data, options, callback) {
     try {
+      const id = data ? data.id : undefined;
       const result = await this.updateInternal(model, id, data);
 
       callback(null, result);
@@ -445,7 +451,7 @@ class GoogleCloudDatastore {
    */
   async destroyById(model, id, options, callback) {
     try {
-      const result = await this.deleteData(model, entityId, null);
+      const result = await this.deleteData(model, id, null);
 
       callback(null, result);
     } catch (error) {