Skip to content

Commit

Permalink
[*] DateOnly Fields - Fix potential bad values for projects using Seq…
Browse files Browse the repository at this point in the history
…uelize 4+
  • Loading branch information
arnaudbesnier committed May 25, 2018
1 parent a619c6b commit 5455acc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change Log

## [Unreleased]
### Fixed
- DateOnly Fields - Fix potential bad values for projects using Sequelize 4+.

## RELEASE 2.10.0 - 2018-05-25
### Added
Expand Down
20 changes: 12 additions & 8 deletions src/serializers/resource.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
'use strict';
var _ = require('lodash');
var P = require('bluebird');
var moment = require('moment');
var JSONAPISerializer = require('jsonapi-serializer').Serializer;
var SmartFieldsValuesInjector = require('../services/smart-fields-values-injector');
var Schemas = require('../generators/schemas');
var logger = require('../services/logger');
const _ = require('lodash');
const P = require('bluebird');
const moment = require('moment');
const semver = require('semver');
const JSONAPISerializer = require('jsonapi-serializer').Serializer;
const SmartFieldsValuesInjector = require('../services/smart-fields-values-injector');
const Schemas = require('../generators/schemas');
const logger = require('../services/logger');

function ResourceSerializer(Implementation, model, records, integrator, opts, meta,
fieldsSearched, searchValue, fieldsPerModel) {
var modelName = Implementation.getModelName(model);
var schema = Schemas.schemas[modelName];

const needsDateOnlyFormating = Implementation.getLianaName() === 'forest-express-sequelize' &&
semver.lt(Implementation.getOrmVersion(), '4.0.0');

var reservedWords = ['meta'];
var fieldInfoDateonly = [];
var fieldInfoPoint = [];
Expand All @@ -27,7 +31,7 @@ function ResourceSerializer(Implementation, model, records, integrator, opts, me
}

function detectFieldWithSpecialFormat(field, fieldReference) {
if (field.type === 'Dateonly') {
if (field.type === 'Dateonly' && needsDateOnlyFormating) {
fieldInfoDateonly.push({ name: field.field, association: fieldReference });
}

Expand Down

0 comments on commit 5455acc

Please sign in to comment.