Merge pull request #81 from andela/hotfix-activate-data-170606864

170606864-Fix return data after activate/deactivate
andela · Jan 9, 2020 · 84a96a2 · 84a96a2
2 parents cc3b8ae + b6916b1
commit 84a96a2
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/src/controllers/accommodationController.js b/src/controllers/accommodationController.js
@@ -11,7 +11,7 @@ import imageUploader from '../helpers/imageUploader';
 import checkDate from '../helpers/checkDateHelper';
 import bookingHelper from '../helpers/bookingHelper';
 import getAccommodation from '../helpers/getAccommodation';
-import sendEmail from '../helpers/emailHelper';
+import { sendEmail } from '../helpers/emailHelper';
 import responseHelper from '../utils/responseHelper';
 import notifSender from '../helpers/notifSender';
 import likesServices from '../services/likesServices/likesServices';
@@ -209,18 +209,16 @@ export default class AccommodationController {
         const accommodation = await getOneAccommodation({ slug });
         const { name, ownerUser } = accommodation;
 
-        if (accommodation.isActivated === true) {
-          models.accommodations.update({ isActivated: false }, { where: { slug } });
-
+        if (accommodation.isActivated === false) {
+          models.accommodations.update({ isActivated: true }, { where: { slug } });
           sendEmail(ownerUser.email, 'Deactivated', name, reasons);
+          return responseUtil(res, 200, DEACTIVATED, accommodation);
 
-          return responseUtil(res, 200, DEACTIVATED);
+        } if (accommodation.isActivated === true) {
+          await models.accommodations.update({ isActivated: false }, { where: { slug } });
+          sendEmail(ownerUser.email, 'Activated', name, reasons);
+          return responseUtil(res, 200, ACTIVATED, accommodation);
         }
-        await models.accommodations.update({ isActivated: true }, { where: { slug } });
-
-        sendEmail(ownerUser.email, 'Activated', name, reasons);
-
-        return responseUtil(res, 200, ACTIVATED);
 
       } catch (error) { return responseUtil(res, 200, NOT_FOUND); }
     }

diff --git a/src/controllers/userController.js b/src/controllers/userController.js
@@ -8,7 +8,7 @@ import strings from '../utils/stringsUtil';
 import hashPassword from '../utils/hashPassword';
 import generateToken from '../utils/generateToken';
 import EmailToken from '../utils/EmailToken';
-import emailHelper from '../helpers/emailHelper';
+import { sendVerification, resetEmail } from '../helpers/emailHelper';
 import updateUser from '../helpers/updateUser';
 
 dotenv.config();
@@ -29,7 +29,7 @@ export default class UserController {
     user.save().then(user => {
       const token = generateToken(user);
 
-      emailHelper.sendVerification(req, user.email, token, host, user.username);
+      sendVerification(req, user.email, token, host, user.username);
 
       return responseUtil(res, 201, strings.users.success.SIGNUP_SUCCESS, {
         userId: user.id,
@@ -75,7 +75,7 @@ export default class UserController {
       }
       const verifyToken = EmailToken.ResetToken(user);
 
-      emailHelper.resetEmail(req, email, verifyToken, host);
+      resetEmail(req, email, verifyToken, host);
       return responseUtil(res, 200, strings.users.success.SEND_EMAIL);
     });
   }

diff --git a/src/helpers/emailHelper.js b/src/helpers/emailHelper.js
@@ -83,4 +83,4 @@ const sendVerification = (req, email, token, host, username) => {
   }
 };
 
-export default { sendEmail, resetEmail, sendVerification };
+export { sendEmail, resetEmail, sendVerification };
diff --git a/src/tests/helperTests/emailhelperUnitTests.spec.js b/src/tests/helperTests/emailhelperUnitTests.spec.js
@@ -1,19 +1,19 @@
 import chai from 'chai';
-import emailHelper from '../../helpers/emailHelper';
+import { sendEmail, resetEmail } from '../../helpers/emailHelper';
 
 const { expect } = chai;
 describe('test Email Sender', () => {
     it('Should Send an email', (done) => {
         try {
-            emailHelper.sendEmail('caretDevs@devs.com', 'Testing', 'Dev Test', 'Testing out mail helper');
+            sendEmail('caretDevs@devs.com', 'Testing', 'Dev Test', 'Testing out mail helper');
         } catch (error) {
             expect(error).to.be.null;
         }
         done();
     });
 
     it('Should Throw an Error', (done) => {
-        const response = emailHelper.resetEmail(null, 'anemail@email', 'sjdiojsdoi90we0jnsls');
+        const response = resetEmail(null, 'anemail@email', 'sjdiojsdoi90we0jnsls');
         expect(response.message).to.be.eql('Cannot read property \'protocol\' of null');
         done();
     });

diff --git a/src/tests/helperTests/resetEmailUnitTests.spec.js b/src/tests/helperTests/resetEmailUnitTests.spec.js
@@ -1,12 +1,12 @@
 import chai from 'chai';
-import emailHelper from '../../helpers/emailHelper'
+import { resetEmail } from '../../helpers/emailHelper'
 
 const { expect } = chai;
 describe('test Email Sender for rest password', () => {
 
     it('Should Send an email to reset password', (done) => {
         try {
-            emailHelper.resetEmail('caretDevs@devs.com', 'Testing', 'Dev Test');
+            resetEmail('caretDevs@devs.com', 'Testing', 'Dev Test');
         } catch (error) {
             expect(error).to.be.null;
         }
@@ -15,7 +15,7 @@ describe('test Email Sender for rest password', () => {
 
     it('Should Send an email to reset password with host', (done) => {
       try {
-          emailHelper.resetEmail('caretDevs@devs.com', 'Testing', 'Dev Test','localhost:3000');
+          resetEmail('caretDevs@devs.com', 'Testing', 'Dev Test','localhost:3000');
       } catch (error) {
           expect(error).to.be.null;
       }

diff --git a/src/tests/helperTests/verifyEmailUnitTest.spec.js b/src/tests/helperTests/verifyEmailUnitTest.spec.js
@@ -1,13 +1,12 @@
 import chai from 'chai';
-import emailHelper from '../../helpers/emailHelper'
-// emailHelper.sendVerification(req, user.email, token, host, user.username);
+import { sendVerification } from '../../helpers/emailHelper'
 
 const { expect } = chai;
 describe('test Email verification', () => {
 
     it('Should Send an email to verify user', (done) => {
         try {
-            emailHelper.sendVerification('caretDevs@devs.com', 'Testing', 'Dev Test');
+            sendVerification('caretDevs@devs.com', 'Testing', 'Dev Test');
         } catch (error) {
             expect(error).to.be.null;
         }
@@ -16,7 +15,7 @@ describe('test Email verification', () => {
 
     it('Should Send an email to verify with host', (done) => {
       try {
-        emailHelper.sendVerification('caretDevs@devs.com', 'Testing', 'Dev Test','localhost:3000');
+        sendVerification('caretDevs@devs.com', 'Testing', 'Dev Test','localhost:3000');
       } catch (error) {
           expect(error).to.be.null;
       }