Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dotenv.config();
import livenessRouter from './routes/liveness';
import buildsRouter from './routes/builds';
import projectsRouter from './routes/projects';
import userRouter from './routes/user';
import { connect } from './services/client';
import { initDb } from './services/database';
import { initPoolDb } from './services/pool';
Expand Down Expand Up @@ -67,7 +66,6 @@ export const setupApp = async ({ mongoClient }: AppSettings) => {
app.use(reqHandler);
app.use('/builds', buildsRouter);
app.use('/projects', projectsRouter);
app.use('/user', userRouter);
app.use('/prod/builds', buildsRouter);
app.use('/prod/projects', projectsRouter);
app.use(errorHandler);
Expand Down
28 changes: 0 additions & 28 deletions src/routes/user.ts

This file was deleted.

13 changes: 1 addition & 12 deletions src/services/database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ interface PageDocument {
static_assets: StaticAsset[];
build_id: ObjectId;
created_at: Date;
github_username: string;
facets?: Facet[];
}

Expand All @@ -40,7 +39,6 @@ interface UpdatedPageDocument {
static_assets: StaticAsset[];
created_at: Date;
updated_at: Date;
github_username: string;
deleted: boolean;
facets?: Facet[];
}
Expand Down Expand Up @@ -97,15 +95,6 @@ export const findPagesByProj = (project: string, req: Request, timestamp?: numbe
return getDb(req).collection<UpdatedPageDocument>(UPDATED_PAGES_COLLECTION).find(query);
};

export const findPagesByUser = (user: string, req: Request, timestamp?: number) => {
const query: Filter<UpdatedPageDocument> = { github_username: user };
if (timestamp) {
const lastQuery = new Date(timestamp);
query['updated_at'] = { $gte: lastQuery };
}
return getDb(req).collection<UpdatedPageDocument>(UPDATED_PAGES_COLLECTION).find(query);
};

export const findPagesByProjAndBranch = (project: string, branch: string, req: Request, timestamp?: number) => {
const pageIdQuery = getPageIdQuery(project, branch);
const query: Filter<UpdatedPageDocument> = { page_id: pageIdQuery };
Expand Down Expand Up @@ -151,7 +140,7 @@ export const findLatestMetadataByProperty = (filter: Filter<Document>, req: Requ
// Group documents by unique project + branch + user combination, and only
// embed the first doc seen (or most recent, based on sorting stage)
{
$group: { _id: { project: '$project', branch: '$branch', user: '$github_username' }, doc: { $first: '$$ROOT' } },
$group: { _id: { project: '$project', branch: '$branch' }, doc: { $first: '$$ROOT' } },
},
// Un-embed the doc from each group
{ $replaceRoot: { newRoot: '$doc' } },
Expand Down
8 changes: 4 additions & 4 deletions tests/routes/__snapshots__/builds.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
exports[`Test documents routes should return all data based on build ID 1`] = `
[
"{"type":"timestamp","data":1685714694420}",
"{"type":"metadata","data":{"_id":"646bae50c41d7b9a472b6075","project":"docs","branch":"master","github_username":"babadook","title":"MongoDB Manual","eol":false,"slugToTitle":{},"toctreeorder":{},"parentPaths":{},"static_files":{},"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0591","page_id":"docs/docsworker-xlarge/master/data-center-awareness","filename":"data-center-awareness.txt","ast":{},"source":"no asset example","static_assets":[],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z","github_username":"babadook"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0592","page_id":"docs/docsworker-xlarge/master/tutorial/insert-documents","filename":"tutorial/insert-documents.txt","ast":{},"source":"1 asset example","static_assets":[{"checksum":"d4dbe419766d19842ba5624cb41f6b873a513b620049e759a923894bef17742c","key":"/images/CSFLE_Master_Key_KMS.png"}],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z","github_username":"babadook"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0593","page_id":"docs/docsworker-xlarge/master/tutorial/update-documents","filename":"tutorial/update-documents.txt","ast":{},"source":"2 assets example","static_assets":[{"checksum":"ba1b4507fc789827edd02f979130e9633a0020b498cba915c0773403b37aedd5","key":"/images/compass-update-doc-button.png"},{"checksum":"9617b2e1a8065e4a1699c15fc8ea1e085a41b4021debeaef1793a6cb431a9659","key":"/images/compass-update-edit-mode.png"}],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z","github_username":"babadook"}}",
"{"type":"metadata","data":{"_id":"646bae50c41d7b9a472b6075","project":"docs","branch":"master","title":"MongoDB Manual","eol":false,"slugToTitle":{},"toctreeorder":{},"parentPaths":{},"static_files":{},"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0591","page_id":"docs/docsworker-xlarge/master/data-center-awareness","filename":"data-center-awareness.txt","ast":{},"source":"no asset example","static_assets":[],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0592","page_id":"docs/docsworker-xlarge/master/tutorial/insert-documents","filename":"tutorial/insert-documents.txt","ast":{},"source":"1 asset example","static_assets":[{"checksum":"d4dbe419766d19842ba5624cb41f6b873a513b620049e759a923894bef17742c","key":"/images/CSFLE_Master_Key_KMS.png"}],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z"}}",
"{"type":"page","data":{"_id":"646e8ab3806cedd1747f0593","page_id":"docs/docsworker-xlarge/master/tutorial/update-documents","filename":"tutorial/update-documents.txt","ast":{},"source":"2 assets example","static_assets":[{"checksum":"ba1b4507fc789827edd02f979130e9633a0020b498cba915c0773403b37aedd5","key":"/images/compass-update-doc-button.png"},{"checksum":"9617b2e1a8065e4a1699c15fc8ea1e085a41b4021debeaef1793a6cb431a9659","key":"/images/compass-update-edit-mode.png"}],"build_id":"642ec854c38bedd45ed3d1fc","created_at":"2023-04-06T13:25:40.000Z"}}",
"{"type":"asset","data":{"checksum":"9617b2e1a8065e4a1699c15fc8ea1e085a41b4021debeaef1793a6cb431a9659","assetData":{"$binary":{"base64":"YXNzZXQtZXhhbXBsZQ==","subType":"00"}},"filenames":["/images/compass-update-edit-mode.png"]}}",
"{"type":"asset","data":{"checksum":"ba1b4507fc789827edd02f979130e9633a0020b498cba915c0773403b37aedd5","assetData":{"$binary":{"base64":"YXNzZXQtZXhhbXBsZQ==","subType":"00"}},"filenames":["/images/compass-update-doc-button.png"]}}",
"{"type":"asset","data":{"checksum":"d4dbe419766d19842ba5624cb41f6b873a513b620049e759a923894bef17742c","assetData":{"$binary":{"base64":"YXNzZXQtZXhhbXBsZQ==","subType":"00"}},"filenames":["/images/CSFLE_Master_Key_KMS.png"]}}",
Expand Down
Loading