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

feat: db column update from settings to properties

Browse Source
This commit is contained in:
Mir Arif Hasan
2023-01-23 20:25:48 +06:00
parent dcadbac4d5
commit bfac3f8ad0
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/hoppscotch-backend/prisma/schema.prisma
View File

@@ -88,11 +88,11 @@ model User {
} }
model UserSettings { model UserSettings {
id String @id @default(cuid()) id String @id @default(cuid())
userUid String @unique userUid String @unique
user User @relation(fields: [userUid], references: [uid], onDelete: Cascade) user User @relation(fields: [userUid], references: [uid], onDelete: Cascade)
settings Json properties Json
updatedOn DateTime @updatedAt @db.Timestamp(3) updatedOn DateTime @updatedAt @db.Timestamp(3)
} }
model UserEnvironment { model UserEnvironment {

2
packages/hoppscotch-backend/src/user-settings/user-settings.model.ts
View File

@@ -15,7 +15,7 @@ export class UserSettings {
@Field({ @Field({
description: 'Stringified JSON settings object', description: 'Stringified JSON settings object',
}) })
userSettings: string; // JSON string of the userSettings object (format:[{ key: "background", value: "system" }, ...] ) which will be received from the client properties: string; // JSON string of the userSettings object (format:[{ key: "background", value: "system" }, ...] ) which will be received from the client
@Field({ @Field({
description: 'Last updated on', description: 'Last updated on',

12
packages/hoppscotch-backend/src/user-settings/user-settings.resolver.ts
View File

@@ -25,13 +25,13 @@ export class UserSettingsResolver {
async createUserSettings( async createUserSettings(
@GqlUser() user: User, @GqlUser() user: User,
@Args({ @Args({
name: 'userSettings', name: 'properties',
description: 'Stringified JSON settings object', description: 'Stringified JSON settings object',
}) })
userSettings: string, properties: string,
) { ) {
const createdUserSettings = const createdUserSettings =
await this.userSettingsService.createUserSettings(user, userSettings); await this.userSettingsService.createUserSettings(user, properties);
if (E.isLeft(createdUserSettings)) throwErr(createdUserSettings.left); if (E.isLeft(createdUserSettings)) throwErr(createdUserSettings.left);
return createdUserSettings.right; return createdUserSettings.right;
@@ -44,13 +44,13 @@ export class UserSettingsResolver {
async updateUserSettings( async updateUserSettings(
@GqlUser() user: User, @GqlUser() user: User,
@Args({ @Args({
name: 'userSettings', name: 'properties',
description: 'Stringified JSON settings object', description: 'Stringified JSON settings object',
}) })
userSettings: string, properties: string,
) { ) {
const updatedUserSettings = const updatedUserSettings =
await this.userSettingsService.updateUserSettings(user, userSettings); await this.userSettingsService.updateUserSettings(user, properties);
if (E.isLeft(updatedUserSettings)) throwErr(updatedUserSettings.left); if (E.isLeft(updatedUserSettings)) throwErr(updatedUserSettings.left);
return updatedUserSettings.right; return updatedUserSettings.right;

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

@@ -21,7 +21,7 @@ export class UserSettingsService {
/** /**
* Fetch user setting for a given user * Fetch user setting for a given user
* @param user User object * @param user User object
* @returns an Either of `UserSettings` or error * @returns Promise of an Either of `UserSettings` or error
*/ */
async fetchUserSettings(user: User) { async fetchUserSettings(user: User) {
try { try {
@@ -31,9 +31,8 @@ export class UserSettingsService {
const settings: UserSettings = { const settings: UserSettings = {
...userSettings, ...userSettings,
userSettings: JSON.stringify(userSettings.settings), properties: JSON.stringify(userSettings.properties),
}; };
delete (settings as any).settings;
return E.right(settings); return E.right(settings);
} catch (e) { } catch (e) {
@@ -44,28 +43,30 @@ export class UserSettingsService {
/** /**
* Create user setting for a given user * Create user setting for a given user
* @param user User object * @param user User object
* @param properties User setting properties * @param properties stringified user settings properties
* @returns an Either of `UserSettings` or error * @returns an Either of `UserSettings` or error
*/ */
async createUserSettings(user: User, settingsString: string) { async createUserSettings(user: User, properties: string) {
if (!settingsString) return E.left(USER_SETTINGS_NULL_SETTINGS); if (!properties) return E.left(USER_SETTINGS_NULL_SETTINGS);
const settingsObject = stringToJson(settingsString); const jsonProperties = stringToJson(properties);
if (E.isLeft(settingsObject)) return E.left(settingsObject.left); if (E.isLeft(jsonProperties)) return E.left(jsonProperties.left);
try { try {
const userSettings = await this.prisma.userSettings.create({ const userSettings = await this.prisma.userSettings.create({
data: { data: {
settings: settingsObject.right, properties: jsonProperties.right,
userUid: user.uid, userUid: user.uid,
}, },
}); });
const settings: UserSettings = { const settings: UserSettings = {
...userSettings, ...userSettings,
userSettings: JSON.stringify(userSettings.settings), properties: JSON.stringify(userSettings.properties),
}; };
delete (settings as any).settings;
// Publish subscription for environment creation
await this.pubsub.publish(`user_settings/${user.uid}/created`, settings);
return E.right(settings); return E.right(settings);
} catch (e) { } catch (e) {
@@ -76,28 +77,27 @@ export class UserSettingsService {
/** /**
* Update user setting for a given user * Update user setting for a given user
* @param user User object * @param user User object
* @param properties * @param properties stringified user settings
* @returns * @returns Promise of an Either of `UserSettings` or error
*/ */
async updateUserSettings(user: User, settingsString: string) { async updateUserSettings(user: User, properties: string) {
if (!settingsString) return E.left(USER_SETTINGS_NULL_SETTINGS); if (!properties) return E.left(USER_SETTINGS_NULL_SETTINGS);
const settingsObject = stringToJson(settingsString); const jsonProperties = stringToJson(properties);
if (E.isLeft(settingsObject)) return E.left(settingsObject.left); if (E.isLeft(jsonProperties)) return E.left(jsonProperties.left);
try { try {
const updatedUserSettings = await this.prisma.userSettings.update({ const updatedUserSettings = await this.prisma.userSettings.update({
where: { userUid: user.uid }, where: { userUid: user.uid },
data: { data: {
settings: settingsObject.right, properties: jsonProperties.right,
}, },
}); });
const settings: UserSettings = { const settings: UserSettings = {
...updatedUserSettings, ...updatedUserSettings,
userSettings: JSON.stringify(updatedUserSettings.settings), properties: JSON.stringify(updatedUserSettings.properties),
}; };
delete (settings as any).settings;
// Publish subscription for environment creation // Publish subscription for environment creation
await this.pubsub.publish(`user_settings/${user.uid}/updated`, settings); await this.pubsub.publish(`user_settings/${user.uid}/updated`, settings);