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
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
ed2d219
EW-539 Add ComponentType Lernstore to cc-export-service
SimoneRadtke-Cap Oct 27, 2023
c5df7d1
EW-539 Adjust if statement
SimoneRadtke-Cap Oct 27, 2023
548ec7c
EW-539 extending organization item element of CC
psachmann Nov 2, 2023
4192540
EW-539 Add new types to realize nesting
SimoneRadtke-Cap Nov 9, 2023
66e1854
Implement transform() for CommonCartridgeOrganizationItemElement.
mkreuzkam-cap Nov 22, 2023
fa8a048
Merge branch 'main' into EW-539
mkreuzkam-cap Nov 23, 2023
9c64a59
implemented nested CC export.
mkreuzkam-cap Nov 23, 2023
a948920
Add resourceCollection to returned OrganizationItemCollection.
mkreuzkam-cap Nov 24, 2023
15f5ec0
EW-539 startin with commo cartridge builder refactoring
psachmann Nov 24, 2023
2ac3da6
EW-539 working on builders
psachmann Nov 27, 2023
d350da9
EW-539 updatinf common cartridge interfaces
psachmann Nov 28, 2023
aa3cd5a
EW-539 finishing working on builders
psachmann Nov 28, 2023
7e38b2c
EW-539 renaming manifest element to resource
psachmann Nov 28, 2023
e0706b7
EW-539 Move web link resource to new folder
SimoneRadtke-Cap Nov 28, 2023
f911c5a
EW-539 Add resource type to enums
SimoneRadtke-Cap Nov 28, 2023
08db666
EW-539 Move web content and lti resources to new folder
SimoneRadtke-Cap Nov 28, 2023
70ca958
EW-539 adding utils and wrapper elements
psachmann Nov 28, 2023
e71b06d
EW-539 working on builders
psachmann Nov 28, 2023
1d3942d
EW-539 working on resources
psachmann Nov 28, 2023
7616c93
EW-539 working on refactoring
psachmann Nov 28, 2023
da8eb60
EW-539 working on file builder
psachmann Nov 28, 2023
873bba1
EW-539 cleaning up code
psachmann Nov 29, 2023
01bab92
EW-539 updating cc file builder tests
psachmann Nov 29, 2023
d9f54e9
EW-539 creating sub organizations is now possible
psachmann Nov 29, 2023
ee07405
EW-539 Adjust test structure for web link resources
SimoneRadtke-Cap Nov 29, 2023
3ebc7d4
EW-539 Adjust tests for web content and web link resources
SimoneRadtke-Cap Nov 29, 2023
5393627
EW-539 Adjust test for lti resource
SimoneRadtke-Cap Nov 29, 2023
82c37e4
EW-539 renaming and adding tests
psachmann Nov 30, 2023
fb5ffb7
EW-539 adding tests for common cartridge utils
psachmann Nov 30, 2023
2f126d0
EW-539 adding resource factory tests
psachmann Nov 30, 2023
37fe9d0
EW-539 replacing old with new files
psachmann Nov 30, 2023
0229862
EW-539 renaming cc versions enum
psachmann Nov 30, 2023
6932790
EW-539 refactoring of cc export service
psachmann Nov 30, 2023
fcb90d2
EW-539 code cleanup
psachmann Nov 30, 2023
5788de2
EW-539 refactoring cc export service
psachmann Nov 30, 2023
e9021dc
EW-539 adding tests
psachmann Dec 1, 2023
472f84b
EW-539 Finish tests for lti, web content and web link resources
SimoneRadtke-Cap Dec 1, 2023
520a49f
EW-539 adding tests for elements
psachmann Dec 1, 2023
45415d2
EW-539 renaming getManifestXml to getManifestXmlObject
psachmann Dec 1, 2023
9845a60
EW-539 Start tests for metadata element and manifest resource
SimoneRadtke-Cap Dec 1, 2023
3bcdd71
EW-539 finishing tests for elements
psachmann Dec 1, 2023
9e8b3ba
EW-539 adding test for cc mapper
psachmann Dec 1, 2023
6d30635
EW-539 working on tests
psachmann Dec 1, 2023
e0135a9
EW-539 Adjust test for lti resource
SimoneRadtke-Cap Dec 4, 2023
f37f482
EW-539 Correct namespaces by versions
SimoneRadtke-Cap Dec 4, 2023
c046c1f
EW-539 adding config
psachmann Dec 4, 2023
717c602
review comments 04.12.23
Metauriel Dec 4, 2023
f9e3b3f
EW-539 Mark methods as public
SimoneRadtke-Cap Dec 4, 2023
657716b
EW-539 Start to adjust test for manifest resource
SimoneRadtke-Cap Dec 4, 2023
15933b5
EW-539 Working on revieiw comments
SimoneRadtke-Cap Dec 4, 2023
336e009
EW-539 refactoring common cartridge mapper
psachmann Dec 5, 2023
bff93d0
EW-539 refactoring mapper
psachmann Dec 5, 2023
cec279c
EW-539 improving tests
psachmann Dec 5, 2023
cb5e873
EW-539 Start with cc resource props test factory
SimoneRadtke-Cap Dec 6, 2023
71eb836
EW-539 working on everything
psachmann Dec 6, 2023
7e6fd67
EW-539 working on resources
psachmann Dec 6, 2023
4c2853c
EW-539 Working on elements
SimoneRadtke-Cap Dec 6, 2023
28f45ea
EW-539 Working on resource factory
SimoneRadtke-Cap Dec 6, 2023
2a43e32
EW-539 Add public keyword to methods
SimoneRadtke-Cap Dec 7, 2023
a88101e
EW-539 Adjust element version factory
SimoneRadtke-Cap Dec 7, 2023
ed38847
EW-539 working on resources
psachmann Dec 7, 2023
a6495bf
EW-539 some renaming
psachmann Dec 7, 2023
8292601
EW-539 working on resources
psachmann Dec 7, 2023
195c965
EW-539 Adjust element factories
SimoneRadtke-Cap Dec 7, 2023
7e00a40
EW-539 saving work
psachmann Dec 7, 2023
8145128
EW-539 Renaming
SimoneRadtke-Cap Dec 8, 2023
a933e09
EW-539 Add tests for metadata and organization elements
SimoneRadtke-Cap Dec 8, 2023
641a9fc
EW-539 working on Common Cartridge v1.1.0
psachmann Dec 11, 2023
a9fc4db
EW-539 cleaning up
psachmann Dec 11, 2023
2337b6e
EW-539 Add todos
SimoneRadtke-Cap Dec 11, 2023
b1a07e3
EW-539 removing unused code
psachmann Dec 11, 2023
10f5f3b
Ew-539 working on resource tests
psachmann Dec 11, 2023
3d6faf0
EW-539 removing old code
psachmann Dec 11, 2023
d0534f4
EW-539 working on tests for factories
psachmann Dec 11, 2023
21c33f0
EW-539 Working on
SimoneRadtke-Cap Dec 11, 2023
08a2c8b
EW-539 working on
SimoneRadtke-Cap Dec 11, 2023
d727b30
EW-539 fixing tests
psachmann Dec 11, 2023
01fdda5
EW-539 working on tests
psachmann Dec 11, 2023
11bf26f
EW-539 Add tests for resources wrapper element
SimoneRadtke-Cap Dec 11, 2023
f159f6d
EW-539 Clean up
SimoneRadtke-Cap Dec 12, 2023
7a7fb56
EW-539 Working on element factory
SimoneRadtke-Cap Dec 14, 2023
591a479
EW-539 Fix typo in resource factory
SimoneRadtke-Cap Dec 14, 2023
6859898
EW-539 Working on element version factory
SimoneRadtke-Cap Dec 14, 2023
6c33ec9
EW-539 Working on
SimoneRadtke-Cap Dec 14, 2023
82c9d76
EW-539 finished web link
psachmann Dec 14, 2023
f703c5e
EW-539 working on
psachmann Dec 14, 2023
6ad8164
EW-539 fixing resource factory props
psachmann Dec 14, 2023
6ce9cf8
EW-539 Move common cartridge to modules
SimoneRadtke-Cap Dec 15, 2023
3441604
EW-539 Clean up
SimoneRadtke-Cap Dec 15, 2023
c8a2fd2
EW-539 Adjust element factories
SimoneRadtke-Cap Dec 15, 2023
be21ca7
EW-539 manifest for version 1.1.0 works
psachmann Dec 15, 2023
61a03a6
EW-539 tests finished for manifest v1.3.0
psachmann Dec 15, 2023
b7d3a8c
fixing unit tests
psachmann Dec 15, 2023
fda860c
fixing errors in cc file builder
psachmann Dec 15, 2023
597eeb5
Adding create identifier method
psachmann Dec 15, 2023
d1132ae
Cleaning up cc fle builder
psachmann Dec 15, 2023
dc6fef4
Cleaning up code
psachmann Dec 15, 2023
d4997a6
Working on
psachmann Dec 18, 2023
77c1333
Fixing one type
psachmann Dec 18, 2023
325bf1d
Working on tests
psachmann Dec 18, 2023
8d2a7f7
EW-539 Clean up
SimoneRadtke-Cap Dec 18, 2023
32f1d60
Fixing test coverage for cc utils
psachmann Dec 18, 2023
e23731e
Fixing some compilation errors
psachmann Dec 19, 2023
e0e0510
Working on tests
psachmann Dec 20, 2023
9d43b4c
EW-539 Adjust mapper test
SimoneRadtke-Cap Dec 20, 2023
0fdeeab
Fixing test coverage for resource factories
psachmann Dec 20, 2023
0632cd2
Finishing resources
psachmann Dec 20, 2023
dbcda23
Fixing test coverage for element factories
psachmann Dec 20, 2023
3bebaf4
Fixing tests for cc elements v1.1.0
psachmann Dec 20, 2023
7dc14d1
Finishing cc elements for version 1.3.0
psachmann Dec 20, 2023
ef7a442
Fixing some tests
psachmann Dec 21, 2023
e2aad01
Fixing test coverage
psachmann Dec 21, 2023
cc1904f
Merge branch 'main' into EW-539
psachmann Dec 21, 2023
cfd0159
Fixing errors after merge
psachmann Dec 21, 2023
60e10f1
EW-539 updating review-notes.md
psachmann Dec 21, 2023
3fe70c7
EW-539 Working on mapper and export service
SimoneRadtke-Cap Jan 1, 2024
bdce2f0
EW-539 fixing test coverage
psachmann Jan 3, 2024
aa715e2
Merge branch 'main' into EW-539
psachmann Jan 3, 2024
ce265e4
EW-539 updating review notes
psachmann Jan 4, 2024
90607ff
Merge branch 'main' into EW-539
psachmann Jan 4, 2024
eff5876
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 8, 2024
bdbbfa2
EW-539 fixing review comment
psachmann Jan 8, 2024
99cb8e0
removing compose.yml
psachmann Jan 8, 2024
bf5432c
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 8, 2024
2753562
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 8, 2024
9b2c58f
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 8, 2024
50e19f6
EW-539 Adjust api test for course controller
SimoneRadtke-Cap Jan 9, 2024
72aed7e
EW-539 moving feature check to uc
psachmann Jan 9, 2024
4e62a93
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 9, 2024
649d2ee
EW-539 Undo changes to course controller test
SimoneRadtke-Cap Jan 9, 2024
593a149
EW-539 Adjust test for course-export-uc for coverage
SimoneRadtke-Cap Jan 9, 2024
cfb911b
EW-539 Fix deep import warnings
SimoneRadtke-Cap Jan 9, 2024
40398cd
EW-539 Remove deprecated code from course controller
SimoneRadtke-Cap Jan 9, 2024
5f9b511
EW-539 Change http to https for sonarcloud
SimoneRadtke-Cap Jan 9, 2024
9d5ad8c
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 9, 2024
da05ee4
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 9, 2024
39d6cbb
EW-539 Deactivate to insert final new line for xml files
SimoneRadtke-Cap Jan 10, 2024
c0973ef
EW-539 Adjust namespaces and links for better security
SimoneRadtke-Cap Jan 10, 2024
2747f35
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 10, 2024
8b408ae
EW-539 Fix a code smell
SimoneRadtke-Cap Jan 10, 2024
57a0a71
EW-539 Editorconfig commented out and fix some prettier issues
SimoneRadtke-Cap Jan 11, 2024
1b7c08f
EW-539 Fix prettier errors
SimoneRadtke-Cap Jan 11, 2024
73e7fb9
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 11, 2024
fd1f232
EW-539 Delete editorconfig
SimoneRadtke-Cap Jan 11, 2024
2c96b34
EW-539 Working on review comments
SimoneRadtke-Cap Jan 15, 2024
3542ab6
EW-539 Working on review comments
SimoneRadtke-Cap Jan 17, 2024
e6b0912
EW-539 Add mapper for course to manifest and fix geogebra url and org…
SimoneRadtke-Cap Jan 26, 2024
65e63cf
EW-539 Fix identifier for tasks in organization
SimoneRadtke-Cap Jan 26, 2024
222b768
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 26, 2024
83ae5da
EW-539 Fix import order in learnroom module
SimoneRadtke-Cap Jan 29, 2024
0267f75
EW-539 Adjust test for cc mapper
SimoneRadtke-Cap Jan 29, 2024
cb1a259
EW-539 Adjust tests
SimoneRadtke-Cap Jan 29, 2024
9591d18
EW-539 Fix etherpad title
SimoneRadtke-Cap Jan 29, 2024
5d63fae
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 30, 2024
146b66a
Merge branch 'main' into EW-539
SimoneRadtke-Cap Jan 31, 2024
ed1506c
EW-539 Trial to fix lernstore content
SimoneRadtke-Cap Jan 31, 2024
d964130
EW-539 Adjust test for cc mapper
SimoneRadtke-Cap Jan 31, 2024
4d71e4b
EW-539 Working on review comments and remove the override keyword
SimoneRadtke-Cap Jan 31, 2024
6c95ecf
EW-539 Working on review comments regarding wildcards in imports
SimoneRadtke-Cap Feb 2, 2024
e3bddc8
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 2, 2024
67ce976
EW-539 Add test factories for element and resource props
SimoneRadtke-Cap Feb 7, 2024
37f181e
EW-539 Working on tests for cc elements
SimoneRadtke-Cap Feb 7, 2024
d1fcbed
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 7, 2024
95b5d85
EW-539 Adjust test for cc element factory
SimoneRadtke-Cap Feb 7, 2024
f5ddf80
EW-539 Working on tests for cc resources
SimoneRadtke-Cap Feb 7, 2024
e5d09f9
EW-539 working on review comments
psachmann Feb 7, 2024
5a6bb19
EW-539 fixing review comments
psachmann Feb 7, 2024
75375e1
EW-539 working on review comments
psachmann Feb 7, 2024
0176b86
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 7, 2024
e23bc7e
EW-539 Adjust test for cc resource factory
SimoneRadtke-Cap Feb 8, 2024
1cc12c6
EW-539 solving async problems
psachmann Feb 8, 2024
c0a3ce5
EW-539 Working on tests
SimoneRadtke-Cap Feb 8, 2024
3637524
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 8, 2024
be2258c
EW-539 Add test for coverage
SimoneRadtke-Cap Feb 9, 2024
e4d44ee
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 9, 2024
8b4bfa0
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 12, 2024
e01d7a2
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 12, 2024
0429ee4
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 13, 2024
de09b97
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 15, 2024
2e0cd43
EW-539 Trial to remove tasks from lesson properties
SimoneRadtke-Cap Feb 15, 2024
999e61f
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 16, 2024
bed450c
EW-539 Working on test coverage
SimoneRadtke-Cap Feb 16, 2024
ce0d313
EW-539 Remove unused code
SimoneRadtke-Cap Feb 16, 2024
179ea60
EW-539 Adjust addTasks method in the cc export service
SimoneRadtke-Cap Feb 19, 2024
480ec05
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 19, 2024
49a3c54
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 20, 2024
9e9b156
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 21, 2024
54c13be
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 22, 2024
940a477
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 26, 2024
2fa3df9
EW-539 Move export to own folder
SimoneRadtke-Cap Feb 26, 2024
eefea01
EW-539 Fix small things after merge conflict
SimoneRadtke-Cap Feb 26, 2024
c137fb5
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 26, 2024
7677d41
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 28, 2024
d0ea153
EW-539 Minor corrections after fixing the merge conflicts
SimoneRadtke-Cap Feb 29, 2024
5d5c5d9
Merge branch 'main' into EW-539
SimoneRadtke-Cap Feb 29, 2024
2caf5ee
EW-539 Working on review comments and add empty line to tests
SimoneRadtke-Cap Feb 29, 2024
4c5f90c
EW-539 Add index.ts for import and export and adjust imports
SimoneRadtke-Cap Mar 1, 2024
f2fac6d
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 1, 2024
9f4fe2d
EW-539 Working on review comments and moving test factories and asset…
SimoneRadtke-Cap Mar 1, 2024
964f917
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 1, 2024
5ead468
EW-539 Working on review comments. Deleting setting for xml files.
SimoneRadtke-Cap Mar 6, 2024
ea36e02
EW-539 Working on review comments. Delete bind, rewrite code and adju…
SimoneRadtke-Cap Mar 6, 2024
6d70b50
EW-539 Working on review comments. Deleting never keyword
SimoneRadtke-Cap Mar 6, 2024
7dfc4fd
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 6, 2024
0761565
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 6, 2024
f47e3f2
EW-539 Working on review comments and adjust imports
SimoneRadtke-Cap Mar 7, 2024
ebb6f44
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 7, 2024
ce7e1dd
EW-539 Fix circular dependency
SimoneRadtke-Cap Mar 7, 2024
20195b4
EW-539 Fix tasks without topic
SimoneRadtke-Cap Mar 8, 2024
f0122d1
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 8, 2024
340c03a
EW-539 Fix task without topic
SimoneRadtke-Cap Mar 8, 2024
ac084b3
EW-539 Working on review comments. Add barrel files and adjust imports.
SimoneRadtke-Cap Mar 8, 2024
1a894a6
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 11, 2024
f63921c
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 12, 2024
73216e2
EW-539 Add feature flag for cc import to config response
SimoneRadtke-Cap Mar 12, 2024
1042db6
EW-539 Add feature flag for CC import to the server api test
SimoneRadtke-Cap Mar 12, 2024
d9b8b1f
EW-539 Fix circular dependency after merging main
SimoneRadtke-Cap Mar 12, 2024
ced32b8
Merge branch 'main' into EW-539
SimoneRadtke-Cap Mar 12, 2024
9b54111
EW-539 Fix linter
SimoneRadtke-Cap Mar 13, 2024
f8fc169
EW-539 Fix task bug
SimoneRadtke-Cap Mar 14, 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import {
CommonCartridgeElementFactory,
CommonCartridgeElementProps,
} from '../elements/common-cartridge-element-factory';
import { CommonCartridgeElement } from '../interfaces/common-cartridge-element.interface';
import { CommonCartridgeResource } from '../interfaces/common-cartridge-resource.interface';
import { CommonCartridgeElement, CommonCartridgeResource } from '../interfaces';
import { CommonCartridgeResourceFactory } from '../resources/common-cartridge-resource-factory';
import { OmitVersion } from '../utils';
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { faker } from '@faker-js/faker/locale/af_ZA';
import { createCommonCartridgeWebContentResourcePropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
import { createCommonCartridgeWebContentResourcePropsV110 } from '../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeVersion } from '../common-cartridge.enums';
import { CommonCartridgeElement } from '../interfaces/common-cartridge-element.interface';
import { CommonCartridgeResource } from '../interfaces/common-cartridge-resource.interface';
import { CommonCartridgeElement, CommonCartridgeResource } from '../interfaces';
import {
CommonCartridgeOrganizationBuilder,
CommonCartridgeOrganizationBuilderOptions,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ export class CommonCartridgeOrganizationBuilder {
return organizationElement;
}

private buildItems(): CommonCartridgeResource | (CommonCartridgeElement | CommonCartridgeResource)[] {
private buildItems(): (CommonCartridgeElement | CommonCartridgeResource)[] {
if (this.resources.length === 1 && this.subOrganizations.length === 0) {
const [resource] = this.resources;

return resource;
return [...this.resources];
}

const items = [...this.resources, ...this.subOrganizations.map((subOrganization) => subOrganization.build())];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ import { InternalServerErrorException } from '@nestjs/common';
import {
createCommonCartridgeMetadataElementPropsV110,
createCommonCartridgeMetadataElementPropsV130,
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
} from '../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../common-cartridge.enums';
import { CommonCartridgeElementFactory } from './common-cartridge-element-factory';
import {
CommonCartridgeMetadataElementPropsV110,
CommonCartridgeMetadataElementV110,
} from './v1.1.0/common-cartridge-metadata-element';
import { CommonCartridgeMetadataElementV130 } from './v1.3.0/common-cartridge-metadata-element';
import { CommonCartridgeMetadataElementPropsV110, CommonCartridgeMetadataElementV110 } from './v1.1.0';
import { CommonCartridgeMetadataElementV130 } from './v1.3.0';

describe('CommonCartridgeElementFactory', () => {
describe('createElement', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import { CommonCartridgeVersion } from '../common-cartridge.enums';
import { CommonCartridgeElement } from '../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../interfaces';
import { OmitVersionAndFolder, createVersionNotSupportedError } from '../utils';
import { CommonCartridgeElementFactoryV110 } from './v1.1.0/common-cartridge-element-factory';
import { CommonCartridgeMetadataElementPropsV110 } from './v1.1.0/common-cartridge-metadata-element';
import { CommonCartridgeOrganizationElementPropsV110 } from './v1.1.0/common-cartridge-organization-element';
import { CommonCartridgeOrganizationsWrapperElementPropsV110 } from './v1.1.0/common-cartridge-organizations-wrapper-element';
import { CommonCartridgeResourcesWrapperElementPropsV110 } from './v1.1.0/common-cartridge-resources-wrapper-element';
import { CommonCartridgeElementFactoryV130 } from './v1.3.0/common-cartridge-element-factory';
import { CommonCartridgeMetadataElementPropsV130 } from './v1.3.0/common-cartridge-metadata-element';
import { CommonCartridgeOrganizationElementPropsV130 } from './v1.3.0/common-cartridge-organization-element';
import { CommonCartridgeOrganizationsWrapperElementPropsV130 } from './v1.3.0/common-cartridge-organizations-wrapper-element';
import { CommonCartridgeResourcesWrapperElementPropsV130 } from './v1.3.0/common-cartridge-resources-wrapper-element';
import {
CommonCartridgeElementFactoryV110,
CommonCartridgeMetadataElementPropsV110,
CommonCartridgeOrganizationElementPropsV110,
CommonCartridgeOrganizationsWrapperElementPropsV110,
CommonCartridgeResourcesWrapperElementPropsV110,
} from './v1.1.0';
import {
CommonCartridgeElementFactoryV130,
CommonCartridgeMetadataElementPropsV130,
CommonCartridgeOrganizationElementPropsV130,
CommonCartridgeOrganizationsWrapperElementPropsV130,
CommonCartridgeResourcesWrapperElementPropsV130,
} from './v1.3.0';

export type CommonCartridgeElementProps =
| OmitVersionAndFolder<CommonCartridgeMetadataElementPropsV110>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
createCommonCartridgeOrganizationElementPropsV110,
createCommonCartridgeOrganizationsWrapperElementPropsV110,
createCommonCartridgeResourcesWrapperElementPropsV110,
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
} from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeElementType } from '../../common-cartridge.enums';
import { CommonCartridgeElementFactoryV110 } from './common-cartridge-element-factory';
import { CommonCartridgeMetadataElementV110 } from './common-cartridge-metadata-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';
import { createElementTypeNotSupportedError } from '../../utils';
import {
CommonCartridgeMetadataElementPropsV110,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeMetadataElementPropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeMetadataElementPropsV110 } from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeMetadataElementV110 } from './common-cartridge-metadata-element';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeMetadataElementPropsV110 = {
type: CommonCartridgeElementType.METADATA;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeOrganizationElementPropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
import { createCommonCartridgeOrganizationElementPropsV110 } from '../../../testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV110 } from '../../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeResourceFactory } from '../../resources/common-cartridge-resource-factory';
import { CommonCartridgeElementFactory } from '../common-cartridge-element-factory';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeResource } from '../../interfaces/common-cartridge-resource.interface';
import { CommonCartridgeElement, CommonCartridgeResource } from '../../interfaces';
import { createIdentifier } from '../../utils';

export type CommonCartridgeOrganizationElementPropsV110 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { InternalServerErrorException } from '@nestjs/common';
import {
createCommonCartridgeOrganizationElementPropsV110,
createCommonCartridgeOrganizationsWrapperElementPropsV110,
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
} from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElementFactory } from '../common-cartridge-element-factory';
import { CommonCartridgeOrganizationsWrapperElementV110 } from './common-cartridge-organizations-wrapper-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeOrganizationsWrapperElementPropsV110 = {
type: CommonCartridgeElementType.ORGANIZATIONS_WRAPPER;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeResourcesWrapperElementPropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV110 } from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
import { createCommonCartridgeResourcesWrapperElementPropsV110 } from '../../../testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV110 } from '../../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeResourceFactory } from '../../resources/common-cartridge-resource-factory';
import { CommonCartridgeResourcesWrapperElementV110 } from './common-cartridge-resources-wrapper-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeResourcesWrapperElementPropsV110 = {
type: CommonCartridgeElementType.RESOURCES_WRAPPER;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export { CommonCartridgeElementFactoryV110 } from './common-cartridge-element-factory';
export {
CommonCartridgeMetadataElementPropsV110,
CommonCartridgeMetadataElementV110,
} from './common-cartridge-metadata-element';
export { CommonCartridgeOrganizationElementPropsV110 } from './common-cartridge-organization-element';
export { CommonCartridgeOrganizationsWrapperElementPropsV110 } from './common-cartridge-organizations-wrapper-element';
export { CommonCartridgeResourcesWrapperElementPropsV110 } from './common-cartridge-resources-wrapper-element';
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
createCommonCartridgeOrganizationElementPropsV130,
createCommonCartridgeOrganizationsWrapperElementPropsV130,
createCommonCartridgeResourcesWrapperElementPropsV130,
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
} from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeElementType } from '../../common-cartridge.enums';
import { CommonCartridgeElementFactoryV130 } from './common-cartridge-element-factory';
import { CommonCartridgeMetadataElementV130 } from './common-cartridge-metadata-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';
import { createElementTypeNotSupportedError } from '../../utils';
import {
CommonCartridgeMetadataElementPropsV130,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeMetadataElementPropsV130 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeMetadataElementPropsV130 } from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeMetadataElementV130 } from './common-cartridge-metadata-element';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeMetadataElementPropsV130 = {
type: CommonCartridgeElementType.METADATA;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeOrganizationElementPropsV130 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV130 } from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
import { createCommonCartridgeOrganizationElementPropsV130 } from '../../../testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV130 } from '../../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeResourceFactory } from '../../resources/common-cartridge-resource-factory';
import { CommonCartridgeElementFactory } from '../common-cartridge-element-factory';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeResource } from '../../interfaces/common-cartridge-resource.interface';
import { CommonCartridgeElement, CommonCartridgeResource } from '../../interfaces';
import { createIdentifier } from '../../utils';

