From ec61e29fb0afb6241ebcf5cb2d58f9463b1ff5c9 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Fri, 26 May 2023 17:46:37 -0400
Subject: [PATCH] Tweaks and mergefail fixes

---
 src/dao/auth/readOneByRecord.ts   |  4 ----
 src/dao/auth/readOneByUsername.ts |  4 ----
 src/dao/readAll.ts                | 10 ++--------
 src/dao/readOneById.ts            |  6 ++----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/dao/auth/readOneByRecord.ts b/src/dao/auth/readOneByRecord.ts
index 2674fa0..ba5649b 100644
--- a/src/dao/auth/readOneByRecord.ts
+++ b/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 });
diff --git a/src/dao/auth/readOneByUsername.ts b/src/dao/auth/readOneByUsername.ts
index fdff465..380f05b 100644
--- a/src/dao/auth/readOneByUsername.ts
+++ b/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 });
diff --git a/src/dao/readAll.ts b/src/dao/readAll.ts
index 9abbdf6..d764c19 100644
--- a/src/dao/readAll.ts
+++ b/src/dao/readAll.ts
@@ -1,9 +1,3 @@
-import { FilterQuery } from 'mongoose';
+import { readAll } from './auth/readAll';
 
-import { Auth } from '../model/auth';
-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 } });
+export { readAll };
diff --git a/src/dao/readOneById.ts b/src/dao/readOneById.ts
index d8aee08..25f451a 100644
--- a/src/dao/readOneById.ts
+++ b/src/dao/readOneById.ts
@@ -1,5 +1,3 @@
-import { Types } from 'mongoose';
+import { readOneById } from './auth/readOneById';
 
-import { Auth } from '../model/auth';
-
-export const readOneById = async (id: Types.ObjectId) => Auth.findById(id);
+export { readOneById };