Fixed the code according to new doc.

krushiraj · krushiraj · commit 40a77ecfbc51 · 2019-10-23T10:52:35.000+05:30
findById was the the function used to find the objects using sequelize by using ID. It has now been changed to findByPk.
diff --git a/.env.example b/.env.example
@@ -2,5 +2,5 @@ DB_USER=root
 DB_PASSWORD=null
 DB_HOST=localhost
 DB_PORT=5432
-DB_NAME=openrank-dev
+DB_NAME=coderplex-org
 JWT_SECRET=jwt-secret
diff --git a/src/models/index.js b/src/models/index.js
@@ -27,8 +27,6 @@ const models = {
   EventProfile: eventProfile(sequelize, Sequelize.DataTypes)
 }
 
-console.log(models)
-
 Object.keys(models).forEach(key => {
   if ('associate' in models[key]) {
     models[key].associate(models)
diff --git a/src/resolvers/authorization.js b/src/resolvers/authorization.js
@@ -17,7 +17,7 @@ export const isSelfDeleteAuth = combineResolvers(
 //   { id },
 //   { models, me },
 // ) => {
-//   const message = await models.Message.findById(id, { raw: true });
+//   const message = await models.Message.findByPk(id, { raw: true });
 
 //   if (message.userId !== me.id) {
 //     throw new ForbiddenError('Not authenticated as owner.');
diff --git a/src/resolvers/user.js b/src/resolvers/user.js
@@ -15,18 +15,24 @@ export default {
   Query: {
     allUsers: async (parent, args, { models }) => {
       const allUsers = await models.User.findAll()
-      console.log(allUsers)
       return allUsers
     },
-    user: async (parent, { id }, { models }) => {
-      return await models.User.findById(id)
+    userById: async (parent, { id }, { models }) => {
+      return await models.User.findByPk(id)
+    },
+    userByEmail: async (parent, { email }, { models }) => {
+      return await models.User.findOne({
+        where: {
+          email
+        }
+      })
     },
     currentUser: async (parent, args, { models, loggedInUser }) => {
       if (!loggedInUser) {
         return null;
       }
 
-      return await models.User.findById(loggedInUser.id);
+      return await models.User.findByPk(loggedInUser.id);
     }
   },
 
@@ -59,7 +65,7 @@ export default {
     updateUser: combineResolvers(
       isAuthenticated,
       async (parent, args, { models, loggedInUser }) => {
-        const user = await models.User.findById(loggedInUser.id);
+        const user = await models.User.findByPk(loggedInUser.id);
         return await user.update({ ...args });
       }
     ),
diff --git a/src/schema/user.js b/src/schema/user.js
@@ -3,7 +3,8 @@ import { gql } from 'apollo-server-express'
 export default gql`
   extend type Query {
     allUsers: [User!]
-    user(id: ID!): User
+    userById(id: ID!): User
+    userByEmail(email: String!): User
     currentUser: User
   }
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ const models = {`
`27`	`27`	`EventProfile: eventProfile(sequelize, Sequelize.DataTypes)`
`28`	`28`	`}`
`29`	`29`
`30`		`-console.log(models)`
`31`		`-`
`32`	`30`	`Object.keys(models).forEach(key => {`
`33`	`31`	`if ('associate' in models[key]) {`
`34`	`32`	`models[key].associate(models)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ import { gql } from 'apollo-server-express'`
`3`	`3`	export default gql`
`4`	`4`	`extend type Query {`
`5`	`5`	`allUsers: [User!]`
`6`		`- user(id: ID!): User`
	`6`	`+ userById(id: ID!): User`
	`7`	`+ userByEmail(email: String!): User`
`7`	`8`	`currentUser: User`
`8`	`9`	`}`
`9`	`10`