mirror of
https://github.com/rgrgogu/new_starr.git
synced 2026-09-27 00:12:54 +08:00
ready to test
Testing Signed-off-by: Kenneth Obsequio <k80308392@gmail.com>
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
/***********************************************************************************************************************************************************************
|
||||
* File Name: task_completion.attributes.js
|
||||
* Type of Program: Attributes / Field Config
|
||||
* Description: Attribute exclusion lists for TaskCompletion and TaskCompletionFile.
|
||||
* Admins see audit fields; clients see only their own completion data.
|
||||
*
|
||||
* Author: Kenneth Obsequio (@lash0000)
|
||||
* Date Created: Jun. 13, 2026
|
||||
***********************************************************************************************************************************************************************/
|
||||
|
||||
// ─── Shared base exclusions (neither role needs these) ────────────────────────
|
||||
const excludeAttributes = [];
|
||||
|
||||
// ─── Admin: can see audit trails ──────────────────────────────────────────────
|
||||
const adminExclude = [
|
||||
...excludeAttributes,
|
||||
];
|
||||
|
||||
// ─── Client: no audit trails ──────────────────────────────────────────────────
|
||||
const clientExclude = [
|
||||
...excludeAttributes,
|
||||
'createdBy',
|
||||
'updatedBy',
|
||||
'deletedBy',
|
||||
'deletedAt',
|
||||
'storage_key',
|
||||
];
|
||||
|
||||
const jsonbSchemas = {};
|
||||
const computedAttributes = [];
|
||||
const filterableFields = {};
|
||||
|
||||
module.exports = {
|
||||
adminExclude,
|
||||
clientExclude,
|
||||
excludeAttributes,
|
||||
jsonbSchemas,
|
||||
computedAttributes,
|
||||
filterableFields,
|
||||
};
|
||||
@@ -0,0 +1,129 @@
|
||||
/***********************************************************************************************************************************************************************
|
||||
* File Name: task_completion.mdl.js
|
||||
* Type of Program: Model
|
||||
* Description: Sequelize models for `task_completions` and `task_completion_files`.
|
||||
* A completion is created when a user turns in work for a task.
|
||||
* Multiple completions are allowed (resubmit anytime).
|
||||
* Files are stored separately — one completion can have many files.
|
||||
*
|
||||
* Author: Kenneth Obsequio (@lash0000)
|
||||
* Date Created: Jun. 13, 2026
|
||||
***********************************************************************************************************************************************************************/
|
||||
const { DataTypes } = require('sequelize');
|
||||
const sequelize = require('../../config/db.config');
|
||||
const mdl_Users = require('../users/users.mdl');
|
||||
const { Task } = require('./task.mdl');
|
||||
|
||||
// ─── TaskCompletion ────────────────────────────────────────────────────────────
|
||||
const TaskCompletion = sequelize.define('TaskCompletion', {
|
||||
completion_id: {
|
||||
type: DataTypes.UUID,
|
||||
defaultValue: DataTypes.UUIDV4,
|
||||
primaryKey: true,
|
||||
order: 3,
|
||||
},
|
||||
task_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'tasks', key: 'task_id' },
|
||||
onDelete: 'CASCADE',
|
||||
order: 4,
|
||||
},
|
||||
user_id: {
|
||||
type: DataTypes.BIGINT,
|
||||
allowNull: false,
|
||||
references: { model: 'users', key: 'user_id' },
|
||||
onDelete: 'CASCADE',
|
||||
order: 5,
|
||||
},
|
||||
note: {
|
||||
type: DataTypes.TEXT,
|
||||
allowNull: true,
|
||||
comment: 'Optional note the user attaches when submitting.',
|
||||
order: 1,
|
||||
},
|
||||
submitted_at: {
|
||||
type: DataTypes.DATE,
|
||||
defaultValue: DataTypes.NOW,
|
||||
allowNull: false,
|
||||
order: 2,
|
||||
},
|
||||
|
||||
// ── Audit trails ────────────────────────────────────────────────────────
|
||||
createdBy: { type: DataTypes.BIGINT, allowNull: true, order: 6 },
|
||||
updatedBy: { type: DataTypes.BIGINT, allowNull: true, order: 7 },
|
||||
deletedBy: { type: DataTypes.BIGINT, allowNull: true, order: 8 },
|
||||
}, {
|
||||
tableName: 'task_completions',
|
||||
paranoid: true,
|
||||
timestamps: true,
|
||||
indexes: [
|
||||
{ fields: ['task_id'], name: 'idx_tc_task_id' },
|
||||
{ fields: ['user_id'], name: 'idx_tc_user_id' },
|
||||
{ fields: ['task_id', 'user_id'], name: 'idx_tc_task_user' },
|
||||
],
|
||||
});
|
||||
|
||||
// ─── TaskCompletionFile ────────────────────────────────────────────────────────
|
||||
const TaskCompletionFile = sequelize.define('TaskCompletionFile', {
|
||||
file_id: {
|
||||
type: DataTypes.UUID,
|
||||
defaultValue: DataTypes.UUIDV4,
|
||||
primaryKey: true,
|
||||
},
|
||||
completion_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'task_completions', key: 'completion_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
file_url: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
comment: 'Storage path or CDN URL of the uploaded file.',
|
||||
},
|
||||
file_name: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: false,
|
||||
comment: 'Original filename as uploaded by the user.',
|
||||
},
|
||||
file_size: {
|
||||
type: DataTypes.INTEGER,
|
||||
allowNull: true,
|
||||
comment: 'File size in bytes.',
|
||||
},
|
||||
mime_type: {
|
||||
type: DataTypes.STRING,
|
||||
allowNull: true,
|
||||
comment: 'MIME type e.g. application/pdf, image/png.',
|
||||
},
|
||||
storage_key: {
|
||||
type: DataTypes.STRING(500),
|
||||
allowNull: true,
|
||||
comment: 'S3 object key (e.g. "images/uuid.jpg"), used by the download proxy endpoint.',
|
||||
},
|
||||
|
||||
// ── Audit trails ────────────────────────────────────────────────────────
|
||||
createdBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
updatedBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
deletedBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
}, {
|
||||
tableName: 'task_completion_files',
|
||||
paranoid: true,
|
||||
timestamps: true,
|
||||
indexes: [
|
||||
{ fields: ['completion_id'], name: 'idx_tcf_completion_id' },
|
||||
],
|
||||
});
|
||||
|
||||
// ─── Associations ──────────────────────────────────────────────────────────────
|
||||
Task.hasMany(TaskCompletion, { foreignKey: 'task_id', as: 'completions' });
|
||||
TaskCompletion.belongsTo(Task, { foreignKey: 'task_id', as: 'task' });
|
||||
|
||||
mdl_Users.hasMany(TaskCompletion, { foreignKey: 'user_id', as: 'taskCompletions' });
|
||||
TaskCompletion.belongsTo(mdl_Users, { foreignKey: 'user_id', as: 'user' });
|
||||
|
||||
TaskCompletion.hasMany(TaskCompletionFile, { foreignKey: 'completion_id', as: 'files' });
|
||||
TaskCompletionFile.belongsTo(TaskCompletion, { foreignKey: 'completion_id', as: 'completion' });
|
||||
|
||||
module.exports = { TaskCompletion, TaskCompletionFile };
|
||||
@@ -0,0 +1,158 @@
|
||||
/***********************************************************************************************************************************************************************
|
||||
* File Name: task_progress.mdl.js
|
||||
* Type of Program: Model
|
||||
* Description: Sequelize models for tracking user progress on task requirements.
|
||||
*
|
||||
* TaskLinkVisit — tracks when a user visits a visit_link requirement.
|
||||
* UPSERT key: (requirement_id, user_id)
|
||||
* Revisiting updates visited_at.
|
||||
*
|
||||
* TaskProgress — tracks completion of read_course / read_unit / read_lesson.
|
||||
* UPSERT key: (requirement_id, user_id, reference_id)
|
||||
* Lessons: completed flipped directly by client.
|
||||
* Units/Courses: completed derived from child completion.
|
||||
*
|
||||
* Author: Kenneth Obsequio (@lash0000)
|
||||
* Date Created: Jun. 13, 2026
|
||||
***********************************************************************************************************************************************************************/
|
||||
const { DataTypes } = require('sequelize');
|
||||
const sequelize = require('../../config/db.config');
|
||||
const mdl_Users = require('../users/users.mdl');
|
||||
const { Task, TaskRequirement } = require('./task.mdl');
|
||||
|
||||
// ─── TaskLinkVisit ─────────────────────────────────────────────────────────────
|
||||
const TaskLinkVisit = sequelize.define('TaskLinkVisit', {
|
||||
visit_id: {
|
||||
type: DataTypes.UUID,
|
||||
defaultValue: DataTypes.UUIDV4,
|
||||
primaryKey: true,
|
||||
},
|
||||
task_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'tasks', key: 'task_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
requirement_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'task_requirements', key: 'requirement_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
user_id: {
|
||||
type: DataTypes.BIGINT,
|
||||
allowNull: false,
|
||||
references: { model: 'users', key: 'user_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
visited_at: {
|
||||
type: DataTypes.DATE,
|
||||
defaultValue: DataTypes.NOW,
|
||||
allowNull: false,
|
||||
comment: 'Updated on every revisit via UPSERT.',
|
||||
},
|
||||
|
||||
// ── Audit trails ────────────────────────────────────────────────────────
|
||||
createdBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
updatedBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
}, {
|
||||
tableName: 'task_link_visits',
|
||||
timestamps: true,
|
||||
paranoid: false, // visits are never soft-deleted
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['requirement_id', 'user_id'],
|
||||
name: 'uq_tlv_requirement_user',
|
||||
},
|
||||
{ fields: ['task_id'], name: 'idx_tlv_task_id' },
|
||||
{ fields: ['user_id'], name: 'idx_tlv_user_id' },
|
||||
{ fields: ['requirement_id'], name: 'idx_tlv_requirement_id' },
|
||||
],
|
||||
});
|
||||
|
||||
// ─── TaskProgress ──────────────────────────────────────────────────────────────
|
||||
const TaskProgress = sequelize.define('TaskProgress', {
|
||||
progress_id: {
|
||||
type: DataTypes.UUID,
|
||||
defaultValue: DataTypes.UUIDV4,
|
||||
primaryKey: true,
|
||||
},
|
||||
task_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'tasks', key: 'task_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
requirement_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
references: { model: 'task_requirements', key: 'requirement_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
user_id: {
|
||||
type: DataTypes.BIGINT,
|
||||
allowNull: false,
|
||||
references: { model: 'users', key: 'user_id' },
|
||||
onDelete: 'CASCADE',
|
||||
},
|
||||
reference_id: {
|
||||
type: DataTypes.UUID,
|
||||
allowNull: false,
|
||||
comment: 'course_id | unit_id | lesson_id depending on type.',
|
||||
},
|
||||
type: {
|
||||
type: DataTypes.ENUM('read_course', 'read_unit', 'read_lesson'),
|
||||
allowNull: false,
|
||||
},
|
||||
completed: {
|
||||
type: DataTypes.BOOLEAN,
|
||||
defaultValue: false,
|
||||
allowNull: false,
|
||||
},
|
||||
completed_at: {
|
||||
type: DataTypes.DATE,
|
||||
allowNull: true,
|
||||
comment: 'Set when completed flips true. Cleared when it reverts to false.',
|
||||
},
|
||||
|
||||
// ── Audit trails ────────────────────────────────────────────────────────
|
||||
createdBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
updatedBy: { type: DataTypes.BIGINT, allowNull: true },
|
||||
}, {
|
||||
tableName: 'task_progress',
|
||||
timestamps: true,
|
||||
paranoid: false, // progress rows are never soft-deleted
|
||||
indexes: [
|
||||
{
|
||||
unique: true,
|
||||
fields: ['requirement_id', 'user_id', 'reference_id'],
|
||||
name: 'uq_tp_requirement_user_reference',
|
||||
},
|
||||
{ fields: ['task_id'], name: 'idx_tp_task_id' },
|
||||
{ fields: ['user_id'], name: 'idx_tp_user_id' },
|
||||
{ fields: ['requirement_id'], name: 'idx_tp_requirement_id' },
|
||||
{ fields: ['type'], name: 'idx_tp_type' },
|
||||
],
|
||||
});
|
||||
|
||||
// ─── Associations ──────────────────────────────────────────────────────────────
|
||||
Task.hasMany(TaskLinkVisit, { foreignKey: 'task_id', as: 'linkVisits' });
|
||||
TaskLinkVisit.belongsTo(Task, { foreignKey: 'task_id', as: 'task' });
|
||||
|
||||
TaskRequirement.hasMany(TaskLinkVisit, { foreignKey: 'requirement_id', as: 'visits' });
|
||||
TaskLinkVisit.belongsTo(TaskRequirement, { foreignKey: 'requirement_id', as: 'requirement' });
|
||||
|
||||
mdl_Users.hasMany(TaskLinkVisit, { foreignKey: 'user_id', as: 'linkVisits' });
|
||||
TaskLinkVisit.belongsTo(mdl_Users, { foreignKey: 'user_id', as: 'user' });
|
||||
|
||||
Task.hasMany(TaskProgress, { foreignKey: 'task_id', as: 'progress' });
|
||||
TaskProgress.belongsTo(Task, { foreignKey: 'task_id', as: 'task' });
|
||||
|
||||
TaskRequirement.hasMany(TaskProgress, { foreignKey: 'requirement_id', as: 'progress' });
|
||||
TaskProgress.belongsTo(TaskRequirement, { foreignKey: 'requirement_id', as: 'requirement' });
|
||||
|
||||
mdl_Users.hasMany(TaskProgress, { foreignKey: 'user_id', as: 'taskProgress' });
|
||||
TaskProgress.belongsTo(mdl_Users, { foreignKey: 'user_id', as: 'user' });
|
||||
|
||||
module.exports = { TaskLinkVisit, TaskProgress };
|
||||
Reference in New Issue
Block a user