Skip to content
Open
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
24 changes: 16 additions & 8 deletions controllers/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const Item = require('../models/item')

const getItemsByTask = async (req, res) => {
try {
const items = await Item.find({task: req.params.taskId})
const items = await Item.find({ task: req.params.taskId })
return res.status(200).json(items)
} catch (error) {
console.log(error);
Expand All @@ -13,12 +13,12 @@ const getItemsByTask = async (req, res) => {
const createItemByTask = async (req, res) => {
try {
const item = await Item.create({
task: req.params.taskId,
title: req.body.title,
description: req.body.description,
status: req.body.status,
dueDate: req.body.dueDate,
timeSpent: req.body.timeSpent,
task: req.params.taskId,
title: req.body.title,
description: req.body.description,
status: req.body.status,
dueDate: req.body.dueDate,
timeSpent: req.body.timeSpent,
})
return res.status(200).json(item)
} catch (error) {
Expand All @@ -29,9 +29,17 @@ const createItemByTask = async (req, res) => {

const updateItemByTask = async (req, res) => {
try {
const item = await Item.findById(req.params.itemId);
const newItem = await Item.findByIdAndUpdate(req.params.itemId, {
title: req.body.title ? req.body.title : item.title,
description: req.body.description ? req.body.description : item.description,
status: req.body.status ? req.body.status : item.status,
dueDate: req.body.dueDate ? req.body.dueDate : item.dueDate,
timeSpent: req.body.timeSpent ? req.body.timeSpent : item.timeSpent,
});
return res.json({ item: newItem })
} catch (error) {
console.log(error);
return res.end()
}
};

Expand Down
16 changes: 5 additions & 11 deletions controllers/job.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const jobById = async (req, res) => {
],
},
},
{$limit: 1}
{ $limit: 1 }
// { $unwind:{
// path: "$tasks",
// preserveNullAndEmptyArrays: true
Expand Down Expand Up @@ -159,16 +159,10 @@ const updateJob = async (req, res) => {
{
title: req.body.title ? req.body.title : getJob.title,
url: req.body.url ? req.body.url : getJob.url,
description: req.body.description
? req.body.description
: getJob.description,
description: req.body.description ? req.body.description : getJob.description,
status: req.body.status ? req.body.status : getJob.status,
contactEmail: req.body.contactEmail
? req.body.contactEmail
: getJob.contactEmail,
contactName: req.body.contactName
? req.body.contactName
: getJob.contactName,
contactEmail: req.body.contactEmail ? req.body.contactEmail : getJob.contactEmail,
contactName: req.body.contactName ? req.body.contactName : getJob.contactName,
},
{
upsert: true,
Expand Down Expand Up @@ -315,7 +309,7 @@ const createTaskByJobId = async (req, res) => {
// });
const updateTaskById = async (req, res) => {
try {
const task = await Task.findById(req.params.id);
const task = await Item.findById(req.params.id);
let newTask = await Task.findByIdAndUpdate(req.params.id, {
title: req.body.title ? req.body.title : task.title,
description: req.body.description
Expand Down
36 changes: 31 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
},
"homepage": "https://github.com/jonrob08/devvy-server-side#readme",
"dependencies": {
"@ngneat/falso": "^6.1.0",
"axios": "^1.1.3",
"bcrypt": "^5.1.0",
"body-parser": "^1.20.1",
Expand Down
44 changes: 44 additions & 0 deletions testUser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
require('dotenv').config()
const mongoose = require('mongoose');
// import { randUser } from '@ngneat/falso';
const { randUser } = require('@ngneat/falso');

// Database Set Up
const MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING;
mongoose.connect(MONGO_CONNECTION_STRING, { useNewUrlParser: true, useUnifiedTopology: true });
const db = mongoose.connection;

db.once('open', () => {
console.log(`Connected to MongoDB at HOST: ${db.host} and PORT: ${db.port}`);
});

db.on('error', (error) => {
console.log(`Database Error: ${error}`);
})


const User = require('./models/user');
const Job = require('./models/job');
const Task = require('./models/task');
const Item = require('./models/item')

function createUsers() {
for (let i = 0; i < 16; i++) {
const userData = randUser();
const newUser = new User({
username: userData.email,
full_name: userData.firstName + " " + userData.lastName,
password: 'password',
username: userData.username,
day: "10",
month: "10",
year: "1990"
})
newUser.save();
}
}

createUsers();