Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

N21-2019 extend metadata response #5071

Merged
merged 7 commits into from
Jul 5, 2024
Merged

N21-2019 extend metadata response #5071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb0bd1b
extend metadata response
IgorCapCoder Jun 21, 2024
8d7a13a
api test
IgorCapCoder Jun 21, 2024
a83cc42
another api test
IgorCapCoder Jun 21, 2024
f427ff3
Merge branch 'main' into N21-2019-show-tool-usage
IgorCapCoder Jun 21, 2024
c32dc91
Merge branch 'main' into N21-2019-show-tool-usage
arnegns Jun 27, 2024
fb35f77
Merge branch 'main' into N21-2019-show-tool-usage
GordonNicholasCap Jul 2, 2024
6a6445b
Merge branch 'main' into N21-2019-show-tool-usage
arnegns Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...rc/modules/tool/common/controller/dto/context-external-tool-count-per-context.response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ export class ContextExternalToolCountPerContextResponse {
@ApiProperty()
boardElement: number;

@ApiProperty()
mediaBoard: number;
IgorCapCoder marked this conversation as resolved.
Show resolved Hide resolved

constructor(props: ContextExternalToolCountPerContextResponse) {
this.course = props.course;
this.boardElement = props.boardElement;
this.mediaBoard = props.mediaBoard;
}
}
8 changes: 8 additions & 0 deletions apps/server/src/modules/tool/external-tool/controller/api-test/tool.api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,12 @@ describe('ToolController (API)', () => {
contextId: new ObjectId().toHexString(),
});

const mediaBoardTools: ContextExternalToolEntity[] = contextExternalToolEntityFactory.buildListWithId(2, {
schoolTool: schoolExternalToolEntitys[1],
contextType: ContextExternalToolType.MEDIA_BOARD,
contextId: new ObjectId().toHexString(),
});

const board = columnBoardEntityFactory.build();
const externalToolElements = externalToolElementEntityFactory
.withParent(board)
Expand All @@ -799,6 +805,7 @@ describe('ToolController (API)', () => {
...schoolExternalToolEntitys,
...courseTools,
...boardTools,
...mediaBoardTools,
board,
...externalToolElements,
]);
Expand All @@ -820,6 +827,7 @@ describe('ToolController (API)', () => {
contextExternalToolCountPerContext: {
course: 1,
boardElement: 1,
mediaBoard: 1,
},
});
});
Expand Down
9 changes: 9 additions & 0 deletions .../server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,13 @@ describe('ToolSchoolController (API)', () => {
}
);

const mediaBoardExternalToolEntitys: ContextExternalToolEntity[] =
contextExternalToolEntityFactory.buildListWithId(2, {
schoolTool: schoolExternalToolEntity,
contextType: ContextExternalToolType.MEDIA_BOARD,
contextId: new ObjectId().toHexString(),
});

const board = columnBoardEntityFactory.build();
const externalToolElements = externalToolElementEntityFactory.withParent(board).buildList(2, {
contextExternalToolId: boardExternalToolEntitys[0].id,
Expand All @@ -571,6 +578,7 @@ describe('ToolSchoolController (API)', () => {
schoolExternalToolEntity,
...courseExternalToolEntitys,
...boardExternalToolEntitys,
...mediaBoardExternalToolEntitys,
board,
...externalToolElements,
]);
Expand All @@ -591,6 +599,7 @@ describe('ToolSchoolController (API)', () => {
contextExternalToolCountPerContext: {
course: 1,
boardElement: 1,
mediaBoard: 1,
},
});
});
Expand Down
Loading