Skip to content

Commit 03b5776

Browse files
*
1 parent fa77d20 commit 03b5776

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

graphql/resolvers/User/index.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ export default {
1717
email: u.email,
1818
password: u.password,
1919
telephones: u.telephones,
20-
role: u.role
20+
role: u.role,
21+
status: u.status
2122
}));
2223
}
2324
},
@@ -29,7 +30,8 @@ export default {
2930
email: user.email,
3031
password: user.password,
3132
telephones: user.telephones,
32-
role: user.role
33+
role: user.role,
34+
status: user.status
3335
});
3436

3537
return new Promise((resolve, reject) => {
@@ -39,20 +41,18 @@ export default {
3941
});
4042
},
4143
updateUser: async (parent, { _id, user }, context, info) => {
42-
return new Promise((resolve, reject) => {
43-
User.findByIdAndUpdate(_id, { $set: { ...user } }, { new: true }).exec(
44-
(err, res) => {
45-
err ? reject(err) : resolve(res);
46-
}
47-
);
48-
});
44+
const update = await Freight.updateOne({ _id }, user, {
45+
new: true
46+
}).exec();
47+
return update.ok ? true : false;
4948
},
5049
deleteUser: async (parent, { _id }, context, info) => {
51-
return new Promise((resolve, reject) => {
52-
User.findByIdAndDelete(_id).exec((err, res) => {
53-
err ? reject(err) : resolve(res);
54-
});
55-
});
50+
const update = await Freight.updateOne(
51+
{ _id },
52+
{ status: 1 },
53+
{ new: true }
54+
).exec();
55+
return update.ok ? true : false;
5656
}
5757
}
5858
};

graphql/types/User/index.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export default `
77
password: String!
88
telephones: [Int]!,
99
role: Int
10+
status: Int
1011
}
1112
1213
type Query {
@@ -16,8 +17,8 @@ export default `
1617
1718
type Mutation {
1819
createUser(user: CreateUserInput): User!
19-
updateUser(_id: String!, user: UpdateUserInput!): User!
20-
deleteUser(_id: String!): User!
20+
updateUser(_id: String!, user: UpdateUserInput!): Boolean!
21+
deleteUser(_id: String!): Boolean!
2122
}
2223
2324
input CreateUserInput {
@@ -27,14 +28,16 @@ export default `
2728
password: String!
2829
telephones: [Int]!,
2930
role: Int
31+
status: Int
3032
}
31-
33+
3234
input UpdateUserInput {
3335
first_name: String
3436
last_name: String
3537
email: String
3638
password: String
3739
telephones: [Int],
3840
role: Int
39-
}
41+
status: Int
42+
}
4043
`;

server/models/Company.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ const CompanySchema = new Schema(
1515
required: true
1616
},
1717
logo: {
18-
type: String,
19-
unique: true,
18+
type: String, // Buffer,
2019
required: true
2120
},
2221
level: {

server/models/User.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ const UserSchema = new Schema(
3434
role: {
3535
type: Number,
3636
default: 0
37+
},
38+
status: {
39+
type: Number,
40+
default: 0
3741
}
3842
},
3943
{ timestamps: { updatedAt: "updated_at", createdAt: "created_at" } }

0 commit comments

Comments
 (0)