Merge pull request #631 from codex-team/fix/disable-free-plan-reset

quangtuanitmo18 · web-flow · commit a766c2906d7b · 2026-03-02T10:23:12.000+03:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {
diff --git a/src/resolvers/workspace.js b/src/resolvers/workspace.js
@@ -436,7 +436,8 @@ module.exports = {
 
       const defaultPlan = await factories.plansFactory.getDefaultPlan();
 
-      if (workspaceModel.tariffPlanId === defaultPlan.id) {
+      // Prevent re-applying the free plan if workspace is already on it.
+      if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) {
         throw new UserInputError('You already use default plan');
       }
 

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,8 @@ module.exports = {`
`436`	`436`
`437`	`437`	`const defaultPlan = await factories.plansFactory.getDefaultPlan();`
`438`	`438`
`439`		`- if (workspaceModel.tariffPlanId === defaultPlan.id) {`
	`439`	`+ // Prevent re-applying the free plan if workspace is already on it.`
	`440`	`+ if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) {`
`440`	`441`	`throw new UserInputError('You already use default plan');`
`441`	`442`	`}`
`442`	`443`