Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 79f73ba

Browse filesBrowse files
albertcitoalbertcito
authored
Merge pull request #122 from albertcito/feature/119-finr-or-fail
replace findOne for FindOFail
2 parents 9b21b1f + 29ff332 commit 79f73ba
Copy full SHA for 79f73ba

File tree

14 files changed

+14
-82
lines changed
Filter options

14 files changed

+14
-82
lines changed

‎src/controllers/langs/LangController.ts

Copy file name to clipboard
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import { __ } from 'i18n';
21
import {
32
Controller, Param, Get, Authorized,
43
} from 'routing-controllers';
54

65
import Lang from 'src/db/entities/Lang';
76
import Paginate from 'src/util/db/paginate';
8-
import MessageError from 'src/util/exceptions/MessageError';
97
import roles from 'src/logic/role/role.enum';
108

119
@Controller()
@@ -18,10 +16,6 @@ export default class LangController {
1816

1917
@Get('/langs/:langID')
2018
async getOne(@Param('langID') langID: string) {
21-
const lang = await Lang.findOne(langID);
22-
if (!lang) {
23-
throw new MessageError(__('The item %s does not exists', langID));
24-
}
25-
return lang;
19+
return Lang.findOneOrFail(langID);
2620
}
2721
}

‎src/graphql/resolvers/lang/lang.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/lang/lang.ts
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Query, Arg,
43
} from 'type-graphql';
54

65
import Lang from 'src/db/entities/Lang';
7-
import MessageError from 'src/util/exceptions/MessageError';
86
import Validate from 'src/util/validatorjs/validateGraphQL';
97

108
@Resolver()
119
class LangResolver {
1210
@Query(() => Lang)
1311
@Validate({ id: 'required|string' })
1412
async lang(@Arg('id') id: string): Promise<Lang> {
15-
const lang = await Lang.findOne(id);
16-
if (!lang) {
17-
throw new MessageError(__('The item %s does not exists', id));
18-
}
19-
return lang;
13+
return Lang.findOneOrFail(id);
2014
}
2115
}
2216

‎src/graphql/resolvers/lang/update.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/lang/update.ts
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
import MessageResponse from 'src/graphql/type/MessageResponse';
88
import MessageType from 'src/graphql/type/MessageType.enum';
99
import Lang from 'src/db/entities/Lang';
10-
import MessageError from 'src/util/exceptions/MessageError';
1110
import isAuth from 'src/util/graphql/isAuth';
1211
import Validate from 'src/util/validatorjs/validateGraphQL';
1312

