- : Comments are closed for this thread.
+ : {closedMessage}
}
{!loggedIn && }
{
diff --git a/client/coral-framework/actions/config.js b/client/coral-framework/actions/config.js
index 6dc880434..e004fa1eb 100644
--- a/client/coral-framework/actions/config.js
+++ b/client/coral-framework/actions/config.js
@@ -5,6 +5,7 @@ import coralApi from '../helpers/response';
* Action name constants
*/
+export const UPDATE_SETTINGS = 'UPDATE_SETTINGS';
export const OPEN_COMMENTS = 'OPEN_COMMENTS';
export const CLOSE_COMMENTS = 'CLOSE_COMMENTS';
export const ADD_ITEM = 'ADD_ITEM';
diff --git a/client/coral-framework/reducers/config.js b/client/coral-framework/reducers/config.js
index 9620f5b97..7fbccaa49 100644
--- a/client/coral-framework/reducers/config.js
+++ b/client/coral-framework/reducers/config.js
@@ -5,7 +5,8 @@ import * as actions from '../actions/config';
const initialState = Map({
features: Map({}),
- status: 'open'
+ status: 'open',
+ closedMessage: ''
});
export default (state = initialState, action) => {
diff --git a/models/asset.js b/models/asset.js
index 0cdc77d7b..77b8ebff3 100644
--- a/models/asset.js
+++ b/models/asset.js
@@ -29,6 +29,14 @@ const AssetSchema = new Schema({
type: Schema.Types.Mixed,
default: null
},
+ closedAt: {
+ type: Date,
+ default: null
+ },
+ closedMessage: {
+ type: String,
+ default: null
+ },
title: String,
description: String,
image: String,
@@ -56,6 +64,13 @@ AssetSchema.index({
background: true
});
+/**
+ * Returns true if the asset is closed, false else.
+ */
+AssetSchema.virtual('isClosed').get(function() {
+ return this.closedAt && this.closedAt.getTime() <= new Date().getTime();
+});
+
/**
* Finds an asset by its id.
* @param {String} id identifier of the asset (uuid).
diff --git a/models/setting.js b/models/setting.js
index 86dc761f3..c7589ca56 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -28,6 +28,16 @@ const SettingSchema = new Schema({
type: String,
default: ''
},
+ closedTimeout: {
+ type: Number,
+
+ // Two weeks default expiry.
+ default: 60 * 60 * 24 * 7 * 2
+ },
+ closedMessage: {
+ type: String,
+ default: ''
+ },
wordlist: [String]
}, {
timestamps: {
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 00908e8e8..55ccf6e2b 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -80,7 +80,20 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
status = Promise.resolve('rejected');
} else {
status = Asset
- .rectifySettings(Asset.findById(asset_id))
+ .rectifySettings(Asset.findById(asset_id).then((asset) => {
+ if (!asset) {
+ return Promise.reject(new Error('asset referenced is not found'));
+ }
+
+ // Check to see if the asset has closed commenting...
+ if (asset.isClosed) {
+
+ // They have, ensure that we send back an error.
+ return Promise.reject(new Error(`asset has commenting closed because: ${asset.closedMessage}`));
+ }
+
+ return asset;
+ }))
// Return `premod` if pre-moderation is enabled and an empty "new" status
// in the event that it is not in pre-moderation mode.
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 988320e34..37713e899 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -19,6 +19,7 @@ const settings = {id: '1', moderation: 'pre'};
describe('/api/v1/comments', () => {
+ // Ensure that the settings are always available.
beforeEach(() => Promise.all([
wordlist.insert(['bad words']),
Setting.init(settings)
@@ -143,11 +144,19 @@ describe('/api/v1/comments', () => {
describe('#post', () => {
+ let asset_id;
+
+ beforeEach(() => Asset.findOrCreateByUrl('https://coralproject.net/section/article-is-the-best').then((asset) => {
+
+ // Update the asset id.
+ asset_id = asset.id;
+ }));
+
it('should create a comment', () => {
return chai.request(app)
.post('/api/v1/comments')
.set(passport.inject({roles: []}))
- .send({'body': 'Something body.', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
+ .send({'body': 'Something body.', 'author_id': '123', 'asset_id': asset_id, 'parent_id': ''})
.then((res) => {
expect(res).to.have.status(201);
expect(res.body).to.have.property('id');
@@ -158,7 +167,7 @@ describe('/api/v1/comments', () => {
return chai.request(app)
.post('/api/v1/comments')
.set(passport.inject({roles: []}))
- .send({'body': 'bad words are the baddest', 'author_id': '123', 'asset_id': '1', 'parent_id': ''})
+ .send({'body': 'bad words are the baddest', 'author_id': '123', 'asset_id': asset_id, 'parent_id': ''})
.then((res) => {
expect(res).to.have.status(201);
expect(res.body).to.have.property('id');
@@ -187,6 +196,43 @@ describe('/api/v1/comments', () => {
expect(res.body).to.have.property('status', 'premod');
});
});
+
+ it('shouldn\'t create a comment when the asset has expired commenting', () => {
+ return Asset.create({
+ closedAt: new Date().setDate(0),
+ closedMessage: 'tests said expired!'
+ })
+ .then((asset) => {
+ return chai.request(app)
+ .post('/api/v1/comments')
+ .set(passport.inject({roles: []}))
+ .send({'body': 'Something body.', 'author_id': '123', 'asset_id': asset.id, 'parent_id': ''});
+ })
+ .then((res) => {
+ expect(res).to.have.status(500);
+ })
+ .catch((err) => {
+ expect(err.response.body).to.not.be.null;
+ expect(err.response.body).to.have.property('message');
+ expect(err.response.body.message).to.contain('tests said expired!');
+ });
+ });
+
+ it('should create a comment when the asset has not expired yet', () => {
+ return Asset.create({
+ closedAt: new Date().setDate(32),
+ closedMessage: 'tests said expired!'
+ })
+ .then((asset) => {
+ return chai.request(app)
+ .post('/api/v1/comments')
+ .set(passport.inject({roles: []}))
+ .send({'body': 'Something body.', 'author_id': '123', 'asset_id': asset.id, 'parent_id': ''});
+ })
+ .then((res) => {
+ expect(res).to.have.status(201);
+ });
+ });
});
});