From 280d16f3d9230024126c8f504e3cbf8d3b9e41e2 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Sun, 19 Mar 2023 13:39:06 +0300
Subject: [PATCH] chore: Use luxon instead moment as date utility

---
 packages/backend/package.json       | 1 -
 packages/backend/src/models/user.ts | 4 ++--
 yarn.lock                           | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2c0ed6e8..a3e2a4db 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -54,7 +54,6 @@
     "lodash.get": "^4.4.2",
     "luxon": "2.5.2",
     "memory-cache": "^0.2.0",
-    "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "multer": "1.4.5-lts.1",
     "nodemailer": "6.7.0",
diff --git a/packages/backend/src/models/user.ts b/packages/backend/src/models/user.ts
index fc880ab5..bac17b40 100644
--- a/packages/backend/src/models/user.ts
+++ b/packages/backend/src/models/user.ts
@@ -1,5 +1,5 @@
 import { QueryContext, ModelOptions } from 'objection';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import appConfig from '../config/app';
 import Base from './base';
 import Connection from './connection';
@@ -137,7 +137,7 @@ class User extends Base {
   }
 
   async startTrialPeriod() {
-    this.trialExpiryDate = moment().add(30, 'days').calendar();
+    this.trialExpiryDate = DateTime.now().plus({ days: 30 }).toFormat('D');
   }
 
   async $beforeInsert(queryContext: QueryContext) {
diff --git a/yarn.lock b/yarn.lock
index c5bc147b..2a0b5d32 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12251,11 +12251,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"