btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

feat: user-settings schema update and relative service file modified

Browse Source
This commit is contained in:
Mir Arif Hasan
2022-12-23 13:13:21 +06:00
parent 9b5734f2ff
commit b31e54b3e5
5 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/hoppscotch-backend/src/user-settings/user-settings.service.ts
View File

@@ -6,7 +6,7 @@ import * as E from 'fp-ts/Either';
import { stringToJson } from 'src/utils';
import { UserSettings } from './user-settings.model';
import {
USER_NOT_FOUND,
USER_SETTINGS_EXIST,
USER_SETTINGS_INVALID_PROPERTIES,
USER_SETTINGS_NOT_FOUND,
} from 'src/errors';
@@ -31,7 +31,7 @@ export class UserSettingsService {
const settings: UserSettings = {
...userSettings,
properties: JSON.stringify(userSettings.properties),
userSettings: JSON.stringify(userSettings.settings),
};
return E.right(settings);
@@ -46,28 +46,28 @@ export class UserSettingsService {
* @param properties User setting properties
* @returns an Either of `UserSettings` or error
*/
async createUserSettings(user: User, properties: string) {
if (!properties) return E.left(USER_SETTINGS_INVALID_PROPERTIES);
async createUserSettings(user: User, settingsString: string) {
if (!settingsString) return E.left(USER_SETTINGS_INVALID_PROPERTIES);
const settingsObject = stringToJson(properties);
const settingsObject = stringToJson(settingsString);
if (E.isLeft(settingsObject)) return E.left(settingsObject.left);
try {
const userSettings = await this.prisma.userSettings.create({
data: {
properties: settingsObject.right,
settings: settingsObject.right,
userUid: user.uid,
},
});
const settings: UserSettings = {
...userSettings,
properties: JSON.stringify(userSettings.properties),
userSettings: JSON.stringify(userSettings.settings),
};
return E.right(settings);
} catch (e) {
return E.left(USER_NOT_FOUND);
return E.left(USER_SETTINGS_EXIST);
}
}
@@ -77,23 +77,23 @@ export class UserSettingsService {
* @param properties
* @returns
*/
async updateUserSettings(user: User, properties: string) {
if (!properties) return E.left(USER_SETTINGS_INVALID_PROPERTIES);
async updateUserSettings(user: User, settingsString: string) {
if (!settingsString) return E.left(USER_SETTINGS_INVALID_PROPERTIES);
const settingsObject = stringToJson(properties);
const settingsObject = stringToJson(settingsString);
if (E.isLeft(settingsObject)) return E.left(settingsObject.left);
try {
const updatedUserSettings = await this.prisma.userSettings.update({
where: { userUid: user.uid },
data: {
properties: settingsObject.right,
settings: settingsObject.right,
},
});
const settings: UserSettings = {
...updatedUserSettings,
properties: JSON.stringify(updatedUserSettings.properties),
userSettings: JSON.stringify(updatedUserSettings.settings),
};
// Publish subscription for environment creation