export type CommonCartridgeOrganizationElementPropsV130 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { InternalServerErrorException } from '@nestjs/common';
import {
createCommonCartridgeOrganizationElementPropsV130,
createCommonCartridgeOrganizationsWrapperElementPropsV130,
} from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
} from '../../../testing/common-cartridge-element-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElementFactory } from '../common-cartridge-element-factory';
import { CommonCartridgeOrganizationsWrapperElementV130 } from './common-cartridge-organizations-wrapper-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeOrganizationsWrapperElementPropsV130 = {
type: CommonCartridgeElementType.ORGANIZATIONS_WRAPPER;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { InternalServerErrorException } from '@nestjs/common';
import { createCommonCartridgeResourcesWrapperElementPropsV130 } from '@src/modules/common-cartridge/testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV130 } from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
import { createCommonCartridgeResourcesWrapperElementPropsV130 } from '../../../testing/common-cartridge-element-props.factory';
import { createCommonCartridgeWeblinkResourcePropsV130 } from '../../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeResourceFactory } from '../../resources/common-cartridge-resource-factory';
import { CommonCartridgeResourcesWrapperElementV130 } from './common-cartridge-resources-wrapper-element';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CommonCartridgeElementType, CommonCartridgeVersion } from '../../common-cartridge.enums';
import { CommonCartridgeElement } from '../../interfaces/common-cartridge-element.interface';
import { CommonCartridgeElement } from '../../interfaces';

