fix: set correct defaultValue for JSON fields

This specifies a `defaultValue` for all JSON fields which corresponds with the kind of field (array or object). This fixes empty fields being set to `'{}'` instead of `{}` in the database.
openstad · May 8, 2023 · 3bece85 · 3bece85 · github-actions · May 8, 2023
1 parent 5effe86
commit 3bece85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/model/client.js b/model/client.js
@@ -39,7 +39,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     authTypes: {
       type: DataTypes.JSON,
-      defaultValue: '[]',
+      defaultValue: [],
       allowNull: false,
       get: function () {
         let value = this.getDataValue('authTypes') || [];
@@ -77,6 +77,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     requiredUserFields: {
       type: DataTypes.JSON,
+      defaultValue: [],
       get: function () {
         let value = this.getDataValue('requiredUserFields');
         try {
@@ -95,6 +96,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     allowedDomains: {
       type: DataTypes.JSON,
+      defaultValue: [],
       get: function () {
         let value = this.getDataValue('allowedDomains');
         try {
@@ -113,7 +115,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     config: {
       type: DataTypes.JSON,
-      defaultValue: '{}',
+      defaultValue: {},
       get: function () {
         let value = this.getDataValue('config');
         try {
@@ -132,7 +134,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     twoFactorRoles: {
       type: DataTypes.JSON,
-      defaultValue: '{}',
+      defaultValue: [],
       get: function () {
         let value = this.getDataValue('twoFactorRoles');
         try {

diff --git a/model/user.js b/model/user.js
@@ -41,7 +41,7 @@ module.exports = (db, sequelize, Sequelize) => {
 
     extraData: {
       type: DataTypes.JSON,
-      defaultValue: '{}',
+      defaultValue: {},
       allowNull: false,
       get: function () {
         let value = this.getDataValue('extraData');
@@ -179,4 +179,3 @@ module.exports = (db, sequelize, Sequelize) => {
   return User;
 
 }
-