arocapi 2.0.4 → 3.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.
- package/README.md +81 -9
- package/dist/app.d.ts +6 -0
- package/dist/app.js +9 -3
- package/dist/app.js.map +1 -1
- package/dist/index.dev.js +11 -1
- package/dist/index.dev.js.map +1 -1
- package/dist/routes/crate.js +5 -18
- package/dist/routes/crate.js.map +1 -1
- package/dist/routes/crate.test.js +20 -22
- package/dist/routes/crate.test.js.map +1 -1
- package/dist/routes/entities.js +12 -10
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/entities.test.js +18 -18
- package/dist/routes/entities.test.js.map +1 -1
- package/dist/routes/entity.js +3 -4
- package/dist/routes/entity.js.map +1 -1
- package/dist/routes/entity.test.js +11 -16
- package/dist/routes/entity.test.js.map +1 -1
- package/dist/routes/file.js +5 -18
- package/dist/routes/file.js.map +1 -1
- package/dist/routes/file.test.js +18 -22
- package/dist/routes/file.test.js.map +1 -1
- package/dist/routes/files.js +12 -11
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/files.test.js +5 -34
- package/dist/routes/files.test.js.map +1 -1
- package/dist/routes/search.d.ts +3 -0
- package/dist/routes/search.js +22 -128
- package/dist/routes/search.js.map +1 -1
- package/dist/routes/search.test.js +53 -23
- package/dist/routes/search.test.js.map +1 -1
- package/dist/test/integration.setup.d.ts +2 -4
- package/dist/test/integration.setup.js +18 -21
- package/dist/test/integration.setup.js.map +1 -1
- package/dist/transformers/default.d.ts +12 -19
- package/dist/transformers/default.js +5 -18
- package/dist/transformers/default.js.map +1 -1
- package/dist/transformers/default.test.js +6 -15
- package/dist/transformers/default.test.js.map +1 -1
- package/dist/transformers/transformer.test.js +2 -6
- package/dist/transformers/transformer.test.js.map +1 -1
- package/dist/utils/errors.d.ts +7 -1
- package/dist/utils/errors.js +2 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/headers.d.ts +7 -0
- package/dist/utils/headers.js +11 -0
- package/dist/utils/headers.js.map +1 -0
- package/dist/utils/queryBuilder.d.ts +35 -0
- package/dist/utils/queryBuilder.js +98 -0
- package/dist/utils/queryBuilder.js.map +1 -0
- package/package.json +27 -23
- package/prisma/models/entity.prisma +17 -13
- package/prisma/models/file.prisma +9 -13
- package/prisma.config.ts +0 -2
- package/src/app.ts +15 -2
- package/src/index.dev.ts +12 -1
- package/src/routes/__snapshots__/search.test.ts.snap +2 -2
- package/src/routes/crate.test.ts +20 -22
- package/src/routes/crate.ts +6 -24
- package/src/routes/entities.test.ts +21 -18
- package/src/routes/entities.ts +12 -12
- package/src/routes/entity.test.ts +13 -16
- package/src/routes/entity.ts +3 -4
- package/src/routes/file.test.ts +18 -22
- package/src/routes/file.ts +6 -24
- package/src/routes/files.test.ts +5 -37
- package/src/routes/files.ts +12 -13
- package/src/routes/search.test.ts +62 -25
- package/src/routes/search.ts +34 -153
- package/src/test/integration.setup.ts +19 -21
- package/src/transformers/default.test.ts +10 -20
- package/src/transformers/default.ts +15 -28
- package/src/transformers/transformer.test.ts +4 -6
- package/src/utils/errors.ts +10 -6
- package/src/utils/headers.ts +16 -0
- package/src/utils/queryBuilder.ts +132 -0
- package/prisma/migrations/20250515034400_entities/migration.sql +0 -14
- package/prisma/migrations/20250515050009_extend_entity_fields/migration.sql +0 -7
- package/prisma/migrations/20250804225438_add_record_type/migration.sql +0 -8
- package/prisma/migrations/20250805040110_add_rocrate_field/migration.sql +0 -2
- package/prisma/migrations/20250827033956_record_type_scalar/migration.sql +0 -10
- package/prisma/migrations/20250923032753_api_refactor/migration.sql +0 -39
- package/prisma/migrations/20250923223119_entity_type_to_string/migration.sql +0 -8
- package/prisma/migrations/20251020140329_add_meta_column/migration.sql +0 -2
- package/prisma/migrations/20251027010713_add_file_table/migration.sql +0 -17
- package/prisma/migrations/20251027221138_add_file_id_to_entity/migration.sql +0 -2
- package/prisma/migrations/20251211025510_remove_rocrate_column/migration.sql +0 -8
- package/prisma/migrations/migration_lock.toml +0 -3
- package/prisma/schema.prisma +0 -17
package/dist/routes/files.js
CHANGED
|
@@ -19,18 +19,19 @@ const files = async (fastify, opts) => {
|
|
|
19
19
|
try {
|
|
20
20
|
const where = {};
|
|
21
21
|
if (memberOf) {
|
|
22
|
-
where.
|
|
22
|
+
where.entity = { id: memberOf };
|
|
23
23
|
}
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
24
|
+
const [dbFiles, total] = await Promise.all([
|
|
25
|
+
fastify.prisma.file.findMany({
|
|
26
|
+
where,
|
|
27
|
+
orderBy: {
|
|
28
|
+
[sort]: order,
|
|
29
|
+
},
|
|
30
|
+
skip: offset,
|
|
31
|
+
take: limit,
|
|
32
|
+
}),
|
|
33
|
+
fastify.prisma.file.count({ where }),
|
|
34
|
+
]);
|
|
34
35
|
const filesWithAccess = await Promise.all(dbFiles.map(async (dbFile) => {
|
|
35
36
|
const standardFile = baseFileTransformer(dbFile);
|
|
36
37
|
const authorisedFile = await fileAccessTransformer(standardFile, {
|
package/dist/routes/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAC5D,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACxE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AAOH,MAAM,KAAK,GAA0C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,qBAAqB,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IAE9D,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,QAAQ,EACR;QACE,MAAM,EAAE;YACN,WAAW,EAAE,WAAW;SACzB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAE/D,IAAI,CAAC;YACH,MAAM,KAAK,GAA6E,EAAE,CAAC;YAE3F,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,27 +11,19 @@ describe('Files Route', () => {
|
|
|
11
11
|
await fastifyAfter();
|
|
12
12
|
});
|
|
13
13
|
const mockFile1 = {
|
|
14
|
-
id:
|
|
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:
|
|
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]);
|
|
@@ -73,7 +61,7 @@ describe('Files Route', () => {
|
|
|
73
61
|
const body = JSON.parse(response.body);
|
|
74
62
|
expect(body.total).toBe(1);
|
|
75
63
|
expect(prisma.file.findMany).toHaveBeenCalledWith(expect.objectContaining({
|
|
76
|
-
where: {
|
|
64
|
+
where: { entity: { id: 'http://example.com/collection/1' } },
|
|
77
65
|
}));
|
|
78
66
|
});
|
|
79
67
|
it('should support pagination with limit and offset', async () => {
|
|
@@ -104,7 +92,7 @@ describe('Files Route', () => {
|
|
|
104
92
|
orderBy: { filename: 'asc' },
|
|
105
93
|
}));
|
|
106
94
|
});
|
|
107
|
-
it('should support sorting by id
|
|
95
|
+
it('should support sorting by id directly', async () => {
|
|
108
96
|
prisma.file.findMany.mockResolvedValue([mockFile1, mockFile2]);
|
|
109
97
|
prisma.file.count.mockResolvedValue(2);
|
|
110
98
|
const response = await fastify.inject({
|
|
@@ -113,7 +101,7 @@ describe('Files Route', () => {
|
|
|
113
101
|
});
|
|
114
102
|
expect(response.statusCode).toBe(200);
|
|
115
103
|
expect(prisma.file.findMany).toHaveBeenCalledWith(expect.objectContaining({
|
|
116
|
-
orderBy: {
|
|
104
|
+
orderBy: { id: 'desc' },
|
|
117
105
|
}));
|
|
118
106
|
});
|
|
119
107
|
it('should return empty list when no files found', async () => {
|
|
@@ -128,23 +116,6 @@ describe('Files Route', () => {
|
|
|
128
116
|
expect(body.total).toBe(0);
|
|
129
117
|
expect(body.files).toHaveLength(0);
|
|
130
118
|
});
|
|
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
119
|
it('should return 500 when database error occurs', async () => {
|
|
149
120
|
prisma.file.findMany.mockRejectedValue(new Error('Database connection failed'));
|
|
150
121
|
const response = await fastify.inject({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/routes/files.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,aAAa,EAAE,CAAC;QACtB,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"files.test.js","sourceRoot":"","sources":["../../src/routes/files.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,aAAa,EAAE,CAAC;QACtB,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,YAAY,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,8BAA8B;QAClC,QAAQ,EAAE,WAAW;QACrB,SAAS,EAAE,WAAW;QACtB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;QACjC,SAAS,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;KAClC,CAAC;IAEF,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,8BAA8B;QAClC,QAAQ,EAAE,WAAW;QACrB,SAAS,EAAE,YAAY;QACvB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;QACjB,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;QACjC,SAAS,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC;KAClC,CAAC;IAEF,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAwC,CAAC;YAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAClC,EAAE,EAAE,8BAA8B;gBAClC,QAAQ,EAAE,WAAW;gBACrB,SAAS,EAAE,WAAW;gBACtB,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE;oBACN,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,iDAAiD;aACvD,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAsB,CAAC;YAC5D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,iCAAiC,EAAE,EAAE;aAC7D,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,yBAAyB;aAC/B,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAwC,CAAC;YAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,CAAC;gBACP,IAAI,EAAE,CAAC;aACR,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,gCAAgC;aACtC,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;aAC7B,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,2BAA2B;aACjC,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;aACxB,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAwC,CAAC;YAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;YAEhF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAgC,CAAC;YAEtE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,mBAAmB;aACzB,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAA0B,CAAC;YAEhE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,6BAA6B;aACnC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAA0B,CAAC;YAEhE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,qBAAqB;aAC3B,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAA0B,CAAC;YAEhE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,aAAa,EAAE,CAAC;YAGtB,MAAM,iBAAiB,GAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACpD,GAAG,IAAI;gBACP,WAAW,EAAE,YAAY;gBACzB,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;aAC/C,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACjC,qBAAqB,EAAE,8BAA8B;gBACrD,gBAAgB,EAAE,CAAC,iBAAiB,CAAC;aACtC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAyB,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAClC,EAAE,EAAE,8BAA8B;gBAClC,QAAQ,EAAE,WAAW;gBACrB,WAAW,EAAE,YAAY;gBACzB,iBAAiB,EAAE,WAAW;aAC/B,CAAC,CAAC;YAEH,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,aAAa,EAAE,CAAC;YAGtB,MAAM,2BAA2B,GAA0B,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACpE,GAAG,IAAI;gBACP,MAAM,EAAE;oBACN,OAAO,EAAE,KAAK;oBACd,uBAAuB,EAAE,oCAAoC;iBAC9D;aACF,CAAC,CAAC;YAEH,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;gBACjC,qBAAqB,EAAE,2BAA2B;aACnD,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;gBACpC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ;aACd,CAAC,CAAC;YAEH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAyB,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAClC,MAAM,EAAE;oBACN,OAAO,EAAE,KAAK;oBACd,uBAAuB,EAAE,oCAAoC;iBAC9D;aACF,CAAC,CAAC;YAEH,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/routes/search.d.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { FastifyPluginAsync } from 'fastify';
|
|
2
2
|
import type { AccessTransformer, EntityTransformer } from '../types/transformers.js';
|
|
3
|
+
import { OpensearchQueryBuilder, type QueryBuilderOptions } from '../utils/queryBuilder.js';
|
|
3
4
|
type SearchRouteOptions = {
|
|
4
5
|
accessTransformer: AccessTransformer;
|
|
5
6
|
entityTransformers?: EntityTransformer[];
|
|
7
|
+
queryBuilderClass?: typeof OpensearchQueryBuilder;
|
|
8
|
+
queryBuilderOptions?: QueryBuilderOptions;
|
|
6
9
|
};
|
|
7
10
|
declare const search: FastifyPluginAsync<SearchRouteOptions>;
|
|
8
11
|
export default search;
|
package/dist/routes/search.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
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
|
+
import { OpensearchQueryBuilder } from '../utils/queryBuilder.js';
|
|
4
5
|
const boundingBoxSchema = z.object({
|
|
5
6
|
topRight: z.object({
|
|
6
7
|
lat: z.number(),
|
|
@@ -16,126 +17,15 @@ const searchParamsSchema = z.object({
|
|
|
16
17
|
query: z.string(),
|
|
17
18
|
filters: z.record(z.string(), z.array(z.string())).optional(),
|
|
18
19
|
boundingBox: boundingBoxSchema.optional(),
|
|
19
|
-
geohashPrecision: z.number().int().min(
|
|
20
|
+
geohashPrecision: z.number().int().min(1).max(12).optional(),
|
|
20
21
|
limit: z.number().int().min(1).max(1000).default(100),
|
|
21
22
|
offset: z.number().int().min(0).default(0),
|
|
22
23
|
sort: z.enum(['id', 'name', 'createdAt', 'updatedAt', 'relevance']).default('relevance'),
|
|
23
24
|
order: z.enum(['asc', 'desc']).default('asc'),
|
|
24
25
|
});
|
|
25
|
-
const buildQuery = (searchType, query, filters, boundingBox) => {
|
|
26
|
-
const must = [];
|
|
27
|
-
const filter = [];
|
|
28
|
-
if (searchType === 'basic') {
|
|
29
|
-
must.push({
|
|
30
|
-
multi_match: {
|
|
31
|
-
query,
|
|
32
|
-
fields: ['name^2', 'description'],
|
|
33
|
-
type: 'best_fields',
|
|
34
|
-
fuzziness: 'AUTO',
|
|
35
|
-
zero_terms_query: 'all',
|
|
36
|
-
},
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
must.push({
|
|
41
|
-
query_string: {
|
|
42
|
-
query,
|
|
43
|
-
fields: ['name^2', 'description'],
|
|
44
|
-
default_operator: 'AND',
|
|
45
|
-
},
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
if (filters) {
|
|
49
|
-
Object.entries(filters).forEach(([field, values]) => {
|
|
50
|
-
filter.push({
|
|
51
|
-
terms: {
|
|
52
|
-
[field]: values,
|
|
53
|
-
},
|
|
54
|
-
});
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
if (boundingBox) {
|
|
58
|
-
filter.push({
|
|
59
|
-
geo_bounding_box: {
|
|
60
|
-
location: {
|
|
61
|
-
top_left: {
|
|
62
|
-
lat: boundingBox.topRight.lat,
|
|
63
|
-
lon: boundingBox.bottomLeft.lng,
|
|
64
|
-
},
|
|
65
|
-
bottom_right: {
|
|
66
|
-
lat: boundingBox.bottomLeft.lat,
|
|
67
|
-
lon: boundingBox.topRight.lng,
|
|
68
|
-
},
|
|
69
|
-
},
|
|
70
|
-
},
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
return {
|
|
74
|
-
bool: {
|
|
75
|
-
must,
|
|
76
|
-
filter,
|
|
77
|
-
},
|
|
78
|
-
};
|
|
79
|
-
};
|
|
80
|
-
const buildAggregations = (geohashPrecision, boundingBox) => {
|
|
81
|
-
const aggs = {
|
|
82
|
-
inLanguage: {
|
|
83
|
-
terms: {
|
|
84
|
-
field: 'inLanguage.keyword',
|
|
85
|
-
size: 20,
|
|
86
|
-
},
|
|
87
|
-
},
|
|
88
|
-
mediaType: {
|
|
89
|
-
terms: {
|
|
90
|
-
field: 'mediaType.keyword',
|
|
91
|
-
size: 20,
|
|
92
|
-
},
|
|
93
|
-
},
|
|
94
|
-
communicationMode: {
|
|
95
|
-
terms: {
|
|
96
|
-
field: 'communicationMode.keyword',
|
|
97
|
-
size: 20,
|
|
98
|
-
},
|
|
99
|
-
},
|
|
100
|
-
entityType: {
|
|
101
|
-
terms: {
|
|
102
|
-
field: 'entityType.keyword',
|
|
103
|
-
size: 20,
|
|
104
|
-
},
|
|
105
|
-
},
|
|
106
|
-
};
|
|
107
|
-
if (geohashPrecision && boundingBox) {
|
|
108
|
-
aggs.geohash_grid = {
|
|
109
|
-
geohash_grid: {
|
|
110
|
-
field: 'location',
|
|
111
|
-
precision: geohashPrecision,
|
|
112
|
-
bounds: {
|
|
113
|
-
top_left: {
|
|
114
|
-
lat: boundingBox.topRight.lat,
|
|
115
|
-
lon: boundingBox.bottomLeft.lng,
|
|
116
|
-
},
|
|
117
|
-
bottom_right: {
|
|
118
|
-
lat: boundingBox.bottomLeft.lat,
|
|
119
|
-
lon: boundingBox.topRight.lng,
|
|
120
|
-
},
|
|
121
|
-
},
|
|
122
|
-
},
|
|
123
|
-
};
|
|
124
|
-
}
|
|
125
|
-
return aggs;
|
|
126
|
-
};
|
|
127
|
-
const buildSort = (sort, order) => {
|
|
128
|
-
if (sort === 'relevance') {
|
|
129
|
-
return;
|
|
130
|
-
}
|
|
131
|
-
const sortField = sort === 'id' ? 'rocrateId' : sort;
|
|
132
|
-
if (sortField === 'name') {
|
|
133
|
-
return [{ 'name.keyword': order }];
|
|
134
|
-
}
|
|
135
|
-
return [{ [sortField]: order }];
|
|
136
|
-
};
|
|
137
26
|
const search = async (fastify, opts) => {
|
|
138
|
-
const { accessTransformer, entityTransformers = [] } = opts;
|
|
27
|
+
const { accessTransformer, entityTransformers = [], queryBuilderClass = OpensearchQueryBuilder, queryBuilderOptions, } = opts;
|
|
28
|
+
const queryBuilder = new queryBuilderClass(queryBuilderOptions);
|
|
139
29
|
fastify.withTypeProvider().post('/search', {
|
|
140
30
|
schema: {
|
|
141
31
|
body: searchParamsSchema,
|
|
@@ -146,42 +36,42 @@ const search = async (fastify, opts) => {
|
|
|
146
36
|
const opensearchQuery = {
|
|
147
37
|
index: 'entities',
|
|
148
38
|
body: {
|
|
149
|
-
query: buildQuery(searchType, query, filters, boundingBox),
|
|
150
|
-
aggs: buildAggregations(geohashPrecision, boundingBox),
|
|
39
|
+
query: queryBuilder.buildQuery(searchType, query, filters, boundingBox),
|
|
40
|
+
aggs: queryBuilder.buildAggregations(geohashPrecision, boundingBox),
|
|
151
41
|
highlight: {
|
|
152
42
|
fields: {
|
|
153
43
|
name: {},
|
|
154
44
|
description: {},
|
|
155
45
|
},
|
|
156
46
|
},
|
|
157
|
-
sort: buildSort(sort, order),
|
|
47
|
+
sort: queryBuilder.buildSort(sort, order),
|
|
158
48
|
from: offset,
|
|
159
49
|
size: limit,
|
|
160
50
|
},
|
|
161
51
|
};
|
|
52
|
+
fastify.log.debug(opensearchQuery);
|
|
162
53
|
const response = await fastify.opensearch.search(opensearchQuery);
|
|
163
54
|
if (!response.body?.hits?.hits) {
|
|
164
55
|
throw new Error('Invalid search response: missing hits data');
|
|
165
56
|
}
|
|
166
|
-
const
|
|
167
|
-
.map((hit) => hit._source?.rocrateId)
|
|
168
|
-
.filter(Boolean);
|
|
57
|
+
const entityIds = response.body.hits.hits.map((hit) => hit._source?.id).filter(Boolean);
|
|
169
58
|
const dbEntities = await fastify.prisma.entity.findMany({
|
|
170
59
|
where: {
|
|
171
|
-
|
|
172
|
-
in:
|
|
60
|
+
id: {
|
|
61
|
+
in: entityIds,
|
|
173
62
|
},
|
|
174
63
|
},
|
|
64
|
+
include: { file: { select: { id: true } } },
|
|
175
65
|
});
|
|
176
|
-
const entityMap = new Map(dbEntities.map((entity) => [entity.
|
|
66
|
+
const entityMap = new Map(dbEntities.map((entity) => [entity.id, entity]));
|
|
177
67
|
const refMap = await resolveEntityReferences(dbEntities, fastify.prisma);
|
|
178
68
|
const entities = await Promise.all(response.body.hits.hits.map(async (hit) => {
|
|
179
|
-
if (!hit._source?.
|
|
180
|
-
throw new Error('Missing
|
|
69
|
+
if (!hit._source?.id) {
|
|
70
|
+
throw new Error('Missing id in search hit');
|
|
181
71
|
}
|
|
182
|
-
const dbEntity = entityMap.get(hit._source.
|
|
72
|
+
const dbEntity = entityMap.get(hit._source.id);
|
|
183
73
|
if (!dbEntity) {
|
|
184
|
-
fastify.log.warn(`Entity ${hit._source.
|
|
74
|
+
fastify.log.warn(`Entity ${hit._source.id} found in OpenSearch but not in database`);
|
|
185
75
|
return null;
|
|
186
76
|
}
|
|
187
77
|
const base = baseEntityTransformer(dbEntity);
|
|
@@ -247,6 +137,10 @@ const search = async (fastify, opts) => {
|
|
|
247
137
|
}
|
|
248
138
|
catch (error) {
|
|
249
139
|
const err = error;
|
|
140
|
+
if ('statusCode' in err && err.statusCode === 400) {
|
|
141
|
+
fastify.log.warn(`Invalid search query: ${err.message}`);
|
|
142
|
+
return reply.code(422).send(createInvalidRequestError(err.message));
|
|
143
|
+
}
|
|
250
144
|
fastify.log.error(`Search error: ${err.message}`);
|
|
251
145
|
return reply.code(500).send(createInternalError('Search failed'));
|
|
252
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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"}
|