Merge branch 'main' into 1177-return-200-on-reject

Author: kriswest

src/db/file/repo.ts

@@ -97,7 +97,7 @@ export const createRepo = async (repo: Repo): Promise<Repo> => {
       if (err) {
         reject(err);
       } else {
-        resolve(doc ? toClass(doc, Repo.prototype) : null);
+        resolve(toClass(doc, Repo.prototype));
       }
     });
   });

src/db/helper.ts

@@ -1,7 +1,7 @@
-export const toClass = function (obj: any, proto: any) {
-  obj = JSON.parse(JSON.stringify(obj));
-  obj.__proto__ = proto;
-  return obj;
+export const toClass = function <T, U>(obj: T, proto: U): U {
+  const out = JSON.parse(JSON.stringify(obj));
+  out.__proto__ = proto;
+  return out as U;
 };
 
 export const trimTrailingDotGit = (str: string): string => {

src/db/mongo/repo.ts

@@ -7,28 +7,27 @@ const collectionName = 'repos';
 
 export const getRepos = async (query: any = {}): Promise<Repo[]> => {
   const collection = await connect(collectionName);
-  const docs = collection.find(query).toArray();
+  const docs = await collection.find(query).toArray();
   return _.chain(docs)
     .map((x) => toClass(x, Repo.prototype))
     .value();
 };
 
 export const getRepo = async (name: string): Promise<Repo | null> => {
-  name = name.toLowerCase();
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ name: { $eq: name } });
+  const doc = await collection.findOne({ name: { $eq: name.toLowerCase() } });
   return doc ? toClass(doc, Repo.prototype) : null;
 };
 
 export const getRepoByUrl = async (repoUrl: string): Promise<Repo | null> => {
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ name: { $eq: repoUrl.toLowerCase() } });
+  const doc = await collection.findOne({ url: { $eq: repoUrl } });
   return doc ? toClass(doc, Repo.prototype) : null;
 };
 
 export const getRepoById = async (_id: string): Promise<Repo | null> => {
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ _id: new ObjectId(_id) });
+  const doc = await collection.findOne({ _id: new ObjectId(_id) });
   return doc ? toClass(doc, Repo.prototype) : null;
 };
 

src/db/mongo/users.ts

@@ -7,19 +7,19 @@ const collectionName = 'users';
 
 export const findUser = async function (username: string): Promise<User | null> {
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ username: { $eq: username.toLowerCase() } });
+  const doc = await collection.findOne({ username: { $eq: username.toLowerCase() } });
   return doc ? toClass(doc, User.prototype) : null;
 };
 
 export const findUserByEmail = async function (email: string): Promise<User | null> {
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ email: { $eq: email.toLowerCase() } });
+  const doc = await collection.findOne({ email: { $eq: email.toLowerCase() } });
   return doc ? toClass(doc, User.prototype) : null;
 };
 
 export const findUserByOIDC = async function (oidcId: string): Promise<User | null> {
   const collection = await connect(collectionName);
-  const doc = collection.findOne({ oidcId: { $eq: oidcId } });
+  const doc = await collection.findOne({ oidcId: { $eq: oidcId } });
   return doc ? toClass(doc, User.prototype) : null;
 };
 
@@ -32,7 +32,7 @@ export const getUsers = async function (query: any = {}): Promise<User[]> {
   }
   console.log(`Getting users for query = ${JSON.stringify(query)}`);
   const collection = await connect(collectionName);
-  const docs = collection.find(query).project({ password: 0 }).toArray();
+  const docs = await collection.find(query).project({ password: 0 }).toArray();
   return _.chain(docs)
     .map((x) => toClass(x, User.prototype))
     .value();