Commit 6fd1e96b by GD-A-150752

code-refactor-naming

parent fe514a05
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Roles } from './collections/role'; import { Roles } from './collections/role.collection';
import { PERMISSIONS } from './config'; import { PERMISSIONS } from './config';
export const seedDB = async () => { export const seedDB = async () => {
......
import { MongoObservable } from 'meteor-rxjs'; import { MongoObservable } from 'meteor-rxjs';
import { Role } from '../models/role'; import { RoleModel } from '../models/role.model';
// tslint:disable-next-line:variable-name // tslint:disable-next-line:variable-name
export const Roles = new MongoObservable.Collection<Role>('roles'); export const Roles = new MongoObservable.Collection<RoleModel>('roles');
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { first } from 'rxjs/operators'; import { first } from 'rxjs/operators';
import { Roles } from '../collections/role'; import { Roles } from '../collections/role.collection';
import { PERMISSIONS } from '../config'; import { PERMISSIONS } from '../config';
import { Role } from '../models/role'; import { RoleModel } from '../models/role.model';
import { UtilsService } from '../services/utils.service'; import { UtilsService } from '../services/utils.service';
Meteor.methods({ Meteor.methods({
async saveRole(role: Role): Promise<void> { async saveRole(role: RoleModel): Promise<void> {
try { try {
if (role._id && UtilsService.hasPermission(PERMISSIONS.UPDATE_ROLE)) { if (role._id && UtilsService.hasPermission(PERMISSIONS.UPDATE_ROLE)) {
await Roles.update(role._id, role) await Roles.update(role._id, role)
......
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Roles } from '../collections/role'; import { Roles } from '../collections/role.collection';
import { PERMISSIONS } from '../config'; import { PERMISSIONS } from '../config';
import { UtilsService } from '../services/utils.service'; import { UtilsService } from '../services/utils.service';
import { Query } from '../models/query'; import { QueryModel } from '../models/query.model';
Meteor.methods({ Meteor.methods({
usersGetCount(query: Query): any { usersGetCount(query: QueryModel): any {
return { return {
recordsFiltered: Meteor.users.find(query.query).count(), recordsFiltered: Meteor.users.find(query.query).count(),
recordsTotal: Meteor.users.find().count(), recordsTotal: Meteor.users.find().count(),
......
export class Query { export class QueryModel {
constructor( constructor(
public query = {} as any, public query = {} as any,
......
export interface Role { export interface RoleModel {
_id?: string; _id?: string;
title: string; title: string;
permissions: string[]; permissions: string[];
......
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Roles } from '../collections/role'; import { Roles } from '../collections/role.collection';
Meteor.publish('roles', () => Roles.find({})); Meteor.publish('roles', () => Roles.find({}));
...@@ -3,13 +3,13 @@ import { Meteor } from 'meteor/meteor'; ...@@ -3,13 +3,13 @@ import { Meteor } from 'meteor/meteor';
// @ts-ignore // @ts-ignore
import { publishComposite } from 'meteor/reywood:publish-composite'; import { publishComposite } from 'meteor/reywood:publish-composite';
import { PERMISSIONS } from '../config'; import { PERMISSIONS } from '../config';
import { Query } from '../models/query'; import { QueryModel } from '../models/query.model';
import { UtilsService } from '../services/utils.service'; import { UtilsService } from '../services/utils.service';
import { Roles } from '../collections/role'; import { Roles } from '../collections/role.collection';
publishComposite('usersList', (filters = {}) => { publishComposite('usersList', (filters = {}) => {
const queryFilters = { ...new Query(), ...filters }; const queryFilters = { ...new QueryModel(), ...filters };
if (!UtilsService.hasPermission([PERMISSIONS.CAN_SEE_ALL_USERS])) { if (!UtilsService.hasPermission([PERMISSIONS.CAN_SEE_ALL_USERS])) {
throw new Meteor.Error(403, 'Not enough permissions to get all users'); throw new Meteor.Error(403, 'Not enough permissions to get all users');
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import AWS = require('aws-sdk'); import AWS = require('aws-sdk');
import { Meteor } from 'meteor/meteor'; import { Meteor } from 'meteor/meteor';
import { Observable, Subject } from 'rxjs'; import { Observable, Subject } from 'rxjs';
import { Roles } from '../collections/role'; import { Roles } from '../collections/role.collection';
export class UtilsService { export class UtilsService {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment