arocapi 2.1.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. package/README.md +70 -26
  2. package/dist/app.d.ts +3 -9
  3. package/dist/app.js +20 -34
  4. package/dist/app.js.map +1 -1
  5. package/dist/app.test.js +5 -40
  6. package/dist/app.test.js.map +1 -1
  7. package/dist/index.dev.d.ts +1 -8
  8. package/dist/index.dev.js +12 -2
  9. package/dist/index.dev.js.map +1 -1
  10. package/dist/routes/crate.d.ts +2 -0
  11. package/dist/routes/crate.js +8 -27
  12. package/dist/routes/crate.js.map +1 -1
  13. package/dist/routes/crate.test.js +21 -23
  14. package/dist/routes/crate.test.js.map +1 -1
  15. package/dist/routes/entities.d.ts +2 -0
  16. package/dist/routes/entities.js +16 -20
  17. package/dist/routes/entities.js.map +1 -1
  18. package/dist/routes/entities.test.js +20 -19
  19. package/dist/routes/entities.test.js.map +1 -1
  20. package/dist/routes/entity.d.ts +2 -0
  21. package/dist/routes/entity.js +7 -14
  22. package/dist/routes/entity.js.map +1 -1
  23. package/dist/routes/entity.test.js +13 -17
  24. package/dist/routes/entity.test.js.map +1 -1
  25. package/dist/routes/file.d.ts +2 -0
  26. package/dist/routes/file.js +8 -27
  27. package/dist/routes/file.js.map +1 -1
  28. package/dist/routes/file.test.js +19 -23
  29. package/dist/routes/file.test.js.map +1 -1
  30. package/dist/routes/files.d.ts +2 -0
  31. package/dist/routes/files.js +15 -20
  32. package/dist/routes/files.js.map +1 -1
  33. package/dist/routes/files.test.js +13 -35
  34. package/dist/routes/files.test.js.map +1 -1
  35. package/dist/routes/search.d.ts +4 -0
  36. package/dist/routes/search.js +21 -24
  37. package/dist/routes/search.js.map +1 -1
  38. package/dist/routes/search.test.js +56 -24
  39. package/dist/routes/search.test.js.map +1 -1
  40. package/dist/test/helpers/fastify.js +0 -6
  41. package/dist/test/helpers/fastify.js.map +1 -1
  42. package/dist/test/integration.setup.d.ts +2 -4
  43. package/dist/test/integration.setup.js +41 -21
  44. package/dist/test/integration.setup.js.map +1 -1
  45. package/dist/test/integration.test.js +59 -0
  46. package/dist/test/integration.test.js.map +1 -1
  47. package/dist/transformers/default.d.ts +11 -18
  48. package/dist/transformers/default.js +5 -18
  49. package/dist/transformers/default.js.map +1 -1
  50. package/dist/transformers/default.test.js +6 -15
  51. package/dist/transformers/default.test.js.map +1 -1
  52. package/dist/transformers/transformer.test.js +2 -6
  53. package/dist/transformers/transformer.test.js.map +1 -1
  54. package/dist/utils/errors.d.ts +7 -1
  55. package/dist/utils/errors.js +2 -1
  56. package/dist/utils/errors.js.map +1 -1
  57. package/dist/utils/headers.d.ts +7 -0
  58. package/dist/utils/headers.js +11 -0
  59. package/dist/utils/headers.js.map +1 -0
  60. package/dist/utils/queryBuilder.d.ts +2 -2
  61. package/dist/utils/queryBuilder.js +2 -3
  62. package/dist/utils/queryBuilder.js.map +1 -1
  63. package/package.json +24 -24
  64. package/prisma/models/entity.prisma +17 -13
  65. package/prisma/models/file.prisma +9 -13
  66. package/prisma.config.ts +0 -2
  67. package/src/app.test.ts +5 -44
  68. package/src/app.ts +25 -47
  69. package/src/index.dev.ts +13 -9
  70. package/src/routes/__snapshots__/search.test.ts.snap +2 -2
  71. package/src/routes/crate.test.ts +21 -23
  72. package/src/routes/crate.ts +11 -33
  73. package/src/routes/entities.test.ts +23 -19
  74. package/src/routes/entities.ts +19 -23
  75. package/src/routes/entity.test.ts +15 -17
  76. package/src/routes/entity.ts +9 -14
  77. package/src/routes/file.test.ts +19 -23
  78. package/src/routes/file.ts +11 -33
  79. package/src/routes/files.test.ts +14 -39
  80. package/src/routes/files.ts +18 -23
  81. package/src/routes/search.test.ts +65 -26
  82. package/src/routes/search.ts +30 -23
  83. package/src/test/helpers/fastify.ts +0 -12
  84. package/src/test/integration.setup.ts +44 -21
  85. package/src/test/integration.test.ts +72 -1
  86. package/src/transformers/default.test.ts +10 -20
  87. package/src/transformers/default.ts +14 -27
  88. package/src/transformers/transformer.test.ts +4 -6
  89. package/src/utils/errors.ts +10 -6
  90. package/src/utils/headers.ts +16 -0
  91. package/src/utils/queryBuilder.ts +3 -5
  92. package/prisma/migrations/20250515034400_entities/migration.sql +0 -14
  93. package/prisma/migrations/20250515050009_extend_entity_fields/migration.sql +0 -7
  94. package/prisma/migrations/20250804225438_add_record_type/migration.sql +0 -8
  95. package/prisma/migrations/20250805040110_add_rocrate_field/migration.sql +0 -2
  96. package/prisma/migrations/20250827033956_record_type_scalar/migration.sql +0 -10
  97. package/prisma/migrations/20250923032753_api_refactor/migration.sql +0 -39
  98. package/prisma/migrations/20250923223119_entity_type_to_string/migration.sql +0 -8
  99. package/prisma/migrations/20251020140329_add_meta_column/migration.sql +0 -2
  100. package/prisma/migrations/20251027010713_add_file_table/migration.sql +0 -17
  101. package/prisma/migrations/20251027221138_add_file_id_to_entity/migration.sql +0 -2
  102. package/prisma/migrations/20251211025510_remove_rocrate_column/migration.sql +0 -8
  103. package/prisma/migrations/migration_lock.toml +0 -3
  104. package/prisma/schema.prisma +0 -17
  105. package/src/__snapshots__/app.test.ts.snap +0 -8
