Backend integration with the frontend

Author: birdofpreyru

app.js

@@ -29,8 +29,14 @@ syncDB();
 
 const app = express();
 
+const options = {
+  setHeaders(res) {
+    res.set('Access-Control-Allow-Origin', '*');
+  }
+};
+
 // static content
-app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'public'), options));
 
 app.use(cors());
 app.use(bodyParser.json());
@@ -42,6 +48,7 @@ require('./app-routes')(app);
 
 app.use(passport.initialize());
 
+
 // The error handler,log error and return 500 error
 // eslint-disable-next-line no-unused-vars
 app.use((err, req, res, next) => {
@@ -70,7 +77,6 @@ app.use((err, req, res, next) => {
       errorResponse.message = 'server error';
     }
   }
-
   errorResponse.code = status;
   res.status(status).json(errorResponse);
 });

integration-test-data.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2018 TopCoder Inc., All Rights Reserved.
+ */
+
+/**
+ * this script is used to init data, it clears all data, then inserts some sample data
+ * note: it will be drop all tables and data , then create the new tables
+ *
+ * @author      TCSCODER
+ * @version     1.0
+ */
+
+const co = require('co');
+
+const models = require('@va/models');
+const logger = require('./common/logger');
+const helper = require('./modules/security/helper');
+
+co(function* () {
+  // create lookup entities
+  yield models.BadgeType.create({ name: 'A Hero', iconURL: 'hero' });
+  yield models.BadgeType.create({ name: 'Bravery', iconURL: 'bravery' });
+  yield models.BadgeType.create({ name: 'Instructor', iconURL: 'instructor' });
+  yield models.BadgeType.create({ name: 'Friendship', iconURL: 'friendship' });
+  yield models.BadgeType.create({ name: 'A Leader', iconURL: 'leader' });
+  yield models.BadgeType.create({ name: 'Charger', iconURL: 'charger' });
+  yield models.BadgeType.create({ name: 'Big Heart', iconURL: 'big-heart' });
+  yield models.Branch.create({ name: 'branch1' });
+  yield models.Branch.create({ name: 'branch2' });
+  yield models.Campaign.create({ name: 'campaign1' });
+  yield models.Campaign.create({ name: 'campaign2' });
+  yield models.Country.create({ name: 'USD' });
+  yield models.Country.create({ name: 'CHINA' });
+  yield models.EventType.create({ name: 'Born', iconURL: 'event Born' });
+  yield models.EventType.create({ name: 'Wedding', iconURL: 'event Wedding' });
+  yield models.EventType.create({ name: 'Enlisted', iconURL: 'event Enlisted' });
+  yield models.EventType.create({ name: 'Lieutenant Promottion', iconURL: 'event Lieutenant Promottion' });
+  yield models.EventType.create({ name: 'Passed Away', iconURL: 'event Passed Away' });
+  // create admin
+  const passwordHash = yield helper.encryptPassword('password');
+  yield models.User.create({
+    username: 'admin',
+    email: '[email protected]',
+    firstName: 'first name 1',
+    lastName: 'last name 1',
+    mobile: '123123123',
+    role: models.modelConstants.UserRoles.Admin,
+    status: models.modelConstants.UserStatuses.Active,
+    gender: 'male',
+    passwordHash,
+    countryId: 1
+  });
+  // create normal user
+  yield models.User.create({
+    username: 'user',
+    email: '[email protected]',
+    firstName: 'first name 2',
+    lastName: 'last name 2',
+    mobile: '123125555',
+    role: models.modelConstants.UserRoles.User,
+    status: models.modelConstants.UserStatuses.Active,
+    gender: 'male',
+    passwordHash,
+    countryId: 2
+  });
+  logger.info('success!');
+  process.exit(0);
+}).catch((err) => {
+  logger.error(err);
+  logger.info('got error, program will exit');
+  process.exit(1);
+});

modules/flags/services/FlagService.js

@@ -12,6 +12,8 @@ const _ = require('lodash');
 const models = require('va-online-memorial-data-models');
 const logger = require('../../../common/logger');
 const helper = require('../../../common/helper');
+const PhotoService = require('../../photos/services/PhotoService');
+const BadgeService = require('../../badges/services/BadgeService');
 
 /**
  * build db search query
@@ -86,13 +88,13 @@ function* validatePost(postId, postType) {
 function* populatePost(f) {
   if (!f) return f;
   if (f.postType === models.modelConstants.PostTypes.Story) {
-    f.story = yield helper.ensureExists(models.Story, { id: f.postId });
+    f.story = yield helper.populateUsersForEntity(yield helper.ensureExists(models.Story, { id: f.postId }));
   } else if (f.postType === models.modelConstants.PostTypes.Photo) {
-    f.photo = yield helper.ensureExists(models.Photo, { id: f.postId });
+    f.photo = yield PhotoService.getSingle(f.postId);
   } else if (f.postType === models.modelConstants.PostTypes.Badge) {
-    f.badge = yield helper.ensureExists(models.Badge, { id: f.postId });
+    f.badge = yield BadgeService.getSingle(f.postId);
   } else if (f.postType === models.modelConstants.PostTypes.Testimonial) {
-    f.testimonial = yield helper.ensureExists(models.Testimonial, { id: f.postId });
+    f.testimonial = yield helper.populateUsersForEntity(yield helper.ensureExists(models.Testimonial, { id: f.postId }));
   }
   return f;
 }

modules/lookups/routes.js

@@ -7,63 +7,53 @@
 /*
  * Contains all routes.
  */
