crazy-odds-bet-shared 1.0.28 → 1.0.30

package/models/betTracker.js

@@ -4,6 +4,7 @@ const { createBaseSchema, baseSchemaOptions } = require('./base');
 const betTrackerSchema = new Schema(
   {
     ...createBaseSchema(),
+    userId: { type: String, ref: 'User' },
     groupId: { type: String },
     bookmaker: { type: Object, properties: {
       id: { type: String, required: true, ref: 'Bookmaker' },

package/models/index.js

@@ -6,8 +6,8 @@ const { Team } = require('./team');
 const { Player } = require('./player');
 const { Fixture, FixtureStatus } = require('./fixture');
 const { User } = require('./user');
-const { Permission } = require('./permission');
-const { Role } = require('./role');
+const { UserPermission } = require('./userPermission');
+const { UserRole } = require('./userRole');
 const { MarketTemplate } = require('./marketTemplate');
 const { Market } = require('./market');
 const { Odd } = require('./odd');
@@ -25,8 +25,8 @@ module.exports = {
   Fixture,
   FixtureStatus,
   User,
-  Permission,
-  Role,
+  UserPermission,
+  UserRole,
   MarketTemplate,
   Market,
   Odd,

package/models/user.js

@@ -14,9 +14,8 @@ const userSchema = new Schema(
     email: { type: String, required: true, unique: true, lowercase: true, trim: true },
     password: { type: String, required: true },
     name: { type: String, required: true },
-    roleId: { type: String, ref: 'Role', default: null },
-    /** Custom permission IDs added on top of role permissions */
-    permissionIds: [{ type: String, ref: 'Permission' }],
+    roleId: { type: String, ref: 'UserRole', default: null },
+    permissionIds: [{ type: String, ref: 'UserPermission' }],
     config: { type: Schema.Types.Mixed, default: {} },
     isActive: { type: Boolean, default: true }
   },
@@ -51,8 +50,8 @@ userSchema.static('getActive', function () {
 });
 
 userSchema.static('findAdmins', async function () {
-  const Role = this.db.model('Role');
-  const adminRole = await Role.findOne({ name: 'Admin' }).lean();
+  const UserRole = this.db.model('UserRole');
+  const adminRole = await UserRole.findOne({ name: 'Admin' }).lean();
   if (!adminRole) return this.find({ _id: { $in: [] } }).select('-password');
   return this.find({ roleId: adminRole._id, isActive: true }).select('-password');
 });

package/models/userPermission.js

@@ -0,0 +1,21 @@
+const { Schema, model } = require('mongoose');
+const { createBaseSchema, baseSchemaOptions } = require('./base');
+
+/**
+ * UserPermission schema - granular permission codes (e.g. "users:read", "roles:write")
+ */
+const userPermissionSchema = new Schema(
+  {
+    ...createBaseSchema(),
+    code: { type: String, required: true, unique: true, trim: true },
+    name: { type: String, required: true, trim: true },
+    description: { type: String, default: '' }
+  },
+  { ...baseSchemaOptions, collection: 'userpermissions' }
+);
+
+userPermissionSchema.index({ code: 1 });
+
+const UserPermission = model('UserPermission', userPermissionSchema);
+
+module.exports = { UserPermission };

package/models/userRole.js

@@ -0,0 +1,21 @@
+const { Schema, model } = require('mongoose');
+const { createBaseSchema, baseSchemaOptions } = require('./base');
+
+/**
+ * UserRole schema - named roles with a set of permission IDs (inherited by users assigned this role)
+ */
+const userRoleSchema = new Schema(
+  {
+    ...createBaseSchema(),
+    name: { type: String, required: true, unique: true, trim: true },
+    description: { type: String, default: '' },
+    permissionIds: [{ type: String, ref: 'UserPermission' }]
+  },
+  { ...baseSchemaOptions, collection: 'userroles' }
+);
+
+userRoleSchema.index({ name: 1 });
+
+const UserRole = model('UserRole', userRoleSchema);
+
+module.exports = { UserRole };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crazy-odds-bet-shared",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Shared MongoDB models and utilities for odds project",
   "main": "index.js",
   "exports": {

package/models/permission.js

@@ -1,21 +0,0 @@
-const { Schema, model } = require('mongoose');
-const { createBaseSchema, baseSchemaOptions } = require('./base');
-
-/**
- * Permission schema - granular permission codes (e.g. "users:read", "roles:write")
- */
-const permissionSchema = new Schema(
-  {
-    ...createBaseSchema(),
-    code: { type: String, required: true, unique: true, trim: true },
-    name: { type: String, required: true, trim: true },
-    description: { type: String, default: '' }
-  },
-  baseSchemaOptions
-);
-
-permissionSchema.index({ code: 1 });
-
-const Permission = model('Permission', permissionSchema);
-
-module.exports = { Permission };

package/models/role.js

@@ -1,21 +0,0 @@
-const { Schema, model } = require('mongoose');
-const { createBaseSchema, baseSchemaOptions } = require('./base');
-
-/**
- * Role schema - named roles with a set of permission IDs (inherited by users assigned this role)
- */
-const roleSchema = new Schema(
-  {
-    ...createBaseSchema(),
-    name: { type: String, required: true, unique: true, trim: true },
-    description: { type: String, default: '' },
-    permissionIds: [{ type: String, ref: 'Permission' }]
-  },
-  baseSchemaOptions
-);
-
-roleSchema.index({ name: 1 });
-
-const Role = model('Role', roleSchema);
-
-module.exports = { Role };