@@ -32,10 +31,7 @@ class LangUpdateResolver {
3231
@Arg('active', { nullable: true }) active: boolean,
3332
@Arg('isBlocked', { nullable: true }) isBlocked: boolean,
3433
): Promise<LangUpdateResponse> {
35-
const lang = await Lang.findOne(id);
36-
if (!lang) {
37-
throw new MessageError(__('The item %s does not exists', id));
38-
}
34+
const lang = await Lang.findOneOrFail(id);
3935
lang.name = name;
4036
lang.localname = localname;
4137
if (isBlocked) {

‎src/graphql/resolvers/role/role.ts

Copy file name to clipboard
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Query, Arg,
43
} from 'type-graphql';
54

65
import Role from 'src/db/entities/Role';
7-
import MessageError from 'src/util/exceptions/MessageError';
86
import Validate from 'src/util/validatorjs/validateGraphQL';
97
import roles from 'src/logic/role/role.enum';
108

@@ -15,10 +13,6 @@ export default class RoleResolver {
1513
async role(
1614
@Arg('id', () => roles) id: roles,
1715
): Promise<Role> {
18-
const role = await Role.findOne(id);
19-
if (!role) {
20-
throw new MessageError(__('The item %s does not exists', `${id}`));
21-
}
22-
return role;
16+
return Role.findOneOrFail(id);
2317
}
2418
}

‎src/graphql/resolvers/role/update.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/role/update.ts
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
import MessageResponse from 'src/graphql/type/MessageResponse';
88
import MessageType from 'src/graphql/type/MessageType.enum';
99
import Role from 'src/db/entities/Role';
10-
import MessageError from 'src/util/exceptions/MessageError';
1110
import roles from 'src/logic/role/role.enum';
1211
import isAuthRolesGraphQL from 'src/util/graphql/isAuthRolesGraphQL';
1312

@@ -23,10 +22,7 @@ class RoleUpdateResolver {
2322
@Arg('nameID', () => Int) nameID: number,
2423
@Arg('descriptionID', () => Int) descriptionID: number,
2524
): Promise<RoleUpdateResponse> {
26-
const role = await Role.findOne(id);
27-
if (!role) {
28-
throw new MessageError(__('The item %s does not exists', id));
29-
}
25+
const role = await Role.findOneOrFail(id);
3026
role.nameID = nameID;
3127
role.descriptionID = descriptionID;
3228
await role.save();

‎src/graphql/resolvers/translation/delete.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/translation/delete.ts
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ class TranslationDeleteResolver {
1717
@isAuthRolesGraphQL([roles.superAdmin, roles.admin])
1818
@Mutation(() => MessageField)
1919
async translationDelete(@Arg('id', () => Int) id: number): Promise<MessageField> {
20-
const translation = await Translation.findOne(id);
21-
if (!translation) {
22-
throw new MessageError(__('The item %s does not exists', `${id}`));
23-
}
20+
const translation = await Translation.findOneOrFail(id);
2421

2522
if (translation.isBlocked && !isSuperAdmin(Auth.session().user.roles)) {
2623
throw new MessageError(__('The item %s is blocked, only a super admin can modify it', `${id}`));

‎src/graphql/resolvers/translation/translation.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/translation/translation.ts
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Query, Arg, Int,
43
} from 'type-graphql';
54

65
import Translation from 'src/db/entities/Translation';
7-
import MessageError from 'src/util/exceptions/MessageError';
86

97
@Resolver()
108
class TranslationResolver {
119
@Query(() => Translation)
1210
async translation(@Arg('id', () => Int) id: number): Promise<Translation> {
13-
const translation = await Translation.findOne(id);
14-
if (!translation) {
15-
throw new MessageError(__('The item %s does not exists', `${id}`));
16-
}
17-
return translation;
11+
return Translation.findOneOrFail(id);
1812
}
1913
}
2014

‎src/graphql/resolvers/translation/update.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/translation/update.ts
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import MessageResponse from 'src/graphql/type/MessageResponse';
99
import Translation from 'src/db/entities/Translation';
1010
import TranslationUpdate from 'src/logic/translation/TranslationUpdate';
1111
import TextsUpdateEmpty from 'src/logic/translation/TextsUpdateEmpty';
12-
import MessageError from 'src/util/exceptions/MessageError';
1312
import roles from 'src/logic/role/role.enum';
1413
import isAuthRolesGraphQL from 'src/util/graphql/isAuthRolesGraphQL';
1514
import Auth from 'src/util/session/Auth';
@@ -29,10 +28,7 @@ export default class TranslationUpdateResolver {
2928
@Arg('code', { nullable: true }) code: string,
3029
@Arg('isBlocked', { nullable: true }) isBlocked: boolean,
3130
): Promise<TranslationUpdateResponse> {
32-
const translation = await Translation.findOne(id);
33-
if (!translation) {
34-
throw new MessageError(__('The item %s does not exists', `${id}`));
35-
}
31+
const translation = await Translation.findOneOrFail(id);
3632

3733
if (translation.isBlocked && !isSuperAdmin(Auth.session().user.roles)) {
3834
await (new TextsUpdateEmpty(translation.id)).save(texts);

‎src/graphql/resolvers/user/role/userRoleUpdate.ts

Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Mutation, Arg, Int,
43
} from 'type-graphql';
54

65
import MessageField from 'src/graphql/type/MessageField';
76
import User from 'src/db/entities/User';
8-
import MessageError from 'src/util/exceptions/MessageError';
97
import UserRolesUpdate from 'src/logic/user/role/UserRolesUpdate';
108
import roles from 'src/logic/role/role.enum';
119
import isAuthRolesGraphQL from 'src/util/graphql/isAuthRolesGraphQL';
@@ -18,10 +16,7 @@ export default class UserRoleUpdateResolver {
1816
@Arg('rolesID', () => [String]) rolesID: roles[],
1917
@Arg('userID', () => Int) userID: number,
2018
): Promise<MessageField> {
21-
const user = await User.findOne(userID);
22-
if (!user) {
23-
throw new MessageError(__('The item %s does not exists', `${user}`));
24-
}
19+
const user = await User.findOneOrFail(userID);
2520
return (new UserRolesUpdate(user)).save(rolesID);
2621
}
2722
}

‎src/graphql/resolvers/user/session/userUpdateEmail.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/user/session/userUpdateEmail.ts
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66

77
import MessageResponse from '../../../type/MessageResponse';
88
import MessageType from '../../../type/MessageType.enum';
9-
import MessageError from 'src/util/exceptions/MessageError';
109
import User from 'src/db/entities/User';
1110
import UserUpdateEmail from 'src/logic/user/session/UserUpdateEmail';
1211
import roles from 'src/logic/role/role.enum';
@@ -24,10 +23,7 @@ class UserUpdateEmailResolver {
2423
@Arg('id', () => Int) id: number,
2524
@Arg('email', () => String) email: string,
2625
): Promise<UserUpdateEmailResponse> {
27-
const user = await User.findOne(id);
28-
if (!user) {
29-
throw new MessageError(__('The item %s does not exists', `${id}`));
30-
}
26+
const user = await User.findOneOrFail(id);
3127
const updateEmail = new UserUpdateEmail(user);
3228
await Transaction.run(() => updateEmail.update(email));
3329
return {

‎src/graphql/resolvers/user/session/userUpdatePassword.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/user/session/userUpdatePassword.ts
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { __ } from 'i18n';
66

77
import MessageResponse from '../../../type/MessageResponse';
88
import MessageType from '../../../type/MessageType.enum';
9-
import MessageError from 'src/util/exceptions/MessageError';
109
import User from 'src/db/entities/User';
1110
import UserUpdatePassword from 'src/logic/user/session/UserUpdatePassword';
1211
import roles from 'src/logic/role/role.enum';
@@ -24,10 +23,7 @@ class UserUpdatePasswordResolver {
2423
@Arg('id', () => Int) id: number,
2524
@Arg('password', () => String) password: string,
2625
): Promise<UserUpdatePasswordResponse> {
27-
const user = await User.findOne(id);
28-
if (!user) {
29-
throw new MessageError(__('The item %s does not exists', `${id}`));
30-
}
26+
const user = await User.findOneOrFail(id);
3127
await Transaction.run(() => (new UserUpdatePassword(user)).update(password));
3228
return {
3329
data: user,

‎src/graphql/resolvers/user/status/userStatusUpdate.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/user/status/userStatusUpdate.ts
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Mutation, Arg, Int,
43
} from 'type-graphql';
54

65
import User from 'src/db/entities/User';
7-
import MessageError from 'src/util/exceptions/MessageError';
86
import MessageField from 'src/graphql/type/MessageField';
97
import UserStatusUpdate from 'src/logic/user/status/UserStatusUpdate';
108
import userStatus from 'src/logic/userStatus/userStatus.enum';
@@ -20,10 +18,7 @@ export default class UserStatusUpdateResolver {
2018
@Arg('reason', () => String) reason: string,
2119
@Arg('userID', () => Int) userID: number,
2220
): Promise<MessageField> {
23-
const user = await User.findOne(userID);
24-
if (!user) {
25-
throw new MessageError(__('The item %s does not exists', `${user}`));
26-
}
21+
const user = await User.findOneOrFail(userID);
2722
return (new UserStatusUpdate(user)).save(userStatusID, reason);
2823
}
2924
}

‎src/graphql/resolvers/user/user.ts

Copy file name to clipboardExpand all lines: src/graphql/resolvers/user/user.ts
+1-7Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import { __ } from 'i18n';
21
import {
32
Resolver, Query, UseMiddleware, Arg, Int,
43
} from 'type-graphql';
54

65
import isAuth from 'src/util/graphql/isAuth';
7-
import MessageError from 'src/util/exceptions/MessageError';
86
import User from 'src/db/entities/User';
97

108
@Resolver()
@@ -14,11 +12,7 @@ class UserResolver {
1412
async user(
1513
@Arg('id', () => Int, { defaultValue: 1, nullable: true }) id: number,
1614
): Promise<User> {
17-
const user = await User.findOne(id);
18-
if (!user) {
19-
throw new MessageError(__('The item %s does not exists', `${id}`));
20-
}
21-
return user;
15+
return User.findOneOrFail(id);
2216
}
2317
}
2418

‎src/logic/user/session/ForgotPassword.ts

Copy file name to clipboardExpand all lines: src/logic/user/session/ForgotPassword.ts
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import { __ } from 'i18n';
21
import { arg, validateClass } from 'validatorjs-decorator/dist';
32

43
import User from 'src/db/entities/User';
54
import UserTokenEntity from 'src/db/entities/UserToken';
6-
import MessageError from 'src/util/exceptions/MessageError';
75
import UserTypeEnum from './UserTokenEnum';
86
import UserToken from './UserToken';
97
import Email from 'src/util/email/Email';
@@ -17,10 +15,7 @@ class ForgotPassword {
1715
}
1816

1917
async getToken(): Promise<UserTokenEntity> {
20-
const user = await User.findOne({ where: { email: this.email } });
21-
if (!user) {
22-
throw new MessageError(__('The item %s does not exists', this.email));
23-
}
18+
const user = await User.findOneOrFail({ where: { email: this.email } });
2419
const userToken = new UserToken(user.id);
2520
const token = await userToken.newToken(48, UserTypeEnum.RECOVERY_PASSWORD);
2621
return token;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.