@ozdao/martyrs 0.2.547 → 0.2.548

package/src/modules/governance/middlewares/tasks.verifier.js

@@ -0,0 +1,224 @@
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+export default function(db) {
+
+  // Верификатор для создания задач
+  const createVerifier = new Verifier({
+    title: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Task title is required')
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Description must not exceed 2000 characters')
+    },
+    status: {
+      rule: 'optional',
+      default: 'not_started',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['proposed', 'voting', 'not_started', 'in_progress', 'review', 'completed', 'blocked', 'cancelled'], 'Invalid status')
+    },
+    assignedTo: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid user ID format')
+    },
+    dueDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    milestone: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid milestone ID format')
+    },
+    initiative: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid initiative ID format')
+    },
+    priority: {
+      rule: 'optional',
+      default: 'medium',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['low', 'medium', 'high', 'urgent'], 'Invalid priority')
+    },
+    tags: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(Validator.schema().string())
+    },
+    proposedByVoting: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    completionVoting: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    completedDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    }
+  });
+
+  // Верификатор для чтения задач
+  const readVerifier = new Verifier({
+    _id: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid task ID format')
+    },
+    milestone: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid milestone ID format')
+    },
+    initiative: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid initiative ID format')
+    },
+    assignedTo: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid user ID format')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['proposed', 'voting', 'not_started', 'in_progress', 'review', 'completed', 'blocked', 'cancelled'], 'Invalid status')
+    },
+    priority: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['low', 'medium', 'high', 'urgent'], 'Invalid priority')
+    },
+    limit: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(1, 'Limit must be at least 1')
+        .max(100, 'Limit cannot exceed 100')
+    },
+    skip: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(0, 'Skip cannot be negative')
+    },
+    sort: {
+      rule: 'optional'
+    },
+    populate: {
+      rule: 'optional'
+    }
+  });
+
+  // Верификатор для обновления задач
+  const updateVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Task ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid task ID format')
+    },
+    title: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Description must not exceed 2000 characters')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['proposed', 'voting', 'not_started', 'in_progress', 'review', 'completed', 'blocked', 'cancelled'], 'Invalid status')
+    },
+    assignedTo: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid user ID format')
+    },
+    dueDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    priority: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['low', 'medium', 'high', 'urgent'], 'Invalid priority')
+    },
+    tags: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(Validator.schema().string())
+    },
+    completionVoting: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    completedDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    }
+  });
+
+  // Верификатор для удаления задач
+  const deleteVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Task ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid task ID format')
+    }
+  });
+
+  return {
+    createVerifier,
+    readVerifier,
+    updateVerifier,
+    deleteVerifier
+  };
+}

package/src/modules/governance/middlewares/votes.verifier.js

@@ -0,0 +1,115 @@
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+export default function(db) {
+
+  // Верификатор для создания голосов
+  const createVerifier = new Verifier({
+    voting: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Voting ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    value: {
+      rule: 'required',
+      validator: Validator.schema()
+        .number()
+        .required('Vote value is required')
+    },
+    voter: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voter ID format')
+    },
+    comment: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(500, 'Comment must not exceed 500 characters')
+    }
+  });
+
+  // Верификатор для чтения голосов
+  const readVerifier = new Verifier({
+    _id: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid vote ID format')
+    },
+    voting: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    voter: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voter ID format')
+    },
+    limit: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(1, 'Limit must be at least 1')
+        .max(100, 'Limit cannot exceed 100')
+    },
+    skip: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(0, 'Skip cannot be negative')
+    },
+    sort: {
+      rule: 'optional'
+    },
+    populate: {
+      rule: 'optional'
+    }
+  });
+
+  // Верификатор для обновления голосов
+  const updateVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Vote ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid vote ID format')
+    },
+    value: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .number()
+    },
+    comment: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(500, 'Comment must not exceed 500 characters')
+    }
+  });
+
+  // Верификатор для удаления голосов
+  const deleteVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Vote ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid vote ID format')
+    }
+  });
+
+  return {
+    createVerifier,
+    readVerifier,
+    updateVerifier,
+    deleteVerifier
+  };
+}

package/src/modules/governance/middlewares/votings.verifier.js