-const constants = require('../../constants');
 
-const jwtAuth = constants.Passports.jwt;
 
 module.exports = {
   '/branches': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getBranches'
     }
   },
   '/ranks': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getRanks'
     }
   },
   '/wars': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getWars'
     }
   },
   '/countries': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getCountries'
     }
   },
   '/cemeteries': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getCemeteries'
     }
   },
   '/badgeTypes': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getBadgeTypes'
     }
   },
   '/eventTypes': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getEventTypes'
     }
   },
   '/campaigns': {
     get: {
-      auth: jwtAuth,
       controller: 'LookupController',
       method: 'getCampaigns'
     }

modules/nextofkins/services/NextOfKinService.js

@@ -86,7 +86,7 @@ function* create(files, body) {
     const fileIds = [];
     for (let i = 0; i < files.length; i += 1) {
       const file = yield models.File.create({
-        name: files[i].filename,
+        name: files[i].originalname,
         fileURL: `${config.appURL}/upload/${files[i].filename}`,
         mimeType: files[i].mimetype
       }, { transaction: t });

modules/security/services/SecurityService.js

@@ -60,11 +60,11 @@ register.schema = {
   user: Joi.object().keys({
     username: Joi.string().required(),
     email: Joi.string().email().required(),
-    firstName: Joi.string().required(),
-    lastName: Joi.string().required(),
-    mobile: Joi.string().required(),
-    gender: Joi.string().required(),
-    countryId: Joi.number().integer().min(1).required(),
+    firstName: Joi.string().allow(['']),
+    lastName: Joi.string().allow(['']),
+    mobile: Joi.string().allow(['']),
+    gender: Joi.string().allow(['']),
+    countryId: Joi.number().integer().min(1),
     password: Joi.string().required()
   }).required()
 };

modules/stories/services/StoryService.js

@@ -50,6 +50,15 @@ function* search(query, user) {
   }
 
   const q = buildDBFilter(query);
+  if (query.review) {
+    const nextOfKins = yield models.NextOfKin.find({
+      where: {
+        userId: user.id,
+        status: models.modelConstants.Statuses.Approved
+      }
+    });
+    q.where.veteranId = { $in: _.map(nextOfKins, item => item.veteranId) };
+  }
   const docs = yield models.Story.findAndCountAll(q);
   return {
     items: yield helper.populateUsersForEntities(docs.rows),
@@ -64,6 +73,7 @@ search.schema = {
     veteranId: Joi.optionalId(),
     userId: Joi.optionalId(),
     status: Joi.string().valid(_.values(models.modelConstants.Statuses)),
+    review: Joi.boolean(),
     limit: Joi.limit(),
     offset: Joi.offset(),
     sortColumn: Joi.string().valid('id', 'veteranId', 'title', 'text', 'status').default('id'),

modules/users/services/UserService.js

@@ -105,7 +105,7 @@ function* update(id, body, currentUser) {
 
   // if current user is not admin, then he can only update himself, and role can not be changed
   if (currentUser.role !== models.modelConstants.UserRoles.Admin) {
-    if (id !== currentUser.id) {
+    if (id !== _.toNumber(currentUser.id)) {
       throw new ForbiddenError('You can not update other user.');
     }
     if (body.role && user.role !== body.role) {

modules/veterans/services/VeteransService.js

@@ -49,13 +49,13 @@ function buildDBFilter(filter) {
   }
   if (filter.birthDateStart) where.birthDate = { $gte: filter.birthDateStart };
   if (filter.birthDateEnd) {
-    if (!filter.birthDate) filter.birthDate = {};
-    filter.birthDate.$lte = filter.birthDateEnd;
+    if (!where.birthDate) where.birthDate = {};
+    where.birthDate.$lte = filter.birthDateEnd;
   }
   if (filter.deathDateStart) where.deathDate = { $gte: filter.deathDateStart };
   if (filter.deathDateEnd) {
-    if (!filter.deathDate) filter.deathDate = {};
-    filter.deathDate.$lte = filter.deathDateEnd;
+    if (!where.deathDate) where.deathDate = {};
+    where.deathDate.$lte = filter.deathDateEnd;
   }
   if (filter.squadronShip) where.squadronShip = { $like: `%${filter.squadronShip}%` };
   if (filter.branchIds) include[4].where = { id: { $in: parseIds(filter.branchIds) } };
@@ -76,13 +76,15 @@ function buildDBFilter(filter) {
  */
 function* search(query) {
   const q = buildDBFilter(query);
-  const items = yield models.Veteran.findAll(q);
+  q.distinct = true;
+  const docs = yield models.Veteran.findAndCountAll(q);
   // note that when child entities are included for filter, sequelize can not correctly calculate
   // the total count, so the total field is not provided
   return {
-    items,
+    items: docs.rows,
     offset: q.offset,
-    limit: q.limit
+    limit: q.limit,
+    total: docs.count
   };
 }