Skip to content

Commit 023ec5e

Browse files
Lan2uLan2u
committed
Remove legacy equipment get-all that doesn't use shared state
1 parent 85870cd commit 023ec5e

File tree

3 files changed

+133
-173
lines changed

3 files changed

+133
-173
lines changed

‎src/read-models/equipment/get-all.ts‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/read-models/equipment/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import {get} from './get';
2-
import {getAll} from './get-all';
32
import {getForArea} from './get-for-area';
43
import {getTrainingQuizResults} from './get-training-quiz-results';
54
import {getTrainingSheetId} from './get-training-sheet-id';
65

76
export const equipment = {
87
get,
9-
getAll,
108
getForArea,
119
getTrainingSheetId,
1210
getTrainingQuizResults,

‎tests/read-models/equipment/get-all.test.ts‎

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,143 @@
1-
import {faker} from '@faker-js/faker';
2-
import * as O from 'fp-ts/Option';
3-
import {DomainEvent} from '../../../src/types';
4-
import {TestFramework, initTestFramework} from '../test-framework';
5-
import {NonEmptyString, UUID} from 'io-ts-types';
6-
import {getAll} from '../../../src/read-models/equipment/get-all';
1+
// import {faker} from '@faker-js/faker';
2+
// import * as O from 'fp-ts/Option';
3+
// import {DomainEvent} from '../../../src/types';
4+
// import {TestFramework, initTestFramework} from '../test-framework';
5+
// import {NonEmptyString, UUID} from 'io-ts-types';
6+
// import {getAll} from '../../../src/read-models/equipment/get-all';
77

8-
describe('get-all', () => {
9-
let events: ReadonlyArray<DomainEvent>;
10-
let framework: TestFramework;
11-
beforeEach(async () => {
12-
framework = await initTestFramework();
13-
});
14-
afterEach(() => {
15-
framework.eventStoreDb.close();
16-
});
8+
// describe('get-all', () => {
9+
// let events: ReadonlyArray<DomainEvent>;
10+
// let framework: TestFramework;
11+
// beforeEach(async () => {
12+
// framework = await initTestFramework();
13+
// });
14+
// afterEach(() => {
15+
// framework.eventStoreDb.close();
16+
// });
1717

18-
const createArea = {
19-
id: faker.string.uuid() as UUID,
20-
name: faker.company.buzzNoun() as NonEmptyString,
21-
description: faker.company.buzzPhrase(),
22-
};
23-
const addEquipment = {
24-
id: faker.string.uuid() as UUID,
25-
name: faker.company.buzzNoun() as NonEmptyString,
26-
areaId: createArea.id,
27-
};
28-
describe('when equipment is added to existing area', () => {
29-
const createArea = {
30-
id: faker.string.uuid() as UUID,
31-
name: faker.company.buzzNoun() as NonEmptyString,
32-
};
33-
const addEquipment = {
34-
id: faker.string.uuid() as UUID,
35-
name: faker.company.buzzNoun() as NonEmptyString,
36-
areaId: createArea.id,
37-
};
38-
beforeEach(async () => {
39-
await framework.commands.area.create(createArea);
40-
await framework.commands.equipment.add(addEquipment);
41-
events = await framework.getAllEvents();
42-
});
18+
// const createArea = {
19+
// id: faker.string.uuid() as UUID,
20+
// name: faker.company.buzzNoun() as NonEmptyString,
21+
// description: faker.company.buzzPhrase(),
22+
// };
23+
// const addEquipment = {
24+
// id: faker.string.uuid() as UUID,
25+
// name: faker.company.buzzNoun() as NonEmptyString,
26+
// areaId: createArea.id,
27+
// };
28+
// describe('when equipment is added to existing area', () => {
29+
// const createArea = {
30+
// id: faker.string.uuid() as UUID,
31+
// name: faker.company.buzzNoun() as NonEmptyString,
32+
// };
33+
// const addEquipment = {
34+
// id: faker.string.uuid() as UUID,
35+
// name: faker.company.buzzNoun() as NonEmptyString,
36+
// areaId: createArea.id,
37+
// };
38+
// beforeEach(async () => {
39+
// await framework.commands.area.create(createArea);
40+
// await framework.commands.equipment.add(addEquipment);
41+
// events = await framework.getAllEvents();
42+
// });
4343

44-
it('returns the equipment with the area name', () => {
45-
const allEquipment = getAll(events);
46-
expect(allEquipment[0].id).toStrictEqual(addEquipment.id);
47-
expect(allEquipment[0].areaName).toStrictEqual(createArea.name);
48-
});
49-
});
44+
// it('returns the equipment with the area name', () => {
45+
// const allEquipment = getAll(events);
46+
// expect(allEquipment[0].id).toStrictEqual(addEquipment.id);
47+
// expect(allEquipment[0].areaName).toStrictEqual(createArea.name);
48+
// });
49+
// });
5050

51-
describe('when equipment is added to non-existant area', () => {
52-
const addEquipment = {
53-
id: faker.string.uuid() as UUID,
54-
name: faker.company.buzzNoun() as NonEmptyString,
55-
areaId: faker.string.uuid() as UUID,
56-
};
57-
beforeEach(async () => {
58-
await framework.commands.equipment.add(addEquipment);
59-
events = await framework.getAllEvents();
60-
});
51+
// describe('when equipment is added to non-existant area', () => {
52+
// const addEquipment = {
53+
// id: faker.string.uuid() as UUID,
54+
// name: faker.company.buzzNoun() as NonEmptyString,
55+
// areaId: faker.string.uuid() as UUID,
56+
// };
57+
// beforeEach(async () => {
58+
// await framework.commands.equipment.add(addEquipment);
59+
// events = await framework.getAllEvents();
60+
// });
6161

62-
it('omits the equipment', () => {
63-
const allEquipment = getAll(events);
64-
expect(allEquipment).toHaveLength(0);
65-
});
66-
});
62+
// it('omits the equipment', () => {
63+
// const allEquipment = getAll(events);
64+
// expect(allEquipment).toHaveLength(0);
65+
// });
66+
// });
6767

68-
describe('when equipment has no training sheet registered', () => {
69-
beforeEach(async () => {
70-
await framework.commands.area.create(createArea);
71-
await framework.commands.equipment.add(addEquipment);
72-
events = await framework.getAllEvents();
73-
});
74-
it('returns no training sheet', () => {
75-
const allEquipment = getAll(events);
76-
expect(allEquipment[0].trainingSheetId).toStrictEqual(O.none);
77-
});
78-
});
68+
// describe('when equipment has no training sheet registered', () => {
69+
// beforeEach(async () => {
70+
// await framework.commands.area.create(createArea);
71+
// await framework.commands.equipment.add(addEquipment);
72+
// events = await framework.getAllEvents();
73+
// });
74+
// it('returns no training sheet', () => {
75+
// const allEquipment = getAll(events);
76+
// expect(allEquipment[0].trainingSheetId).toStrictEqual(O.none);
77+
// });
78+
// });
7979

80-
describe('when equipment has a training sheet registered', () => {
81-
const registerSheet = {
82-
equipmentId: addEquipment.id,
83-
trainingSheetId: faker.string.alpha(8),
84-
};
85-
beforeEach(async () => {
86-
await framework.commands.area.create(createArea);
87-
await framework.commands.equipment.add(addEquipment);
88-
await framework.commands.equipment.trainingSheet(registerSheet);
89-
events = await framework.getAllEvents();
90-
});
80+
// describe('when equipment has a training sheet registered', () => {
81+
// const registerSheet = {
82+
// equipmentId: addEquipment.id,
83+
// trainingSheetId: faker.string.alpha(8),
84+
// };
85+
// beforeEach(async () => {
86+
// await framework.commands.area.create(createArea);
87+
// await framework.commands.equipment.add(addEquipment);
88+
// await framework.commands.equipment.trainingSheet(registerSheet);
89+
// events = await framework.getAllEvents();
90+
// });
9191

92-
it('returns the sheet id', () => {
93-
const allEquipment = getAll(events);
94-
expect(allEquipment[0].trainingSheetId).toStrictEqual(
95-
O.some(registerSheet.trainingSheetId)
96-
);
97-
});
98-
describe('then the training sheet is revoked', () => {
99-
const removeTrainingSheet = {
100-
equipmentId: registerSheet.equipmentId,
101-
};
102-
beforeEach(async () => {
103-
await framework.commands.equipment.removeTrainingSheet(
104-
removeTrainingSheet
105-
);
106-
});
107-
it('no longer returns a sheet id', () => {
108-
const allEquipment = getAll(events);
109-
expect(allEquipment[0].trainingSheetId).toStrictEqual(O.none);
110-
});
111-
});
112-
});
92+
// it('returns the sheet id', () => {
93+
// const allEquipment = getAll(events);
94+
// expect(allEquipment[0].trainingSheetId).toStrictEqual(
95+
// O.some(registerSheet.trainingSheetId)
96+
// );
97+
// });
98+
// describe('then the training sheet is revoked', () => {
99+
// const removeTrainingSheet = {
100+
// equipmentId: registerSheet.equipmentId,
101+
// };
102+
// beforeEach(async () => {
103+
// await framework.commands.equipment.removeTrainingSheet(
104+
// removeTrainingSheet
105+
// );
106+
// });
107+
// it('no longer returns a sheet id', () => {
108+
// const allEquipment = getAll(events);
109+
// expect(allEquipment[0].trainingSheetId).toStrictEqual(O.none);
110+
// });
111+
// });
112+
// });
113113

114-
describe('when equipment has had multiple sheets registered', () => {
115-
const registerSheet = {
116-
equipmentId: addEquipment.id,
117-
trainingSheetId: faker.string.alpha(8),
118-
};
119-
const registerSheet2 = {
120-
...registerSheet,
121-
trainingSheetId: faker.string.alpha(8),
122-
};
123-
expect(registerSheet.trainingSheetId).not.toEqual(
124-
registerSheet2.trainingSheetId
125-
);
126-
beforeEach(async () => {
127-
await framework.commands.area.create(createArea);
128-
await framework.commands.equipment.add(addEquipment);
129-
await framework.commands.equipment.trainingSheet(registerSheet);
130-
await framework.commands.equipment.trainingSheet(registerSheet2);
131-
events = await framework.getAllEvents();
132-
});
114+
// describe('when equipment has had multiple sheets registered', () => {
115+
// const registerSheet = {
116+
// equipmentId: addEquipment.id,
117+
// trainingSheetId: faker.string.alpha(8),
118+
// };
119+
// const registerSheet2 = {
120+
// ...registerSheet,
121+
// trainingSheetId: faker.string.alpha(8),
122+
// };
123+
// expect(registerSheet.trainingSheetId).not.toEqual(
124+
// registerSheet2.trainingSheetId
125+
// );
126+
// beforeEach(async () => {
127+
// await framework.commands.area.create(createArea);
128+
// await framework.commands.equipment.add(addEquipment);
129+
// await framework.commands.equipment.trainingSheet(registerSheet);
130+
// await framework.commands.equipment.trainingSheet(registerSheet2);
131+
// events = await framework.getAllEvents();
132+
// });
133133

134-
it('returns the latest sheet id', () => {
135-
// For the purposes of the system currently we take 'latest' to mean last sorted within the events
136-
// which should be latest chronologically.
137-
const allEquipment = getAll(events);
138-
expect(allEquipment[0].trainingSheetId).toStrictEqual(
139-
O.some(registerSheet2.trainingSheetId)
140-
);
141-
});
142-
});
143-
});
134+
// it('returns the latest sheet id', () => {
135+
// // For the purposes of the system currently we take 'latest' to mean last sorted within the events
136+
// // which should be latest chronologically.
137+
// const allEquipment = getAll(events);
138+
// expect(allEquipment[0].trainingSheetId).toStrictEqual(
139+
// O.some(registerSheet2.trainingSheetId)
140+
// );
141+
// });
142+
// });
143+
// });

0 commit comments

Comments
 (0)