enables locale within graphql resolvers, removes unused files

src/collections/graphql/resolvers/getFind.js

@@ -4,12 +4,17 @@ const findQuery = require('../../queries/find');
 const find = ({ config, model }) => {
   return withPolicy(
     config.policies.read,
-    async (_, args) => {
-      const results = await findQuery({
+    async (_, args, context) => {
+      const options = {
         depth: 0,
         model,
         query: args,
-      });
+        locale: context.locale,
+      };
+
+      if (context.query['fallback-locale']) options.fallbackLocale = context.query['fallback-locale'];
+
+      const results = await findQuery(options);
 
       return results;
     },

src/collections/graphql/resolvers/getFindByID.js

@@ -3,12 +3,17 @@ const findByIDQuery = require('../../queries/findByID');
 
 const findByID = ({ config, model }) => withPolicy(
   config.policies.read,
-  async (_, { id }) => {
-    const result = await findByIDQuery({
+  async (_, { id }, context) => {
+    const options = {
       depth: 0,
       model,
       id,
-    });
+      locale: context.locale,
+    };
+
+    if (context.query['fallback-locale']) options.fallbackLocale = context.query['fallback-locale'];
+
+    const result = await findByIDQuery(options);
 
     return result;
   },

src/collections/queries/findByID.js

@@ -20,7 +20,7 @@ const findByID = async (options) => {
     }
 
     if (options.locale && doc.setLocale) {
-      doc.setLocale(options.locale, options.fallback);
+      doc.setLocale(options.locale, options.fallbackLocale);
     }
 
     // Await post findOne hook here

src/collections/routes.js

@@ -1,7 +1,6 @@
 const express = require('express');
 const requestHandlers = require('./requestHandlers');
 const bindModelMiddleware = require('../express/middleware/bindModel');
-const setModelLocaleMiddleware = require('../localization/setModelLocale');
 const loadPolicy = require('../express/middleware/loadPolicy');
 const bindCollectionMiddleware = require('./bindCollection');
 
@@ -14,8 +13,7 @@ const router = express.Router();
 const registerRoutes = ({ model, config }) => {
   router.all(`/${config.slug}*`,
     bindModelMiddleware(model),
-    bindCollectionMiddleware(config),
-    setModelLocaleMiddleware());
+    bindCollectionMiddleware(config));
 
   router.route(`/${config.slug}`)
     .get(loadPolicy(config.policies.read), find)

src/globals/routes.js

@@ -1,6 +1,5 @@
 const express = require('express');
 const requestHandlers = require('./requestHandlers');
-const setModelLocaleMiddleware = require('../localization/setModelLocale');
 const bindModelMiddleware = require('../express/middleware/bindModel');
 const loadPolicy = require('../express/middleware/loadPolicy');
 const getMiddleware = require('./middleware');
@@ -11,8 +10,7 @@ const router = express.Router();
 
 const registerGlobals = (globalConfigs, Globals) => {
   router.all('/globals*',
-    bindModelMiddleware(Globals),
-    setModelLocaleMiddleware());
+    bindModelMiddleware(Globals));
 
   globalConfigs.forEach((global) => {
     router.all(`/globals/${global.slug}`, getMiddleware(global));

src/localization/setModelLocale.js

@@ -1,10 +0,0 @@
-const setModelLocaleMiddleware = () => {
-  return (req, res, next) => {
-    if (req.locale && req.model.setDefaultLocale) {
-      req.model.setDefaultLocale(req.locale);
-    }
-    next();
-  };
-};
-
-module.exports = setModelLocaleMiddleware;

src/uploads/routes.js

@@ -3,7 +3,6 @@ const passport = require('passport');
 const fileUpload = require('express-fileupload');
 const { upload, update } = require('./requestHandlers');
 const uploadMiddleware = require('./middleware');
-const setModelLocaleMiddleware = require('../localization/setModelLocale');
 
 const router = express.Router();
 
@@ -13,8 +12,7 @@ const uploadRoutes = (config, Upload) => {
   router.all(`/${uploadConfig.slug}*`,
     fileUpload(),
     passport.authenticate('jwt', { session: false }),
-    uploadMiddleware(config, Upload),
-    setModelLocaleMiddleware());
+    uploadMiddleware(config, Upload));
 
   router.route(`/${uploadConfig.slug}`)
     .post(