@@ -0,0 +1,237 @@
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+export default function(db) {
+
+  // Верификатор для создания голосований
+  const createVerifier = new Verifier({
+    title: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Voting title is required')
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Description must not exceed 2000 characters')
+    },
+    type: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Voting type is required')
+        .oneOf(['create_task', 'approve_task', 'create_initiative', 'update_milestone', 'general'], 'Invalid voting type')
+    },
+    targetModel: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['Task', 'Initiative', 'Milestone'], 'Invalid target model')
+    },
+    targetId: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid target ID format')
+    },
+    threshold: {
+      rule: 'optional',
+      default: 51,
+      validator: Validator.schema()
+        .number()
+        .min(1, 'Threshold must be at least 1')
+        .max(100, 'Threshold cannot exceed 100')
+    },
+    participants: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid participant ID format')
+        )
+    },
+    result: {
+      rule: 'optional',
+      default: 'pending',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'approved', 'rejected'], 'Invalid result')
+    },
+    initiative: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid initiative ID format')
+    },
+    milestone: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid milestone ID format')
+    },
+    metadata: {
+      rule: 'optional'
+    },
+    startDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    endDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    status: {
+      rule: 'optional',
+      default: 'pending',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'active', 'closed'], 'Invalid status')
+    }
+  });
+
+  // Верификатор для чтения голосований
+  const readVerifier = new Verifier({
+    _id: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    type: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['create_task', 'approve_task', 'create_initiative', 'update_milestone', 'general'], 'Invalid voting type')
+    },
+    initiative: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid initiative ID format')
+    },
+    milestone: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid milestone ID format')
+    },
+    result: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'approved', 'rejected'], 'Invalid result')
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'active', 'closed'], 'Invalid status')
+    },
+    limit: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(1, 'Limit must be at least 1')
+        .max(100, 'Limit cannot exceed 100')
+    },
+    skip: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .integer()
+        .min(0, 'Skip cannot be negative')
+    },
+    sort: {
+      rule: 'optional'
+    },
+    populate: {
+      rule: 'optional'
+    }
+  });
+
+  // Верификатор для обновления голосований
+  const updateVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Voting ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    },
+    title: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .min(1, 'Title cannot be empty')
+        .max(200, 'Title must not exceed 200 characters')
+    },
+    description: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(2000, 'Description must not exceed 2000 characters')
+    },
+    threshold: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .number()
+        .min(1, 'Threshold must be at least 1')
+        .max(100, 'Threshold cannot exceed 100')
+    },
+    participants: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .array()
+        .items(
+          Validator.schema()
+            .string()
+            .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid participant ID format')
+        )
+    },
+    result: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'approved', 'rejected'], 'Invalid result')
+    },
+    metadata: {
+      rule: 'optional'
+    },
+    endDate: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .date()
+    },
+    status: {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .oneOf(['pending', 'active', 'closed'], 'Invalid status')
+    }
+  });
+
+  // Верификатор для удаления голосований
+  const deleteVerifier = new Verifier({
+    _id: {
+      rule: 'required',
+      validator: Validator.schema()
+        .string()
+        .required('Voting ID is required')
+        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid voting ID format')
+    }
+  });
+
+  return {
+    createVerifier,
+    readVerifier,
+    updateVerifier,
+    deleteVerifier
+  };
+}

package/src/modules/governance/models/initiative.model.js

@@ -1,17 +1,21 @@
 export default db => {
   const InitiativeSchema = new db.mongoose.Schema(
     {
-      title: { type: String, required: true },
-      description: { type: String, required: true },
-      status: {
-        type: String,
-        enum: ['draft', 'active', 'completed', 'cancelled'],
-        default: 'draft',
-      },
+      title: { type: String },
+      name: { type: String },
+      description: { type: String },
+      status: { type: String },
+      client: { type: String },
+      date: { type: db.mongoose.Schema.Types.Mixed },
+      url: { type: String },
+      cover: { type: db.mongoose.Schema.Types.Mixed },
+      published: { type: db.mongoose.Schema.Types.Mixed },
+      structure: { type: db.mongoose.Schema.Types.Mixed },
+      team: { type: db.mongoose.Schema.Types.Mixed },
+      services: { type: db.mongoose.Schema.Types.Mixed },
       createdBy: {
         type: db.mongoose.Schema.Types.ObjectId,
         ref: 'User',
-        required: true,
       },
       tasks: [
         {
@@ -22,6 +26,8 @@ export default db => {
     },
     {
       timestamps: { currentTime: () => Date.now() },
+      strict: false,
+      collection: 'initiatives'
     }
   );
   const Initiative = db.mongoose.model('Initiative', InitiativeSchema);

package/src/modules/governance/models/task.model.js

@@ -10,7 +10,7 @@ export default db => {
       },
       status: {
         type: String,
-        enum: ['not_started', 'in_progress', 'completed', 'blocked', 'cancelled'],
+        enum: ['proposed', 'voting', 'not_started', 'in_progress', 'review', 'completed', 'blocked', 'cancelled'],
         default: 'not_started',
       },
       assignedTo: {
@@ -41,6 +41,18 @@ export default db => {
           type: String,
         },
       ],
+      // Voting references
+      proposedByVoting: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'Voting',
+      },
+      completionVoting: {
+        type: db.mongoose.Schema.Types.ObjectId,
+        ref: 'Voting',
+      },
+      completedDate: {
+        type: Date,
+      },
     },
     {
       timestamps: { currentTime: () => Date.now() },