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
10 changes: 0 additions & 10 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,5 @@
"database": "project_organizer_development",
"host": "127.0.0.1",
"dialect": "postgres"
},
"test": {
"database": "project_organizer_test",
"host": "127.0.0.1",
"dialect": "postgres"
},
"production": {
"database": "project_organizer_production",
"host": "127.0.0.1",
"dialect": "postgres"
}
}
33 changes: 20 additions & 13 deletions controllers/projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@ let db = require('../models')
let router = express.Router()

// POST /projects - create a new project
router.post('/', (req, res) => {
db.project.create({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description
})
.then((project) => {
res.redirect('/')
})
.catch((error) => {
res.status(400).render('main/404')
})
router.post('/', async (req, res) => {
try{
const project = await db.project.create({
name: req.body.name,
githubLink: req.body.githubLink,
deployLink: req.body.deployedLink,
description: req.body.description
})
console.log('project created')
const [category] = await db.category.findOrCreate({
where: {
name: req.body.category
}
})
console.log(req.body)
await project.addCategory(category) // create an assosiastion
res.redirect('/')
} catch(err) {
console.log(err)
}
})

// GET /projects/new - display form for creating a new project
Expand Down
37 changes: 37 additions & 0 deletions dbTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// const db = require('./models')

// db.category.create({
// name: 'node'
// })
// .then(category => {
// console.log(category.id)
// })
// .catch(console.log)

// async function createCategory() {
// try {
// const newCategory = await db.category.create({ name: 'python' })
// console.log(newCategory)
// } catch (err) {
// console.log(err)
// }
// }

// createCategory()

const db = require('./models')

db.project.findOne({
where: { id: 1 },
include: [db.category]
})
.then(project => {
// by using eager loading, the project model should have a categories key
console.log(project.categories)

// createCategory function should be available to this model - it will create the category then add it to the project
project.createCategory({ name: 'express' })
.then(category => {
console.log(category.id)
})
})
28 changes: 28 additions & 0 deletions migrations/20230405222912-create-category.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'use strict';
/** @type {import('sequelize-cli').Migration} */
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.createTable('categories', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
name: {
type: Sequelize.STRING
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('categories');
}
};
31 changes: 31 additions & 0 deletions migrations/20230405223819-create-categories-projects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
'use strict';
/** @type {import('sequelize-cli').Migration} */
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.createTable('categoriesProjects', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
categoryId: {
type: Sequelize.INTEGER
},
projectId: {
type: Sequelize.INTEGER
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('categoriesProjects');
}
};
24 changes: 24 additions & 0 deletions models/categoriesprojects.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';
const {
Model
} = require('sequelize');
module.exports = (sequelize, DataTypes) => {
class categoriesProjects extends Model {
/**
* Helper method for defining associations.
* This method is not a part of Sequelize lifecycle.
* The `models/index` file will call this method automatically.
*/
static associate(models) {
// define association here
}
}
categoriesProjects.init({
categoryId: DataTypes.INTEGER,
projectId: DataTypes.INTEGER
}, {
sequelize,
modelName: 'categoriesProjects',
});
return categoriesProjects;
};
24 changes: 24 additions & 0 deletions models/category.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
'use strict';
const {
Model
} = require('sequelize');
module.exports = (sequelize, DataTypes) => {
class category extends Model {
/**
* Helper method for defining associations.
* This method is not a part of Sequelize lifecycle.
* The `models/index` file will call this method automatically.
*/
static associate(models) {
// define association here
models.category.belongsToMany(models.project, {through: 'categoriesProjects'}) // matches db
}
}
category.init({
name: DataTypes.STRING
}, {
sequelize,
modelName: 'category',
});
return category;
};
1 change: 1 addition & 0 deletions models/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = (sequelize, DataTypes) => {
*/
static associate(models) {
// define association here
models.project.belongsToMany(models.category, {through: 'categoriesProjects'}) // matches db
}
}
project.init({
Expand Down
5 changes: 5 additions & 0 deletions views/projects/new.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
<input type="text" class="form-control" id="deployedLink" name="deployedLink" required>
</div>

<div class="form-group">
<label for="category">Category</label>
<input type="text" class="form-control" id="category" name="category" required>
</div>

<div class="form-group">
<label for="description">Description</label>
<textarea type="text" class="form-control" id="description" name="description" required></textarea>
Expand Down