export type CommonCartridgeResourcesWrapperElementPropsV130 = {
type: CommonCartridgeElementType.RESOURCES_WRAPPER;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export { CommonCartridgeElementFactoryV130 } from './common-cartridge-element-factory';
export {
CommonCartridgeMetadataElementPropsV130,
CommonCartridgeMetadataElementV130,
} from './common-cartridge-metadata-element';
export { CommonCartridgeOrganizationElementPropsV130 } from './common-cartridge-organization-element';
export {
CommonCartridgeOrganizationsWrapperElementPropsV130,
CommonCartridgeOrganizationsWrapperElementV130,
} from './common-cartridge-organizations-wrapper-element';
export {
CommonCartridgeResourcesWrapperElementPropsV130,
CommonCartridgeResourcesWrapperElementV130,
} from './common-cartridge-resources-wrapper-element';
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { CommonCartridgeElement } from './common-cartridge-element.interface';
export { CommonCartridgeResource } from './common-cartridge-resource.interface';
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ import { InternalServerErrorException } from '@nestjs/common';
import {
createCommonCartridgeWebContentResourcePropsV110,
createCommonCartridgeWebContentResourcePropsV130,
} from '@src/modules/common-cartridge/testing/common-cartridge-resource-props.factory';
} from '../../testing/common-cartridge-resource-props.factory';
import { CommonCartridgeResourceType, CommonCartridgeVersion } from '../common-cartridge.enums';
import { CommonCartridgeResourceFactory } from './common-cartridge-resource-factory';
import {
CommonCartridgeWebContentResourcePropsV110,
CommonCartridgeWebContentResourceV110,
} from './v1.1.0/common-cartridge-web-content-resource';
import { CommonCartridgeWebContentResourceV130 } from './v1.3.0/common-cartridge-web-content-resource';
import { CommonCartridgeWebContentResourcePropsV110, CommonCartridgeWebContentResourceV110 } from './v1.1.0';
import { CommonCartridgeWebContentResourceV130 } from './v1.3.0';

