Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(refactor): refactored user schema to camelcasing #53

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routes/club/Club.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ router.get("/", async (req, res) => {
}

const clubs = await User.find({
usertype: "club",
userType: "club",
});

res.json(clubs);
Expand Down
2 changes: 1 addition & 1 deletion routes/display/Display.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ router.get("/users", async (req, res) => {
// * Route 2 - Show all available Clubs in the DB
router.get("/clubs", async (req, res) => {
try {
const allClubs = await User.find({ usertype: "club" });
const allClubs = await User.find({ userType: "club" });
res.json(allClubs);
} catch (error) {
res.status(500).json({ message: "Internal Server Error" });
Expand Down
8 changes: 4 additions & 4 deletions routes/user/Auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ router.post("/signin", async (req, res) => {
sameSite: "none",
domain: process.env.ORIGIN_DOMAIN,
})
.cookie("usertype", existingUser.usertype, {
.cookie("usertype", existingUser.userType, {
httpOnly: false,
expires: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000),
secure: true,
Expand Down Expand Up @@ -118,8 +118,8 @@ router.post("/update", async (req, res) => {

// Updated User
const UserData = {
firstname: existingUser.firstname,
lastname: existingUser.lastname,
firstname: existingUser.firstName,
lastname: existingUser.lastName,
email: email,
password: newHashedPassword,
address: existingUser.address,
Expand Down Expand Up @@ -170,7 +170,7 @@ router.get(
// This is a new account, update usertype
await User.create({
email: user.email,
usertype: usertype,
userType: usertype,
});
}
res
Expand Down
12 changes: 6 additions & 6 deletions routes/user/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ router.post("/update", async (req, res) => {

// Updated User
const UserData = {
firstname: existingUser.firstname,
lastname: existingUser.lastname,
firstName: existingUser.firstName,
lastName: existingUser.lastName,
email: email,
password: newHashedPassword,
address: existingUser.address,
Expand Down Expand Up @@ -77,10 +77,10 @@ router.post("/report", async (req, res) => {
const data = req.body;

const ReportData = ReportProblem({
firstname: data.firstname,
lastname: data.lastname,
firstName: data.firstname,
lastName: data.lastname,
email: data.email,
reportmessage: data.reportmessage,
reportMessage: data.reportmessage,
prasanth7890 marked this conversation as resolved.
Show resolved Hide resolved
});

await ReportData.save();
Expand All @@ -100,7 +100,7 @@ router.get("/", async (req, res) => {
}

const users = await User.find({
usertype: "individual",
userType: "individual",
});

res.json(users);
Expand Down
6 changes: 3 additions & 3 deletions schema/user/ReportProblemSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ const mongoose = require("mongoose");

const ReportProblemSchema = mongoose.Schema(
{
firstname: {
firstName: {
type: String,
required: true,
},
lastname: {
lastName: {
type: String,
required: true,
},
email: {
type: String,
required: true,
},
reportmessage: {
reportMessage: {
type: String,
required: true,
},
Expand Down
6 changes: 3 additions & 3 deletions schema/user/UserSchema.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const mongoose = require("mongoose");

const UserSchema = mongoose.Schema({
usertype: { type: String },
userType: { type: String },
slug: {
type: String,
required: true,
},
name: { type: String },
firstname: { type: String },
lastname: { type: String },
firstName: { type: String },
lastName: { type: String },
email: {
type: String,
required: true,
Expand Down
Loading