Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Mar 9, 2021. It is now read-only.

Commit 3363429

Browse files
krushirajkrushiraj
committed
Made changes to base user model and documented necessary parts of code
1 parent 922b008 commit 3363429

20 files changed

+269
-258
lines changed

‎.env.example

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
# Env modes
2+
PRODUCTION=
3+
TEST=
4+
15
# Database credentials
26
DB_USER=root
37
DB_PASSWORD=null
48
DB_HOST=localhost
59
DB_PORT=5432
610
DB_NAME=coderplex-org
11+
712
# JWT secret
8-
JWT_SECRET=jwt-secret
13+
JWT_SECRET=
14+
915
# Github OAuth
1016
GITHUB_CLIENT_ID=
1117
GITHUB_CLIENT_SECRET=

‎.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.vscode/*
2+
bin/*

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
"extends": "standard"
2+
extends: "standard"
33
};

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"makemigrations": "sequelize migration:create",
1111
"migrate": "sequelize db:migrate",
1212
"build": "mkdir dist && babel src -s -d dist",
13-
"lint": "eslint"
13+
"lint": "eslint --fix --ext js src"
1414
},
1515
"dependencies": {
1616
"apollo-server": "^2.0.0",
@@ -21,6 +21,7 @@
2121
"dataloader": "^1.4.0",
2222
"dotenv": "^6.0.0",
2323
"express": "^4.17.1",
24+
"express-session": "^1.17.0",
2425
"graphql": "^14.5.8",
2526
"graphql-relay": "^0.6.0",
2627
"graphql-resolvers": "^0.3.3",

‎src/index.js

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ app.use(cors())
1919

2020
app.use(morgan('dev'))
2121

22+
// This adds handlers for routes related to auth
2223
addAuthRoutes(app)
2324

2425
const getLoggedInUser = async req => {
@@ -80,39 +81,21 @@ server.applyMiddleware({ app, path: '/graphql' })
8081
const httpServer = http.createServer(app)
8182
server.installSubscriptionHandlers(httpServer)
8283

83-
const isTest = !!process.env.TEST_DATABASE
84-
const isProduction = !!process.env.DATABASE_URL
84+
const isDevelopment = !process.env.PRODUCTION
85+
const isTest = !!process.env.TEST
8586
const port = process.env.PORT || 8000
8687

87-
sequelize.sync({ force: isTest || isProduction }).then(async () => {
88-
if (isTest || isProduction) {
89-
createUsersWithMessages(new Date())
88+
sequelize.sync({ force: isDevelopment || isTest }).then(async () => {
89+
if (isTest) {
90+
createTestData()
9091
}
9192

9293
httpServer.listen({ port }, () => {
9394
console.log(`Apollo Server on http://localhost:${port}/graphql`)
95+
console.log({ isDevelopment, isTest })
9496
})
9597
})
9698

97-
const createUsersWithMessages = async date => {
98-
models.User.create(
99-
{
100-
email: '[email protected]',
101-
password: 'rwieruch',
102-
firstName: 'rev',
103-
lastName: 'rich',
104-
}
105-
).then(async _user => {
106-
const user = (await models.User.findByLogin('[email protected]'))
107-
models.SocialProfile.create(
108-
{
109-
facebook: 'facebook.com/krushiraj',
110-
twitter: 'twitter.com/krushiraj123',
111-
userId: user.id
112-
},
113-
{
114-
include: [models.User]
115-
}
116-
)
117-
}).catch(console.error)
99+
const createTestData = async () => {
100+
// Use this function in future to seed the test data
118101
}

‎src/loaders/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import * as user from './user';
1+
import * as user from './user'
22

3-
export default { user };
3+
export default { user }

‎src/loaders/user.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ export const batchUsers = async (keys, models) => {
22
const users = await models.User.findAll({
33
where: {
44
id: {
5-
$in: keys,
6-
},
7-
},
8-
});
5+
$in: keys
6+
}
7+
}
8+
})
99

10-
return keys.map(key => users.find(user => user.id === key));
11-
};
10+
return keys.map(key => users.find(user => user.id === key))
11+
}

‎src/models/event-profile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const EventProfile = (sequelize, DataTypes) => {
44
const EventProfile = sequelize.define(
55
'event_profile',
66
{
7-
id: id(DataTypes)
7+
id: id(DataTypes.UUID)
88
}
99
)
1010

‎src/models/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import Sequelize from 'sequelize'
22
import { development } from '../config/config'
3-
//import all models here
3+
// import all models here
44
import user from './user'
55
import socialProfile from './social-profile'
66
import eventProfile from './event-profile'
77

88
let sequelize
99
if (process.env.DATABASE_URL) {
1010
sequelize = new Sequelize(process.env.DATABASE_URL, {
11-
dialect: 'postgres',
11+
dialect: 'postgres'
1212
})
1313
} else {
1414
sequelize = new Sequelize(
1515
development.database,
1616
development.username,
1717
development.password,
1818
{
19-
dialect: 'postgres',
20-
},
19+
dialect: 'postgres'
20+
}
2121
)
2222
}
2323

‎src/models/social-profile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { id } from './utils'
22

33
const socialProfile = (sequelize, DataTypes) => {
4-
const SocialProfile = sequelize.define("social_profile", {
5-
id: id(DataTypes),
4+
const SocialProfile = sequelize.define('social_profile', {
5+
id: id(DataTypes.UUID),
66
facebook: {
77
type: DataTypes.STRING,
88
allowNull: true
@@ -22,4 +22,4 @@ const socialProfile = (sequelize, DataTypes) => {
2222
return SocialProfile
2323
}
2424

25-
export default socialProfile
25+
export default socialProfile

‎src/models/user.js

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
import bcrypt from 'bcrypt'
21
import { id } from './utils'
32

43
const user = (sequelize, DataTypes) => {
54
const User = sequelize.define(
65
'user',
76
{
8-
id: id(DataTypes),
9-
firstName: {
10-
type: DataTypes.STRING,
11-
allowNull: false,
12-
validate: {
13-
notEmpty: true
14-
}
15-
},
16-
lastName: {
7+
id: id(DataTypes.UUID),
8+
name: {
179
type: DataTypes.STRING,
1810
allowNull: false,
1911
validate: {
@@ -25,17 +17,9 @@ const user = (sequelize, DataTypes) => {
2517
unique: true,
2618
allowNull: false,
2719
validate: {
28-
notEmpty: true,
2920
isEmail: true
3021
}
3122
},
32-
password: {
33-
type: DataTypes.STRING,
34-
allowNull: false,
35-
validate: {
36-
notEmpty: true
37-
}
38-
},
3923
contactNo: {
4024
type: DataTypes.STRING,
4125
allowNull: true,
@@ -50,30 +34,7 @@ const user = (sequelize, DataTypes) => {
5034
'https://i0.wp.com/www.winhelponline.com/blog/wp-content/uploads/2017/12/user.png?fit=256%2C256&quality=100&ssl=1'
5135
}
5236
}
53-
);
54-
55-
User.findByLogin = async login => {
56-
let user = await User.findOne({
57-
where: { email: login }
58-
})
59-
60-
return user
61-
}
62-
63-
User.beforeCreate(async user => {
64-
user.password = await user.generatePasswordHash(user.password)
65-
})
66-
67-
User.prototype.generatePasswordHash = async password => {
68-
const saltRounds = 10
69-
const hash = await bcrypt.hash(password, saltRounds)
70-
return hash
71-
}
72-
73-
User.prototype.validatePassword = async (password) => {
74-
const comparision = await bcrypt.compare(password, this.password)
75-
return comparision
76-
}
37+
)
7738

7839
return User
7940
}

‎src/models/utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import uuid from 'uuid/v4'
22

3-
const id = (DataTypes) => {
3+
const id = (UUID) => {
44
return {
5-
type: DataTypes.UUID,
5+
type: UUID,
66
allowNull: false,
77
primaryKey: true,
88
defaultValue: () => uuid()
99
}
1010
}
1111

12-
export { id }
12+
export { id }

‎src/schema/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { gql } from 'apollo-server-express'
22

3+
// TODO: move all feature specific schemas to subdirectory
4+
// Ex: All events related schemas should be under ./event
5+
// All jobs related schemas under ./jobs
6+
37
// Common schemas
48
// Schema for UserProfile
59
import userSchema from './user'
610

711
// Events related schemas
8-
import eventProfileSchema from './event-profile'
912
import eventDetails from './event-details'
1013
import eventGroupMemberRoleChoice from './event-group-member-role-choice'
1114
import eventGroupMemberRoles from './event-group-member-roles'
@@ -25,8 +28,7 @@ import subEvent from './sub-event'
2528

2629
// Profile extensions. These are used to extend the base User schema
2730
import eventProfile from './event-profile'
28-
import socialProfile from "./social-profile";
29-
31+
import socialProfile from './social-profile'
3032

3133
const linkSchema = gql`
3234
scalar DateTime
@@ -47,7 +49,7 @@ const linkSchema = gql`
4749

4850
export default [
4951
linkSchema, userSchema,
50-
eventProfileSchema, eventDetails,
52+
eventProfile, eventDetails,
5153
eventGroupMemberRoleChoice, eventGroupMemberRoles,
5254
eventGroup, eventLocationDetails,
5355
eventParticipationStatus, eventParticipation,

‎src/schema/user.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
import { gql } from 'apollo-server-express'
22

3+
/*
4+
User - Base user model used in profiles feature
5+
6+
Extends each new profile for each feature.
7+
8+
- Make necessary changes in the models whenever new fields are added.
9+
- Add new queries under Query and update the query with function in resolvers.
10+
- Whenever a new extension added please add it as field under User,
11+
also add resolvers to each of it.
12+
- Add necessary mutations if needed and handle the mutations in resolvers.
13+
*/
14+
315
export default gql`
416
extend type Query {
5-
allUsers: [User!]
17+
allUsers: [User]!
618
userById(id: ID!): User
719
userByEmail(email: String!): User
820
currentUser: User
921
}
1022
1123
extend type Mutation {
12-
signUp(
13-
username: String!
14-
email: String!
15-
password: String!
16-
): Token!
17-
18-
signIn(login: String!, password: String!): Token!
19-
2024
updateUser(
21-
email: String!,
22-
contact_no: String!,
23-
first_name: String!,
24-
last_name: String!,
25-
profile_pic: URL!
25+
email: String,
26+
contact_no: String,
27+
name: String,
28+
profile_pic: URL
2629
): User!
2730
2831
deleteUser(id: ID!): Boolean!
@@ -35,8 +38,7 @@ export default gql`
3538
type User {
3639
id: ID!
3740
38-
firstName: String!
39-
lastName: String!
41+
name: String!
4042
email: String!
4143
contactNo: String
4244
profilePic: URL!
@@ -45,3 +47,4 @@ export default gql`
4547
eventProfile: EventProfile
4648
}
4749
`
50+
// Extend with new profiles for each feature above

‎src/subscription/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { PubSub } from 'apollo-server';
1+
import { PubSub } from 'apollo-server'
22

3-
import * as MESSAGE_EVENTS from './message';
3+
import * as MESSAGE_EVENTS from './message'
44

55
export const EVENTS = {
6-
MESSAGE: MESSAGE_EVENTS,
7-
};
6+
MESSAGE: MESSAGE_EVENTS
7+
}
88

9-
export default new PubSub();
9+
export default new PubSub()

‎src/subscription/message.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const CREATED = 'CREATED';
1+
export const CREATED = 'CREATED'

0 commit comments

Comments
 (0)