@@ -5,33 +5,25 @@ import filesRoute from './files.js';
5
5
  describe('Files Route', () => {
6
6
  beforeEach(async () => {
7
7
  await fastifyBefore();
8
- await fastify.register(filesRoute, { fileAccessTransformer: AllPublicFileAccessTransformer });
8
+ await fastify.register(filesRoute, { prisma, fileAccessTransformer: AllPublicFileAccessTransformer });
9
9
  });
10
10
  afterEach(async () => {
11
11
  await fastifyAfter();
12
12
  });
13
13
  const mockFile1 = {
14
- id: 1,
15
- fileId: 'http://example.com/file1.wav',
14
+ id: 'http://example.com/file1.wav',
16
15
  filename: 'file1.wav',
17
16
  mediaType: 'audio/wav',
18
17
  size: BigInt(1024),
19
- memberOf: 'http://example.com/collection/1',
20
- rootCollection: 'http://example.com/collection/1',
21
- contentLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
22
18
  meta: {},
23
19
  createdAt: new Date('2025-01-01'),
24
20
  updatedAt: new Date('2025-01-01'),
25
21
  };
26
22
  const mockFile2 = {
27
- id: 2,
28
- fileId: 'http://example.com/file2.txt',
23
+ id: 'http://example.com/file2.txt',
29
24
  filename: 'file2.txt',
30
25
  mediaType: 'text/plain',
31
26
  size: BigInt(512),
32
- memberOf: 'http://example.com/collection/1',
33
- rootCollection: 'http://example.com/collection/1',
34
- contentLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
35
27
  meta: {},
36
28
  createdAt: new Date('2025-01-02'),
37
29
  updatedAt: new Date('2025-01-02'),
@@ -53,14 +45,10 @@ describe('Files Route', () => {
53
45
  filename: 'file1.wav',
54
46
  mediaType: 'audio/wav',
55
47
  size: 1024,
56
- memberOf: 'http://example.com/collection/1',
57
- rootCollection: 'http://example.com/collection/1',
58
- contentLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
59
48
  access: {
60
49
  content: true,
61
50
  },
62
51
  });
63
- expect(body.files[0]).not.toHaveProperty('metadataLicenseId');
64
52
  });
65
53
  it('should filter files by memberOf', async () => {
66
54
  prisma.file.findMany.mockResolvedValue([mockFile1]);
@@ -72,8 +60,13 @@ describe('Files Route', () => {
72
60
  expect(response.statusCode).toBe(200);
73
61
  const body = JSON.parse(response.body);
74
62
  expect(body.total).toBe(1);
63
+ expect(body.files).toHaveLength(1);
64
+ expect(body.files[0]).toMatchObject({
65
+ id: 'http://example.com/file1.wav',
66
+ filename: 'file1.wav',
67
+ });
75
68
  expect(prisma.file.findMany).toHaveBeenCalledWith(expect.objectContaining({
76
- where: { memberOf: 'http://example.com/collection/1' },
69
+ where: { entity: { memberOf: 'http://example.com/collection/1' } },
77
70
  }));
78
71
  });
79
72
  it('should support pagination with limit and offset', async () => {
@@ -104,7 +97,7 @@ describe('Files Route', () => {
104
97
  orderBy: { filename: 'asc' },
105
98
  }));
106
99
  });
107
- it('should support sorting by id (maps to fileId)', async () => {
100
+ it('should support sorting by id directly', async () => {
108
101
  prisma.file.findMany.mockResolvedValue([mockFile1, mockFile2]);
109
102
  prisma.file.count.mockResolvedValue(2);
110
103
  const response = await fastify.inject({
@@ -113,7 +106,7 @@ describe('Files Route', () => {
113
106
  });
114
107
  expect(response.statusCode).toBe(200);
115
108
  expect(prisma.file.findMany).toHaveBeenCalledWith(expect.objectContaining({
116
- orderBy: { fileId: 'desc' },
109
+ orderBy: { id: 'desc' },
117
110
  }));
118
111
  });
119
112
  it('should return empty list when no files found', async () => {
@@ -128,23 +121,6 @@ describe('Files Route', () => {
128
121
  expect(body.total).toBe(0);
129
122
  expect(body.files).toHaveLength(0);
130
123
  });
131
- it('should not include metadataLicenseId in response', async () => {
132
- prisma.file.findMany.mockResolvedValue([mockFile1]);
133
- prisma.file.count.mockResolvedValue(1);
134
- const response = await fastify.inject({
135
- method: 'GET',
136
- url: '/files',
137
- });
138
- expect(response.statusCode).toBe(200);
139
- const body = JSON.parse(response.body);
140
- expect(body.files[0]).toMatchObject({
141
- id: 'http://example.com/file1.wav',
142
- filename: 'file1.wav',
143
- memberOf: 'http://example.com/collection/1',
144
- contentLicenseId: 'https://creativecommons.org/licenses/by/4.0/',
145
- });
146
- expect(body.files[0]).not.toHaveProperty('metadataLicenseId');
147
- });
148
124
  it('should return 500 when database error occurs', async () => {
149
125
  prisma.file.findMany.mockRejectedValue(new Error('Database connection failed'));
150
126
  const response = await fastify.inject({
@@ -192,6 +168,7 @@ describe('Files Route', () => {
192
168
  uppercaseFilename: file.filename.toUpperCase(),
193
169
  });
194
170
  await fastify.register(filesRoute, {
171
+ prisma,
195
172
  fileAccessTransformer: AllPublicFileAccessTransformer,
196
173
  fileTransformers: [customTransformer],
197
174
  });
@@ -221,6 +198,7 @@ describe('Files Route', () => {
221
198
  },
222
199
  });
223
200
  await fastify.register(filesRoute, {
201
+ prisma,
224
202
  fileAccessTransformer: customFileAccessTransformer,
225
203
  });
226
204
  prisma.file.findMany.mockResolvedValue([mockFile1]);
@@ -1 +1 @@
1
- {"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/routes/files.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/routes/files.test.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,11 @@
1
+ import type { Client } from '@opensearch-project/opensearch';
1
2
  import type { FastifyPluginAsync } from 'fastify';
3
+ import type { PrismaClient } from '../generated/prisma/client.js';
2
4
  import type { AccessTransformer, EntityTransformer } from '../types/transformers.js';
3
5
  import { OpensearchQueryBuilder, type QueryBuilderOptions } from '../utils/queryBuilder.js';
4
6
  type SearchRouteOptions = {
7
+ prisma: PrismaClient;
8
+ opensearch: Client;
5
9
  accessTransformer: AccessTransformer;
6
10
  entityTransformers?: EntityTransformer[];
7
11
  queryBuilderClass?: typeof OpensearchQueryBuilder;
@@ -1,6 +1,6 @@
1
1
  import { z } from 'zod/v4';
2
2
  import { baseEntityTransformer, resolveEntityReferences } from '../transformers/default.js';
3
- import { createInternalError } from '../utils/errors.js';
3
+ import { createInternalError, createInvalidRequestError } from '../utils/errors.js';
4
4
  import { OpensearchQueryBuilder } from '../utils/queryBuilder.js';
5
5
  const boundingBoxSchema = z.object({
6
6
  topRight: z.object({
@@ -17,14 +17,14 @@ const searchParamsSchema = z.object({
17
17
  query: z.string(),
18
18
  filters: z.record(z.string(), z.array(z.string())).optional(),
19
19
  boundingBox: boundingBoxSchema.optional(),
20
- geohashPrecision: z.number().int().min(0).max(12).default(5),
20
+ geohashPrecision: z.number().int().min(1).max(12).optional(),
21
21
  limit: z.number().int().min(1).max(1000).default(100),
22
22
  offset: z.number().int().min(0).default(0),
23
23
  sort: z.enum(['id', 'name', 'createdAt', 'updatedAt', 'relevance']).default('relevance'),
24
24
  order: z.enum(['asc', 'desc']).default('asc'),
25
25
  });
26
26
  const search = async (fastify, opts) => {
27
- const { accessTransformer, entityTransformers = [], queryBuilderClass = OpensearchQueryBuilder, queryBuilderOptions, } = opts;
27
+ const { prisma, opensearch, accessTransformer, entityTransformers = [], queryBuilderClass = OpensearchQueryBuilder, queryBuilderOptions, } = opts;
28
28
  const queryBuilder = new queryBuilderClass(queryBuilderOptions);
29
29
  fastify.withTypeProvider().post('/search', {
30
30
  schema: {
@@ -50,29 +50,28 @@ const search = async (fastify, opts) => {
50
50
  },
51
51
  };
52
52
  fastify.log.debug(opensearchQuery);
53
- const response = await fastify.opensearch.search(opensearchQuery);
53
+ const response = await opensearch.search(opensearchQuery);
54
54
  if (!response.body?.hits?.hits) {
55
55
  throw new Error('Invalid search response: missing hits data');
56
56
  }
57
- const rocrateIds = response.body.hits.hits
58
- .map((hit) => hit._source?.rocrateId)
59
- .filter(Boolean);
60
- const dbEntities = await fastify.prisma.entity.findMany({
57
+ const entityIds = response.body.hits.hits.map((hit) => hit._source?.id).filter(Boolean);
58
+ const dbEntities = await prisma.entity.findMany({
61
59
  where: {
62
- rocrateId: {
63
- in: rocrateIds,
60
+ id: {
61
+ in: entityIds,
64
62
  },
65
63
  },
64
+ include: { file: { select: { id: true } } },
66
65
  });
67
- const entityMap = new Map(dbEntities.map((entity) => [entity.rocrateId, entity]));
68
- const refMap = await resolveEntityReferences(dbEntities, fastify.prisma);
66
+ const entityMap = new Map(dbEntities.map((entity) => [entity.id, entity]));
67
+ const refMap = await resolveEntityReferences(dbEntities, prisma);
69
68
  const entities = await Promise.all(response.body.hits.hits.map(async (hit) => {
70
- if (!hit._source?.rocrateId) {
71
- throw new Error('Missing rocrateId in search hit');
69
+ if (!hit._source?.id) {
70
+ throw new Error('Missing id in search hit');
72
71
  }
73
- const dbEntity = entityMap.get(hit._source.rocrateId);
72
+ const dbEntity = entityMap.get(hit._source.id);
74
73
  if (!dbEntity) {
75
- fastify.log.warn(`Entity ${hit._source.rocrateId} found in OpenSearch but not in database`);
74
+ fastify.log.warn(`Entity ${hit._source.id} found in OpenSearch but not in database`);
76
75
  return null;
77
76
  }
78
77
  const base = baseEntityTransformer(dbEntity);
@@ -81,16 +80,10 @@ const search = async (fastify, opts) => {
81
80
  memberOf: base.memberOf ? (refMap.get(base.memberOf) ?? null) : null,
82
81
  rootCollection: base.rootCollection ? (refMap.get(base.rootCollection) ?? null) : null,
83
82
  };
84
- const authorisedEntity = await accessTransformer(standardEntity, {
85
- request,
86
- fastify,
87
- });
83
+ const authorisedEntity = await accessTransformer(standardEntity, { request, fastify });
88
84
  let result = authorisedEntity;
89
85
  for (const transformer of entityTransformers) {
90
- result = await transformer(result, {
91
- request,
92
- fastify,
93
- });
86
+ result = await transformer(result, { request, fastify });
94
87
  }
95
88
  return {
96
89
  ...result,
@@ -138,6 +131,10 @@ const search = async (fastify, opts) => {
138
131
  }
139
132
  catch (error) {
140
133
  const err = error;
134
+ if ('statusCode' in err && err.statusCode === 400) {
135
+ fastify.log.warn(`Invalid search query: ${err.message}`);
136
+ return reply.code(422).send(createInvalidRequestError(err.message));
137
+ }
141
138
  fastify.log.error(`Search error: ${err.message}`);
142
139
  return reply.code(500).send(createInternalError('Search failed'));
143
140
  }
@@ -1 +1 @@
1
- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import searchRoute from './search.js';
5
5
  describe('Search Route', () => {
6
6
  beforeEach(async () => {
7
7
  await fastifyBefore();
8
- await fastify.register(searchRoute, { accessTransformer: AllPublicAccessTransformer });
8
+ await fastify.register(searchRoute, { prisma, opensearch, accessTransformer: AllPublicAccessTransformer });
9
9
  });
10
10
  afterEach(async () => {
11
11
  await fastifyAfter();
@@ -14,7 +14,7 @@ describe('Search Route', () => {
14
14
  it('should perform basic search successfully', async () => {
15
15
  const mockEntities = [
16
16
  {
17
- rocrateId: 'http://example.com/entity/1',
17
+ id: 'http://example.com/entity/1',
18
18
  name: 'Test Entity 1',
19
19
  description: 'A test entity',
20
20
  entityType: 'http://pcdm.org/models#Collection',
@@ -26,7 +26,7 @@ describe('Search Route', () => {
26
26
  updatedAt: new Date('2024-01-01'),
27
27
  },
28
28
  {
29
- rocrateId: 'http://example.com/entity/2',
29
+ id: 'http://example.com/entity/2',
30
30
  name: 'Test Entity 2',
31
31
  description: 'Another test entity',
32
32
  entityType: 'http://pcdm.org/models#Object',
@@ -47,7 +47,7 @@ describe('Search Route', () => {
47
47
  {
48
48
  _score: 1.5,
49
49
  _source: {
50
- rocrateId: 'http://example.com/entity/1',
50
+ id: 'http://example.com/entity/1',
51
51
  },
52
52
  highlight: {
53
53
  name: ['<em>Test</em> Entity 1'],
@@ -56,7 +56,7 @@ describe('Search Route', () => {
56
56
  {
57
57
  _score: 1.2,
58
58
  _source: {
59
- rocrateId: 'http://example.com/entity/2',
59
+ id: 'http://example.com/entity/2',
60
60
  },
61
61
  highlight: {
62
62
  description: ['Another <em>test</em> entity'],
@@ -89,10 +89,11 @@ describe('Search Route', () => {
89
89
  expect(body).toMatchSnapshot();
90
90
  expect(prisma.entity.findMany).toHaveBeenCalledWith({
91
91
  where: {
92
- rocrateId: {
92
+ id: {
93
93
  in: ['http://example.com/entity/1', 'http://example.com/entity/2'],
94
94
  },
95
95
  },
96
+ include: { file: { select: { id: true } } },
96
97
  });
97
98
  expect(opensearch.search).toHaveBeenCalledWith({
98
99
  index: 'entities',
@@ -337,6 +338,21 @@ describe('Search Route', () => {
337
338
  }),
338
339
  }));
339
340
  });
341
+ it('should return 422 for malformed opensearch query', async () => {
342
+ const opensearchError = Object.assign(new Error('parsing_exception'), { statusCode: 400 });
343
+ opensearch.search.mockRejectedValue(opensearchError);
344
+ const response = await fastify.inject({
345
+ method: 'POST',
346
+ url: '/search',
347
+ payload: {
348
+ query: 'test',
349
+ searchType: 'advanced',
350
+ },
351
+ });
352
+ expect(response.statusCode).toBe(422);
353
+ const body = JSON.parse(response.body);
354
+ expect(body.error.code).toBe('INVALID_REQUEST');
355
+ });
340
356
  it('should handle opensearch errors', async () => {
341
357
  opensearch.search.mockRejectedValue(new Error('OpenSearch connection failed'));
342
358
  const response = await fastify.inject({
@@ -350,6 +366,22 @@ describe('Search Route', () => {
350
366
  const body = JSON.parse(response.body);
351
367
  expect(body).toMatchSnapshot();
352
368
  });
369
+ it('should return 422 for malformed opensearch query', async () => {
370
+ const error = new Error('parsing_exception');
371
+ error.statusCode = 400;
372
+ opensearch.search.mockRejectedValue(error);
373
+ const response = await fastify.inject({
374
+ method: 'POST',
375
+ url: '/search',
376
+ payload: {
377
+ query: 'test',
378
+ },
379
+ });
380
+ expect(response.statusCode).toBe(422);
381
+ const body = JSON.parse(response.body);
382
+ expect(body.error.code).toBe('INVALID_REQUEST');
383
+ expect(body.error.message).toBe('parsing_exception');
384
+ });
353
385
  it('should validate required query parameter', async () => {
354
386
  const response = await fastify.inject({
355
387
  method: 'POST',
@@ -361,7 +393,7 @@ describe('Search Route', () => {
361
393
  it('should skip entities not found in database and log warning', async () => {
362
394
  const mockEntities = [
363
395
  {
364
- rocrateId: 'http://example.com/entity/1',
396
+ id: 'http://example.com/entity/1',
365
397
  name: 'Test Entity 1',
366
398
  description: 'A test entity',
367
399
  entityType: 'http://pcdm.org/models#Collection',
@@ -382,14 +414,14 @@ describe('Search Route', () => {
382
414
  {
383
415
  _score: 1.5,
384
416
  _source: {
385
- rocrateId: 'http://example.com/entity/1',
417
+ id: 'http://example.com/entity/1',
386
418
  },
387
419
  highlight: {},
388
420
  },
389
421
  {
390
422
  _score: 1.2,
391
423
  _source: {
392
- rocrateId: 'http://example.com/entity/2',
424
+ id: 'http://example.com/entity/2',
393
425
  },
394
426
  highlight: {},
395
427
  },
@@ -411,7 +443,7 @@ describe('Search Route', () => {
411
443
  const body = JSON.parse(response.body);
412
444
  expect(body).toMatchSnapshot();
413
445
  });
414
- it('should handle missing rocrateId in search hit', async () => {
446
+ it('should handle missing id in search hit', async () => {
415
447
  const mockSearchResponse = {
416
448
  body: {
417
449
  took: 5,
@@ -439,7 +471,7 @@ describe('Search Route', () => {
439
471
  expect(response.statusCode).toBe(500);
440
472
  console.log(response.body);
441
473
  });
442
- it('should handle rocrateId explicitly set to undefined', async () => {
474
+ it('should handle id explicitly set to undefined', async () => {
443
475
  const mockSearchResponse = {
444
476
  body: {
445
477
  took: 5,
@@ -449,7 +481,7 @@ describe('Search Route', () => {
449
481
  {
450
482
  _score: 1.5,
451
483
  _source: {
452
- rocrateId: undefined,
484
+ id: undefined,
453
485
  name: 'Test Entity',
454
486
  },
455
487
  },
@@ -496,12 +528,14 @@ describe('Search Route', () => {
496
528
  });
497
529
  await fastifyBefore();
498
530
  await fastify.register(searchRoute, {
531
+ prisma,
532
+ opensearch,
499
533
  accessTransformer: AllPublicAccessTransformer,
500
534
  entityTransformers: [customTransformer],
501
535
  });
502
536
  const mockEntities = [
503
537
  {
504
- rocrateId: 'http://example.com/entity/1',
538
+ id: 'http://example.com/entity/1',
505
539
  name: 'Test Entity 1',
506
540
  description: 'A test entity',
507
541
  entityType: 'http://pcdm.org/models#Collection',
@@ -522,7 +556,7 @@ describe('Search Route', () => {
522
556
  {
523
557
  _score: 1.5,
524
558
  _source: {
525
- rocrateId: 'http://example.com/entity/1',
559
+ id: 'http://example.com/entity/1',
526
560
  },
527
561
  highlight: {},
528
562
  },
@@ -547,7 +581,7 @@ describe('Search Route', () => {
547
581
  it('should handle search response with no aggregations field', async () => {
548
582
  const mockEntities = [
549
583
  {
550
- rocrateId: 'http://example.com/entity/1',
584
+ id: 'http://example.com/entity/1',
551
585
  name: 'Test Entity 1',
552
586
  description: 'A test entity',
553
587
  entityType: 'http://pcdm.org/models#Collection',
@@ -568,7 +602,7 @@ describe('Search Route', () => {
568
602
  {
569
603
  _score: 1.5,
570
604
  _source: {
571
- rocrateId: 'http://example.com/entity/1',
605
+ id: 'http://example.com/entity/1',
572
606
  },
573
607
  highlight: {},
574
608
  },
@@ -594,7 +628,7 @@ describe('Search Route', () => {
594
628
  it('should handle search response with malformed aggregation buckets', async () => {
595
629
  const mockEntities = [
596
630
  {
597
- rocrateId: 'http://example.com/entity/1',
631
+ id: 'http://example.com/entity/1',
598
632
  name: 'Test Entity 1',
599
633
  description: 'A test entity',
600
634
  entityType: 'http://pcdm.org/models#Collection',
@@ -615,7 +649,7 @@ describe('Search Route', () => {
615
649
  {
616
650
  _score: 1.5,
617
651
  _source: {
618
- rocrateId: 'http://example.com/entity/1',
652
+ id: 'http://example.com/entity/1',
619
653
  },
620
654
  highlight: {},
621
655
  },
@@ -646,7 +680,7 @@ describe('Search Route', () => {
646
680
  it('should handle search response with malformed geohash aggregation buckets', async () => {
647
681
  const mockEntities = [
648
682
  {
649
- rocrateId: 'http://example.com/entity/1',
683
+ id: 'http://example.com/entity/1',
650
684
  name: 'Test Entity 1',
651
685
  description: 'A test entity',
652
686
  entityType: 'http://pcdm.org/models#Collection',
@@ -667,7 +701,7 @@ describe('Search Route', () => {
667
701
  {
668
702
  _score: 1.5,
669
703
  _source: {
670
- rocrateId: 'http://example.com/entity/1',
704
+ id: 'http://example.com/entity/1',
671
705
  },
672
706
  highlight: {},
673
707
  },
@@ -697,10 +731,8 @@ describe('Search Route', () => {
697
731
  it('should return null for memberOf/rootCollection when parent entity not found', async () => {
698
732
  const mockEntities = [
699
733
  {
700
- id: 1,
701
- fileId: null,
702
734
  meta: {},
703
- rocrateId: 'http://example.com/entity/1',
735
+ id: 'http://example.com/entity/1',
704
736
  name: 'Test Entity 1',
705
737
  description: 'Entity with missing parent',
706
738
  entityType: 'http://pcdm.org/models#Object',
@@ -721,7 +753,7 @@ describe('Search Route', () => {
721
753
  {
722
754
  _score: 1.5,
723
755
  _source: {
724
- rocrateId: 'http://example.com/entity/1',
756
+ id: 'http://example.com/entity/1',
725
757
  },
726
758
  },
727
759
  ],