Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

* Revert "Revert "Deprecate API v2""

* fix path in shops controller

test/api/v3/unit/libs/analyticsService.test.js

@@ -1,7 +1,7 @@
 // TODO These tests are pretty brittle
 // rewrite them to not depend on nock
 // Trust that the amplitude module works as intended and sends the requests
-import analyticsService from '../../../../../website/server/libs/api-v3/analyticsService';
+import analyticsService from '../../../../../website/server/libs/analyticsService';
 
 import nock from 'nock';
 

test/api/v3/unit/libs/baseModel.test.js

@@ -1,4 +1,4 @@
-import baseModel from '../../../../../website/server/libs/api-v3/baseModel';
+import baseModel from '../../../../../website/server/libs/baseModel';
 import mongoose from 'mongoose';
 
 describe('Base model plugin', () => {

test/api/v3/unit/libs/buildManifest.test.js

@@ -1,6 +1,6 @@
 import {
   getManifestFiles,
-} from '../../../../../website/server/libs/api-v3/buildManifest';
+} from '../../../../../website/server/libs/buildManifest';
 
 describe('Build Manifest', () => {
   describe('getManifestFiles', () => {

test/api/v3/unit/libs/collectionManipulators.test.js

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
 import {
  removeFromArray,
-} from '../../../../../website/server/libs/api-v3/collectionManipulators';
+} from '../../../../../website/server/libs/collectionManipulators';
 
 describe('Collection Manipulators', () => {
   describe('removeFromArray', () => {

test/api/v3/unit/libs/cron.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable global-require */
 import moment from 'moment';
 import Bluebird from 'bluebird';
-import { recoverCron, cron } from '../../../../../website/server/libs/api-v3/cron';
+import { recoverCron, cron } from '../../../../../website/server/libs/cron';
 import { model as User } from '../../../../../website/server/models/user';
 import * as Tasks from '../../../../../website/server/models/task';
 import { clone } from 'lodash';

test/api/v3/unit/libs/email.test.js

@@ -4,7 +4,7 @@ import nconf from 'nconf';
 import nodemailer from 'nodemailer';
 import Bluebird from 'bluebird';
 import requireAgain from 'require-again';
-import logger from '../../../../../website/server/libs/api-v3/logger';
+import logger from '../../../../../website/server/libs/logger';
 import { TAVERN_ID } from '../../../../../website/server/models/group';
 
 function defer () {
@@ -50,7 +50,7 @@ function getUser () {
 }
 
 describe('emails', () => {
-  let pathToEmailLib = '../../../../../website/server/libs/api-v3/email';
+  let pathToEmailLib = '../../../../../website/server/libs/email';
 
   describe('sendEmail', () => {
     it('can send an email using the default transport', () => {

test/api/v3/unit/libs/encryption.test.js

@@ -1,7 +1,7 @@
 import {
   encrypt,
   decrypt,
-} from '../../../../../website/server/libs/api-v3/encryption';
+} from '../../../../../website/server/libs/encryption';
 
 describe('encryption', () => {
   it('can encrypt and decrypt', () => {

test/api/v3/unit/libs/errors.test.js

@@ -5,7 +5,7 @@ import {
   BadRequest,
   InternalServerError,
   NotFound,
-} from '../../../../../website/server/libs/api-v3/errors';
+} from '../../../../../website/server/libs/errors';
 
 describe('Custom Errors', () => {
   describe('CustomError', () => {

test/api/v3/unit/libs/i18n.test.js

@@ -2,7 +2,7 @@ import {
   translations,
   localePath,
   langCodes,
-} from '../../../../../website/server/libs/api-v3/i18n';
+} from '../../../../../website/server/libs/i18n';
 import fs from 'fs';
 import path from 'path';
 

test/api/v3/unit/libs/logger.js

@@ -3,7 +3,7 @@ import requireAgain from 'require-again';
 
 /* eslint-disable global-require */
 describe('logger', () => {
-  let pathToLoggerLib = '../../../../../website/server/libs/api-v3/logger';
+  let pathToLoggerLib = '../../../../../website/server/libs/logger';
   let infoSpy;
   let errorSpy;
 

test/api/v3/unit/libs/password.test.js

@@ -1,7 +1,7 @@
 import {
   encrypt as encryptPassword,
   makeSalt,
-} from '../../../../../website/server/libs/api-v3/password';
+} from '../../../../../website/server/libs/password';
 
 describe('Password Utilities', () => {
   describe('Encrypt', () => {

test/api/v3/unit/libs/payments.test.js

@@ -1,6 +1,6 @@
-import * as sender from '../../../../../website/server/libs/api-v3/email';
-import * as api from '../../../../../website/server/libs/api-v3/payments';
-import analytics from '../../../../../website/server/libs/api-v3/analyticsService';
+import * as sender from '../../../../../website/server/libs/email';
+import * as api from '../../../../../website/server/libs/payments';
+import analytics from '../../../../../website/server/libs/analyticsService';
 import { model as User } from '../../../../../website/server/models/user';
 import moment from 'moment';
 

test/api/v3/unit/libs/preening.test.js

@@ -1,4 +1,4 @@
-import { preenHistory } from '../../../../../website/server/libs/api-v3/preening';
+import { preenHistory } from '../../../../../website/server/libs/preening';
 import moment from 'moment';
 import sinon from 'sinon'; // eslint-disable-line no-shadow
 import { generateHistory } from '../../../../helpers/api-unit.helper.js';

test/api/v3/unit/libs/pushNotifications.js

@@ -6,7 +6,7 @@ import nconf from 'nconf';
 describe('pushNotifications', () => {
   let user;
   let sendPushNotification;
-  let pathToPushNotifications = '../../../../../website/server/libs/api-v3/pushNotifications';
+  let pathToPushNotifications = '../../../../../website/server/libs/pushNotifications';
   let gcmSendSpy;
   let apnSendSpy;
 

test/api/v3/unit/libs/setupNconf.test.js

@@ -1,4 +1,4 @@
-import setupNconf from '../../../../../website/server/libs/api-v3/setupNconf';
+import setupNconf from '../../../../../website/server/libs/setupNconf';
 
 import path from 'path';
 import nconf from 'nconf';

test/api/v3/unit/libs/webhooks.test.js

@@ -1,5 +1,5 @@
 import request from 'request';
-import { sendTaskWebhook } from '../../../../../website/server/libs/api-v3/webhook';
+import { sendTaskWebhook } from '../../../../../website/server/libs/webhook';
 
 describe('webhooks', () => {
   beforeEach(() => {