describe('CommonCartridgeResourceVersion', () => {
describe('createResource', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { CommonCartridgeVersion } from '../common-cartridge.enums';
import { CommonCartridgeResource } from '../interfaces/common-cartridge-resource.interface';
import { CommonCartridgeResource } from '../interfaces';
import { OmitVersionAndFolder, createVersionNotSupportedError } from '../utils';
import { CommonCartridgeManifestResourcePropsV110 } from './v1.1.0/common-cartridge-manifest-resource';
import { CommonCartridgeResourceFactoryV110 } from './v1.1.0/common-cartridge-resource-factory';
import { CommonCartridgeWebContentResourcePropsV110 } from './v1.1.0/common-cartridge-web-content-resource';
import { CommonCartridgeWebLinkResourcePropsV110 } from './v1.1.0/common-cartridge-web-link-resource';
import { CommonCartridgeManifestResourcePropsV130 } from './v1.3.0/common-cartridge-manifest-resource';
import { CommonCartridgeResourceFactoryV130 } from './v1.3.0/common-cartridge-resource-factory';
import { CommonCartridgeWebContentResourcePropsV130 } from './v1.3.0/common-cartridge-web-content-resource';
import { CommonCartridgeWebLinkResourcePropsV130 } from './v1.3.0/common-cartridge-web-link-resource';
import {
CommonCartridgeManifestResourcePropsV110,
CommonCartridgeResourceFactoryV110,
CommonCartridgeWebContentResourcePropsV110,
CommonCartridgeWebLinkResourcePropsV110,
} from './v1.1.0';
import {
CommonCartridgeManifestResourcePropsV130,
CommonCartridgeResourceFactoryV130,
CommonCartridgeWebContentResourcePropsV130,
CommonCartridgeWebLinkResourcePropsV130,
} from './v1.3.0';

export type CommonCartridgeResourceProps =
| OmitVersionAndFolder<CommonCartridgeWebContentResourcePropsV110>
Expand Down
Loading
Loading