Update settingController.ts

aelassas · Nov 14, 2024 · caf20b0 · caf20b0
1 parent 851cb37
commit caf20b0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/api/src/controllers/orderController.ts b/api/src/controllers/orderController.ts
@@ -131,7 +131,7 @@ export const checkout = async (req: Request, res: Response) => {
     //   throw new Error(`Admin user ${env.ADMIN_EMAIL} not found`)
     // }
 
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
     if (!settings) {
       throw new Error('Settings not found')
     }
@@ -301,7 +301,7 @@ export const update = async (req: Request, res: Response) => {
       // user confirmation email
       const _user = order.user as env.User
 
-      const settings = await Setting.findOne()
+      const settings = await Setting.findOne({})
       if (!settings) {
         throw new Error('Settings not found')
       }

diff --git a/api/src/controllers/settingController.ts b/api/src/controllers/settingController.ts
@@ -13,7 +13,7 @@ import Setting from '../models/Setting'
  */
 export const init = async () => {
   try {
-    const count = await Setting.findOne().countDocuments()
+    const count = await Setting.findOne({}).countDocuments()
 
     if (count === 0) {
       await new Setting().save()
@@ -36,7 +36,7 @@ export const init = async () => {
  */
 export const getLanguage = async (req: Request, res: Response) => {
   try {
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     return res.json(settings?.language || env.DEFAULT_LANGUAGE)
   } catch (err) {
@@ -55,7 +55,7 @@ export const getLanguage = async (req: Request, res: Response) => {
  */
 export const getCurrency = async (req: Request, res: Response) => {
   try {
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     return res.json(settings?.currency || env.DEFAULT_CURRENCY)
   } catch (err) {
@@ -74,7 +74,7 @@ export const getCurrency = async (req: Request, res: Response) => {
  */
 export const getStripeCurrency = async (req: Request, res: Response) => {
   try {
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     return res.json(settings?.stripeCurrency || env.DEFAULT_STRIPE_CURRENCY)
   } catch (err) {
@@ -93,7 +93,7 @@ export const getStripeCurrency = async (req: Request, res: Response) => {
  */
 export const getSettings = async (req: Request, res: Response) => {
   try {
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     return res.json(settings)
   } catch (err) {
@@ -113,7 +113,7 @@ export const getSettings = async (req: Request, res: Response) => {
 export const updateSettings = async (req: Request, res: Response) => {
   try {
     const { language, currency, stripeCurrency }: wexcommerceTypes.UpdateSettingsPayload = req.body
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     if (settings) {
       settings.language = language
@@ -143,7 +143,7 @@ export const updateSettings = async (req: Request, res: Response) => {
 export const updateBankSettings = async (req: Request, res: Response) => {
   try {
     const { bankName, accountHolder, rib, iban }: wexcommerceTypes.UpdateBankSettingsPayload = req.body
-    const settings = await Setting.findOne()
+    const settings = await Setting.findOne({})
 
     if (settings) {
       settings.bankName = bankName

diff --git a/api/src/controllers/stripeController.ts b/api/src/controllers/stripeController.ts
@@ -173,7 +173,7 @@ export const checkCheckoutSession = async (req: Request, res: Response) => {
       user.expireAt = undefined
       await user.save()
 
-      const settings = await Setting.findOne()
+      const settings = await Setting.findOne({})
       if (!settings) {
         throw new Error('Settings not found')
       }

diff --git a/api/tests/setting.test.ts b/api/tests/setting.test.ts
@@ -38,13 +38,13 @@ afterAll(async () => {
 describe('Initialize settings', () => {
   it('should initialize settings', async () => {
     // init
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     await Setting.deleteMany({})
 
     // test success
     let res = await settingController.init()
     expect(res).toBeTruthy()
-    const count = await Setting.findOne().countDocuments()
+    const count = await Setting.findOne({}).countDocuments()
     expect(count).toBe(1)
 
     // restore
@@ -79,7 +79,7 @@ describe('GET /api/language', () => {
     expect(res.body).toBeDefined()
 
     // test default value
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     await Setting.deleteMany({})
     res = await request(app)
       .get('/api/language')
@@ -117,7 +117,7 @@ describe('GET /api/currency', () => {
     expect(res.body).toBeDefined()
 
     // test default value
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     await Setting.deleteMany({})
     res = await request(app)
       .get('/api/currency')
@@ -155,7 +155,7 @@ describe('GET /api/stripe-currency', () => {
     expect(res.body).toBeDefined()
 
     // test default value
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     await Setting.deleteMany({})
     res = await request(app)
       .get('/api/stripe-currency')
@@ -202,7 +202,7 @@ describe('PUT /api/update-settings', () => {
     const token = await testHelper.signinAsAdmin()
 
     // init
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     expect(settings).toBeTruthy()
     const {
       language,
@@ -226,7 +226,7 @@ describe('PUT /api/update-settings', () => {
       .set(env.X_ACCESS_TOKEN, token)
       .send(payload)
     expect(res.statusCode).toBe(200)
-    const _settings = await Setting.findOne()
+    const _settings = await Setting.findOne({})
     expect(_settings).toBeTruthy()
     expect(_settings!.language).toBe('fr')
     expect(_settings!.currency).toBe('€')
@@ -257,7 +257,7 @@ describe('PUT /api/update-bank-settings', () => {
     const token = await testHelper.signinAsAdmin()
 
     // init
-    const settings = await Setting.findOne().lean()
+    const settings = await Setting.findOne({}).lean()
     expect(settings).toBeTruthy()
     const {
       language,
@@ -282,7 +282,7 @@ describe('PUT /api/update-bank-settings', () => {
       .set(env.X_ACCESS_TOKEN, token)
       .send(payload)
     expect(res.statusCode).toBe(200)
-    const _settings = await Setting.findOne()
+    const _settings = await Setting.findOne({})
     expect(_settings).toBeTruthy()
     expect(_settings!.bankName).toBe('BANK_NAME')
     expect(_settings!.accountHolder).toBe('ACCOUNT_HOLDER')