From ae03aa214b9abbc111131b9ac643818836adbb5a Mon Sep 17 00:00:00 2001 From: ItsAdityaKSingh Date: Mon, 31 Jan 2022 15:20:18 +0530 Subject: [PATCH 1/4] feat: edit start time of beacon --- graphql/resolvers.js | 7 ++++--- graphql/schema.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/graphql/resolvers.js b/graphql/resolvers.js index fb38ae1..bc76932 100644 --- a/graphql/resolvers.js +++ b/graphql/resolvers.js @@ -98,7 +98,7 @@ const resolvers = { createBeacon: async (_, { beacon }, { user }) => { console.log(beacon); - + if (beacon.startsAt>beacon.expiresAt) return Error("Beacon can not expire before it has started."); const beaconDoc = new Beacon({ leader: user.id, shortcode: nanoid(), @@ -113,14 +113,15 @@ const resolvers = { return newBeacon; }, - changeBeaconDuration: async (_, { newExpiresAt, beaconID }, { user }) => { + changeBeaconDuration: async (_, { newStartsAt, newExpiresAt, beaconID }, { user }) => { const beacon = await Beacon.findById(beaconID).populate("leader"); if (!beacon) return new UserInputError("No beacon exists with that id."); if (beacon.leader.id != user.id) return new Error("Only the leader is allowed to change the beacon duration."); - if (beacon.startsAt.getTime() > newExpiresAt) return Error("Beacon can not expire before it has started."); + if (newStartsAt > newExpiresAt) return Error("Beacon can not expire before it has started."); + beacon.startsAt = newStartsAt; beacon.expiresAt = newExpiresAt; await beacon.save(); diff --git a/graphql/schema.js b/graphql/schema.js index b023097..d089597 100644 --- a/graphql/schema.js +++ b/graphql/schema.js @@ -103,7 +103,7 @@ const typeDefs = gql` updateBeaconLocation(id: ID!, location: LocationInput!): Beacon! updateUserLocation(id: ID!, location: LocationInput!): User! changeLeader(beaconID: ID!, newLeaderID: ID!): Beacon! - changeBeaconDuration(newExpiresAt: Float!, beaconID: ID!): Beacon! + changeBeaconDuration(newStartsAt: Float!, newExpiresAt: Float!, beaconID: ID!): Beacon! } type Subscription { From 21e85e6c576f8823a1eb35de567cd45cdf7277aa Mon Sep 17 00:00:00 2001 From: ItsAdityaKSingh Date: Tue, 1 Feb 2022 14:54:18 +0530 Subject: [PATCH 2/4] format --- graphql/resolvers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql/resolvers.js b/graphql/resolvers.js index bc76932..b2c3fad 100644 --- a/graphql/resolvers.js +++ b/graphql/resolvers.js @@ -98,7 +98,7 @@ const resolvers = { createBeacon: async (_, { beacon }, { user }) => { console.log(beacon); - if (beacon.startsAt>beacon.expiresAt) return Error("Beacon can not expire before it has started."); + if (beacon.startsAt > beacon.expiresAt) return Error("Beacon can not expire before it has started."); const beaconDoc = new Beacon({ leader: user.id, shortcode: nanoid(), From 718333720b074f597239a32e19eaa57e41fe259d Mon Sep 17 00:00:00 2001 From: Aditya Kumar Singh Date: Mon, 27 Jun 2022 15:43:36 +0530 Subject: [PATCH 3/4] Update resolvers.js --- graphql/resolvers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql/resolvers.js b/graphql/resolvers.js index f189bb7..801723f 100644 --- a/graphql/resolvers.js +++ b/graphql/resolvers.js @@ -119,7 +119,7 @@ const resolvers = { const beacon = await Beacon.findById(beaconID); if (!beacon) return new UserInputError("No beacon exists with that id."); - if (beacon.leader.id != user.id) + if (beacon.leader != user.id) return new Error("Only the leader is allowed to change the beacon duration."); if (newStartsAt > newExpiresAt) return Error("Beacon can not expire before it has started.") beacon.startsAt = newStartsAt; From 4874c4b186e96bddc108dc8c3946aeaa731030ec Mon Sep 17 00:00:00 2001 From: ItsAdityaKSingh Date: Mon, 27 Jun 2022 15:53:00 +0530 Subject: [PATCH 4/4] formatting fixes --- graphql/resolvers.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/graphql/resolvers.js b/graphql/resolvers.js index 801723f..fc23e02 100644 --- a/graphql/resolvers.js +++ b/graphql/resolvers.js @@ -119,9 +119,8 @@ const resolvers = { const beacon = await Beacon.findById(beaconID); if (!beacon) return new UserInputError("No beacon exists with that id."); - if (beacon.leader != user.id) - return new Error("Only the leader is allowed to change the beacon duration."); - if (newStartsAt > newExpiresAt) return Error("Beacon can not expire before it has started.") + if (beacon.leader != user.id) return new Error("Only the leader is allowed to change the beacon duration."); + if (newStartsAt > newExpiresAt) return Error("Beacon can not expire before it has started."); beacon.startsAt = newStartsAt; beacon.expiresAt = newExpiresAt; await beacon.save();