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.

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

EW-539 adding Learnstore links to the Common Cartridge export #4599

Merged
merged 220 commits into from
Mar 15, 2024

Conversation

psachmann
Copy link
Contributor

@psachmann psachmann commented Nov 30, 2023

Description

Expending the common cartridge export with the with Learnstore links and refactoring the common cartridge module for easier extension and integration with other resource types.

Links to Tickets or other pull requests

Approval for review

  • DEV: If api was changed - generate-client:server was executed in vue frontend and changes were tested and put in a PR with the same branch name.
  • QA: In addition to review, the code has been manually tested (if manual testing is possible)
  • All points were discussed with the ticket creator, support-team or product owner. The code upholds all quality guidelines from the PR-template.

Notice: Please remove the WIP label if the PR is ready to review, otherwise nobody will review it.

@@ -4,7 +4,7 @@ import {
createCommonCartridgeOrganizationElementPropsV110,
createCommonCartridgeOrganizationsWrapperElementPropsV110,
createCommonCartridgeResourcesWrapperElementPropsV110,
} from '@shared/testing/factory/common-cartridge-element-props.factory';
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use relativer path inside the same module ../../../testing/common-cartridge-element-props.factory
For all other places too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done anywhere.

import { Test, TestingModule } from '@nestjs/testing';
import { ComponentProperties, ComponentType } from '@shared/domain/entity';
import { courseFactory, lessonFactory, setupEntities, taskFactory, userFactory } from '@shared/testing';
import { OmitVersion, createIdentifier } from '@src/modules/common-cartridge/export/utils';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from '@modules/common-cartridge';

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

import { Injectable } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { ComponentProperties, ComponentType, Course, LessonEntity, Task } from '@shared/domain/entity';
import { createIdentifier } from '@src/modules/common-cartridge/export/utils';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from '@modules/common-cartridge';

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


@Module({
imports: [
BoardModule,
forwardRef(() => BoardModule),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You add it to avoid dependency cycles? If yes, then please note that you remove it in the account module refactoring.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure if this will be the case? We can try, but i think those cycles are seated deeper in general

import { ToolVersionService } from './service/tool-version-service';

@Module({
imports: [CommonToolModule, ExternalToolModule, SchoolExternalToolModule, LoggerModule, ToolConfigModule],
imports: [
forwardRef(() => CommonToolModule),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same forwardRef`s must be removed, later i expect with the change in account module.

import { CommonToolModule } from '../common';
import { ExternalToolModule } from '../external-tool';
import { ToolConfigModule } from '../tool-config.module';
import { SchoolExternalToolService, SchoolExternalToolValidationService } from './service';

@Module({
imports: [CommonToolModule, ExternalToolModule, ToolConfigModule],
imports: [forwardRef(() => CommonToolModule), forwardRef(() => ExternalToolModule), ToolConfigModule],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove with account module change.

Copy link

@SimoneRadtke-Cap SimoneRadtke-Cap merged commit 2bee608 into main Mar 15, 2024
56 of 57 checks passed
@SimoneRadtke-Cap SimoneRadtke-Cap deleted the EW-539 branch March 15, 2024 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants