Skip to content

Commit

Permalink
Convert Statistics Package to JS (#6447)
Browse files Browse the repository at this point in the history
* convert statistics package to js

* amend

* fix code style
  • Loading branch information
MartinSchoeler authored and rodrigok committed Mar 23, 2017
1 parent 36a9c3a commit e42d501
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 44 deletions.
1 change: 0 additions & 1 deletion packages/rocketchat-statistics/lib/rocketchat.coffee

This file was deleted.

1 change: 1 addition & 0 deletions packages/rocketchat-statistics/lib/rocketchat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RocketChat.statistics = {};
9 changes: 4 additions & 5 deletions packages/rocketchat-statistics/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ Package.onUse(function(api) {
api.use([
'mongo',
'ecmascript',
'coffeescript',
'rocketchat:lib'
]);

// Statistics
api.addFiles('lib/rocketchat.coffee', [ 'client', 'server' ]);
api.addFiles('lib/rocketchat.js', [ 'client', 'server' ]);
api.addFiles([
'server/models/Statistics.coffee',
'server/models/Statistics.js',
'server/functions/get.js',
'server/functions/save.coffee',
'server/methods/getStatistics.coffee'
'server/functions/save.js',
'server/methods/getStatistics.js'
], 'server');
});
6 changes: 0 additions & 6 deletions packages/rocketchat-statistics/server/functions/save.coffee

This file was deleted.

6 changes: 6 additions & 0 deletions packages/rocketchat-statistics/server/functions/save.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
RocketChat.statistics.save = function() {
const statistics = RocketChat.statistics.get();
statistics.createdAt = new Date;
RocketChat.models.Statistics.insert(statistics);
return statistics;
};
13 changes: 0 additions & 13 deletions packages/rocketchat-statistics/server/methods/getStatistics.coffee

This file was deleted.

17 changes: 17 additions & 0 deletions packages/rocketchat-statistics/server/methods/getStatistics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Meteor.methods({
getStatistics(refresh) {
if (!Meteor.userId()) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getStatistics' });
}

if (RocketChat.authz.hasPermission(Meteor.userId(), 'view-statistics') !== true) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'getStatistics' });
}

if (refresh) {
return RocketChat.statistics.save();
} else {
return RocketChat.models.Statistics.findLast();
}
}
});
19 changes: 0 additions & 19 deletions packages/rocketchat-statistics/server/models/Statistics.coffee

This file was deleted.

24 changes: 24 additions & 0 deletions packages/rocketchat-statistics/server/models/Statistics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
RocketChat.models.Statistics = new class extends RocketChat.models._Base {
constructor() {
super('statistics');

this.tryEnsureIndex({ 'createdAt': 1 });
}

// FIND ONE
findOneById(_id, options) {
const query = { _id };
return this.findOne(query, options);
}

findLast() {
const options = {
sort: {
createdAt: -1
},
limit: 1
};
const records = this.find({}, options).fetch();
return records && records[0];
}
};

0 comments on commit e42d501

Please sign in to comment.