Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
21 changes: 12 additions & 9 deletions src/serializers/resource.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
'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 +30,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