summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/users/groups
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/endpoints/users/groups
parent.js (diff)
downloadsharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/api/endpoints/users/groups')
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/create.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/delete.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/invite.ts8
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/joined.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/leave.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/owned.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/pull.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/show.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/transfer.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/users/groups/update.ts2
12 files changed, 18 insertions, 18 deletions
diff --git a/packages/backend/src/server/api/endpoints/users/groups/create.ts b/packages/backend/src/server/api/endpoints/users/groups/create.ts
index 9f6d8464d8..fc775d7cc1 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/create.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/create.ts
@@ -33,7 +33,7 @@ export default define(meta, paramDef, async (ps, user) => {
createdAt: new Date(),
userId: user.id,
name: ps.name,
- } as UserGroup).then(x => UserGroups.findOneOrFail(x.identifiers[0]));
+ } as UserGroup).then(x => UserGroups.findOneByOrFail(x.identifiers[0]));
// Push the owner
await UserGroupJoinings.insert({
diff --git a/packages/backend/src/server/api/endpoints/users/groups/delete.ts b/packages/backend/src/server/api/endpoints/users/groups/delete.ts
index f4898a3c7c..f68006994c 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/delete.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/delete.ts
@@ -28,7 +28,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
index efbdf968f6..75c1acc302 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts
@@ -31,7 +31,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch the invitation
- const invitation = await UserGroupInvitations.findOne({
+ const invitation = await UserGroupInvitations.findOneBy({
id: ps.invitationId,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
index fe5d431eab..46bc780ab0 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invitations/reject.ts
@@ -29,7 +29,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch the invitation
- const invitation = await UserGroupInvitations.findOne({
+ const invitation = await UserGroupInvitations.findOneBy({
id: ps.invitationId,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invite.ts b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
index 10bfb7eca1..30a5beb1d9 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invite.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
@@ -52,7 +52,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
userId: me.id,
});
@@ -67,7 +67,7 @@ export default define(meta, paramDef, async (ps, me) => {
throw e;
});
- const joining = await UserGroupJoinings.findOne({
+ const joining = await UserGroupJoinings.findOneBy({
userGroupId: userGroup.id,
userId: user.id,
});
@@ -76,7 +76,7 @@ export default define(meta, paramDef, async (ps, me) => {
throw new ApiError(meta.errors.alreadyAdded);
}
- const existInvitation = await UserGroupInvitations.findOne({
+ const existInvitation = await UserGroupInvitations.findOneBy({
userGroupId: userGroup.id,
userId: user.id,
});
@@ -90,7 +90,7 @@ export default define(meta, paramDef, async (ps, me) => {
createdAt: new Date(),
userId: user.id,
userGroupId: userGroup.id,
- } as UserGroupInvitation).then(x => UserGroupInvitations.findOneOrFail(x.identifiers[0]));
+ } as UserGroupInvitation).then(x => UserGroupInvitations.findOneByOrFail(x.identifiers[0]));
// 通知を作成
createNotification(user.id, 'groupInvited', {
diff --git a/packages/backend/src/server/api/endpoints/users/groups/joined.ts b/packages/backend/src/server/api/endpoints/users/groups/joined.ts
index e52de78595..77dc59d3e5 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/joined.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/joined.ts
@@ -28,11 +28,11 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
- const ownedGroups = await UserGroups.find({
+ const ownedGroups = await UserGroups.findBy({
userId: me.id,
});
- const joinings = await UserGroupJoinings.find({
+ const joinings = await UserGroupJoinings.findBy({
userId: me.id,
...(ownedGroups.length > 0 ? {
userGroupId: Not(In(ownedGroups.map(x => x.id))),
diff --git a/packages/backend/src/server/api/endpoints/users/groups/leave.ts b/packages/backend/src/server/api/endpoints/users/groups/leave.ts
index c1a8c2c024..33abd5439f 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/leave.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/leave.ts
@@ -35,7 +35,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/owned.ts b/packages/backend/src/server/api/endpoints/users/groups/owned.ts
index 11aad0f73c..b1289e601f 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/owned.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/owned.ts
@@ -27,7 +27,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
- const userGroups = await UserGroups.find({
+ const userGroups = await UserGroups.findBy({
userId: me.id,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/pull.ts b/packages/backend/src/server/api/endpoints/users/groups/pull.ts
index 55ec9f915b..b31990b2e3 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/pull.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/pull.ts
@@ -43,7 +43,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
userId: me.id,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/show.ts b/packages/backend/src/server/api/endpoints/users/groups/show.ts
index 28ca1162c8..3ffb0f5ba9 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/show.ts
@@ -35,7 +35,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
});
@@ -43,7 +43,7 @@ export default define(meta, paramDef, async (ps, me) => {
throw new ApiError(meta.errors.noSuchGroup);
}
- const joining = await UserGroupJoinings.findOne({
+ const joining = await UserGroupJoinings.findOneBy({
userId: me.id,
userGroupId: userGroup.id,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
index f48e1ddbf0..41ceee3b2e 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
@@ -49,7 +49,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
userId: me.id,
});
@@ -64,7 +64,7 @@ export default define(meta, paramDef, async (ps, me) => {
throw e;
});
- const joining = await UserGroupJoinings.findOne({
+ const joining = await UserGroupJoinings.findOneBy({
userGroupId: userGroup.id,
userId: user.id,
});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/update.ts b/packages/backend/src/server/api/endpoints/users/groups/update.ts
index b3e17dfd9e..1016aa8926 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/update.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/update.ts
@@ -36,7 +36,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, me) => {
// Fetch the group
- const userGroup = await UserGroups.findOne({
+ const userGroup = await UserGroups.findOneBy({
id: ps.groupId,
userId: me.id,
});