Tweaks and mergefail fixes

src/dao/auth/readOneByRecord.ts

@@ -1,9 +1,5 @@
 import { Types } from 'mongoose';
 
-<<<<<<<< HEAD:src/dao/auth/readOneByRecord.ts
 import { Auth } from '../../model/auth';
-========
-import { Auth } from '../model/auth';
->>>>>>>> main:src/dao/readOneByRecord.ts
 
 export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record });

src/dao/auth/readOneByUsername.ts

@@ -1,7 +1,3 @@
-<<<<<<<< HEAD:src/dao/auth/readOneByUsername.ts
 import { Auth } from '../../model/auth';
-========
-import { Auth } from '../model/auth';
->>>>>>>> main:src/dao/readOneByUsername.ts
 
 export const readOneByUsername = async (username: string) => Auth.findOne({ username });

src/dao/readAll.ts

@@ -1,9 +1,3 @@
-import { FilterQuery } from 'mongoose';
+import { readAll } from './auth/readAll';
 
-import { Auth } from '../model/auth';
+export { readAll };
-import { Status } from '../constants/auth';
-import { AuthDocument } from '../schema/auth';
-
-export const readAll = async (query: FilterQuery<AuthDocument> = {}) => Auth.find(query);
-
-export const readAllActive = async () => readAll({ status: { $ne: Status.DELETED } });

src/dao/readOneById.ts

@@ -1,5 +1,3 @@
-import { Types } from 'mongoose';
+import { readOneById } from './auth/readOneById';
 
-import { Auth } from '../model/auth';
+export { readOneById };
-
-export const readOneById = async (id: Types.ObjectId) => Auth.findById(id);