From 17cb1f294fbdfb46d702b384959f3210894c2a56 Mon Sep 17 00:00:00 2001 From: tdurieux Date: Sat, 27 Apr 2024 18:04:51 +0100 Subject: [PATCH] chore: remove all reference to originalFiles --- src/core/User.ts | 11 +++-------- src/server/database.ts | 18 ++---------------- src/server/routes/admin.ts | 11 ++++------- src/server/routes/repository-private.ts | 2 +- 4 files changed, 10 insertions(+), 32 deletions(-) diff --git a/src/core/User.ts b/src/core/User.ts index a743131..5ec6286 100644 --- a/src/core/User.ts +++ b/src/core/User.ts @@ -130,14 +130,9 @@ export default class User { const span = trace.getTracer("ano-file").startSpan("User.getRepositories"); span.setAttribute("username", this.username); const repositories = ( - await AnonymizedRepositoryModel.find( - { - owner: this.id, - }, - { - originalFiles: 0, - } - ).exec() + await AnonymizedRepositoryModel.find({ + owner: this.id, + }).exec() ).map((d) => new Repository(d)); const promises = []; for (let repo of repositories) { diff --git a/src/server/database.ts b/src/server/database.ts index 5420497..04f95f6 100644 --- a/src/server/database.ts +++ b/src/server/database.ts @@ -24,28 +24,14 @@ export async function connect() { return database; } -export async function getRepository( - repoId: string, - opts: { - includeFiles: boolean; - } = { - includeFiles: true, - } -) { +export async function getRepository(repoId: string, opts: {} = {}) { if (!repoId || repoId == "undefined") { throw new AnonymousError("repo_not_found", { object: repoId, httpStatus: 404, }); } - const project: any = {}; - if (!opts.includeFiles) { - project.originalFiles = 0; - } - const data = await AnonymizedRepositoryModel.findOne( - { repoId }, - project - ).collation({ + const data = await AnonymizedRepositoryModel.findOne({ repoId }).collation({ locale: "en", strength: 2, }); diff --git a/src/server/routes/admin.ts b/src/server/routes/admin.ts index 78b1b47..53483f6 100644 --- a/src/server/routes/admin.ts +++ b/src/server/routes/admin.ts @@ -152,13 +152,10 @@ router.get("/repos", async (req, res) => { } const skipIndex = (page - 1) * limit; const [total, results] = await Promise.all([ - AnonymizedRepositoryModel.find( - { - $and: query, - }, - { originalFiles: 0 } - ).countDocuments(), - AnonymizedRepositoryModel.find({ $and: query }, { originalFiles: 0 }) + AnonymizedRepositoryModel.find({ + $and: query, + }).countDocuments(), + AnonymizedRepositoryModel.find({ $and: query }) .skip(skipIndex) .sort(sort) .limit(limit) diff --git a/src/server/routes/repository-private.ts b/src/server/routes/repository-private.ts index 13cd3f8..a2228c9 100644 --- a/src/server/routes/repository-private.ts +++ b/src/server/routes/repository-private.ts @@ -480,7 +480,7 @@ router.post("/", async (req: express.Request, res: express.Response) => { try { try { - await db.getRepository(repoUpdate.repoId, { includeFiles: false }); + await db.getRepository(repoUpdate.repoId); throw new AnonymousError("repoId_already_used", { httpStatus: 400, object: repoUpdate,