Merge pull request #562 from encorelab/develop

Master <- Develop
encorelab · Jul 27, 2023 · 862a60e · 862a60e
2 parents bf1e5fa + e582667
commit 862a60e
Show file tree

Hide file tree

Showing 33 changed files with 398 additions and 258 deletions.
diff --git a/backend/src/api/learner.ts b/backend/src/api/learner.ts
@@ -27,6 +27,13 @@ router.post('/board/many', async (req, res) => {
   res.status(200).json(models);
 });
 
+router.post('/project/many', async (req, res) => {
+  const { projectIDs } = req.body;
+
+  const models = await dalLearnerModel.getByProjects(projectIDs);
+  res.status(200).json(models);
+});
+
 router.post('/:id/addDimension', async (req, res) => {
   const { id } = req.params;
   const { dimension } = req.body;

diff --git a/backend/src/api/workflows.ts b/backend/src/api/workflows.ts
@@ -346,10 +346,18 @@ router.post('/task/groupTask/:groupTaskID/submit', async (req, res) => {
 
     // if post from board => move to list view
     // if post from bucket => delete from bucket
-    if (workflow.source.type === ContainerType.BOARD) {
-      await dalPost.update(post, { type: PostType.LIST });
-    } else if (workflow.source.type === ContainerType.BUCKET) {
-      await dalBucket.removePost(workflow.source.id, [post]);
+    if (workflow.source.type === ContainerType.WORKFLOW) {
+      if (destination.type === ContainerType.BOARD) {
+        await dalPost.update(post, { type: PostType.BOARD });
+      } else {
+        await dalPost.update(post, { type: PostType.BUCKET });
+      }
+    } else {
+      if (workflow.source.type === ContainerType.BOARD) {
+        await dalPost.update(post, { type: PostType.LIST });
+      } else if (workflow.source.type === ContainerType.BUCKET) {
+        await dalBucket.removePost(workflow.source.id, [post]);
+      }
     }
 
     Socket.Instance.emit(SocketEvent.WORKFLOW_POST_SUBMIT, post, true);

diff --git a/backend/src/models/Learner.ts b/backend/src/models/Learner.ts
@@ -25,8 +25,8 @@ export class LearnerModelModel {
   @prop({ required: true })
   public projectID!: string;
 
-  @prop({ required: true })
-  public boardID!: string;
+  @prop({ required: false })
+  public boardID?: string;
 
   @prop({ required: true })
   public name!: string;

diff --git a/backend/src/models/Post.ts b/backend/src/models/Post.ts
@@ -10,6 +10,7 @@ export enum PostType {
   BOARD = 'BOARD',
   BUCKET = 'BUCKET',
   LIST = 'LIST',
+  WORKFLOW = 'WORKFLOW',
 }
 
 export class MultipleChoiceOptions {

diff --git a/backend/src/models/Workflow.ts b/backend/src/models/Workflow.ts
@@ -25,6 +25,7 @@ export enum DistributionWorkflowType {
 export enum ContainerType {
   BOARD = 'BOARD',
   BUCKET = 'BUCKET',
+  WORKFLOW = 'WORKFLOW',
 }
 
 export enum TaskActionType {

diff --git a/backend/src/repository/dalBoard.ts b/backend/src/repository/dalBoard.ts
@@ -9,7 +9,6 @@ import dalProject from './dalProject';
 import dalTag from './dalTag';
 import dalComment from './dalComment';
 import dalVote from './dalVote';
-import dalLearnerModel from './dalLearnerModel';
 
 export const getById = async (id: string) => {
   try {
@@ -69,7 +68,6 @@ export const getAllPersonal = async (projectID: string) => {
 export const create = async (board: BoardModel) => {
   try {
     const savedBoard = await Board.create(board);
-    await dalLearnerModel.createDefaultModels(board.projectID, board.boardID);
     return savedBoard;
   } catch (err) {
     throw new Error(JSON.stringify(err, null, ' '));

diff --git a/backend/src/repository/dalLearnerModel.ts b/backend/src/repository/dalLearnerModel.ts
@@ -28,16 +28,12 @@ export const create = async (
   }
 };
 
-export const createDefaultModels = async (
-  projectID: string,
-  boardID: string
-) => {
+export const createDefaultModels = async (projectID: string) => {
   try {
     for (const value of DEFAULT_MODELS) {
       await Learner.create({
         modelID: new mongo.ObjectId().toString(),
         projectID: projectID,
-        boardID: boardID,
         name: value,
         dimensions: [],
         data: [],
@@ -57,6 +53,15 @@ export const getByID = async (modelID: string) => {
   }
 };
 
+export const getByProjects = async (projectIDs: string[]) => {
+  try {
+    const models = await Learner.find({ projectID: { $in: projectIDs } });
+    return models;
+  } catch (err) {
+    throw new Error(JSON.stringify(err, null, ' '));
+  }
+};
+
 export const getByBoards = async (boardIDs: string[]) => {
   try {
     const models = await Learner.find({ boardID: { $in: boardIDs } });
@@ -185,6 +190,7 @@ const dalLearnerModel = {
   createDefaultModels,
   getByID,
   getByBoards,
+  getByProjects,
   addDimension,
   removeDimension,
   addDimensionValues,

diff --git a/backend/src/repository/dalProject.ts b/backend/src/repository/dalProject.ts
@@ -2,6 +2,7 @@ import { UnauthorizedError } from '../errors/client.errors';
 import Project, { ProjectModel } from '../models/Project';
 import mongoose from 'mongoose';
 import dalBoard from './dalBoard';
+import dalLearnerModel from './dalLearnerModel';
 import { Role } from '../models/User';
 
 export const getById = async (id: string) => {
@@ -57,6 +58,7 @@ export const addTeacher = async (code: string, userID: string) => {
 export const create = async (project: ProjectModel) => {
   try {
     const savedProject = await Project.create(project);
+    await dalLearnerModel.createDefaultModels(project.projectID);
     return savedProject;
   } catch (err) {
     throw new Error(JSON.stringify(err, null, ' '));