Skip to content

Commit

Permalink
kinda unnecessary clean ups
Browse files Browse the repository at this point in the history
  • Loading branch information
meixingc committed Mar 24, 2023
1 parent 9987536 commit ab12f35
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 40 deletions.
2 changes: 1 addition & 1 deletion server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ app.get('/', (req, res) => {

app.use('/', AppRouter)

app.listen(PORT, () => console.log(`Server Running On ${PORT}`))
app.listen(PORT, () => console.log(`Server Running On ${PORT}`))
9 changes: 6 additions & 3 deletions server/config/config.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
{
"development": {

"username": "mei",
"password": "0811",
"database": "rhythmic_development",
"host": "127.0.0.1",
"dialect": "postgres"
},
"test": {

"username": "mei",
"password": "0811",
"database": "rhythmic_test",
"host": "127.0.0.1",
"dialect": "postgres"
},
"production": {

"username": "mei",
"password": "0811",
"database": "rhythmic_production",
"host": "127.0.0.1",
"dialect": "postgres"
Expand Down
2 changes: 1 addition & 1 deletion server/controllers/AuthController.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ module.exports = {
Register,
UpdatePassword,
CheckSession
}
}
2 changes: 1 addition & 1 deletion server/controllers/CommentController.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ module.exports = {
GetCommentsByPost,
CreateComment,
DeleteComment
}
}
2 changes: 1 addition & 1 deletion server/controllers/FollowerController.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ module.exports = {
GetFollowersByUser,
GetFollowersByFollower,
FollowUser
}
}
4 changes: 1 addition & 3 deletions server/controllers/PostController.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ const CreatePost = async (req,res) => {
}
}

// Not allowing post edits for the sake of being evil

const DeletePost = async (req,res) => {
try {
let post_id = parseInt(req.params.post_id)
Expand All @@ -74,4 +72,4 @@ module.exports = {
GetSinglePost,
CreatePost,
DeletePost,
}
}
5 changes: 2 additions & 3 deletions server/controllers/UserController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { Users, Posts, Comments, Followers } = require('../models')
const { Users, Posts, Comments } = require('../models')

const GetAllUsers = async (req,res) => {
try {
Expand Down Expand Up @@ -36,7 +36,6 @@ const GetAllUserFollowers = async (req, res) => {
}
}


const GetAllUserFollowing = async (req, res) => {
try {
let data = await Users.findAll({
Expand Down Expand Up @@ -131,4 +130,4 @@ module.exports = {
CreateUser,
UpdateUser,
DeleteUser
}
}
2 changes: 1 addition & 1 deletion server/middleware/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ module.exports = {
createToken,
comparePassword,
hashPassword
}
}
4 changes: 1 addition & 3 deletions server/migrations/0-create-users.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict'

const { sequelize } = require('../models')

/** @type {import('sequelize-cli').Migration} */

module.exports = {
Expand Down Expand Up @@ -44,4 +42,4 @@ module.exports = {
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('users')
}
}
}
2 changes: 1 addition & 1 deletion server/migrations/1-create-posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ module.exports = {
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('posts')
}
}
}
2 changes: 1 addition & 1 deletion server/migrations/2-create-comments.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ module.exports = {
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('comments')
}
}
}
2 changes: 1 addition & 1 deletion server/migrations/3-create-followers.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ module.exports = {
async down(queryInterface, Sequelize) {
await queryInterface.dropTable('followers')
}
}
}
2 changes: 1 addition & 1 deletion server/models/0-users.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ module.exports = (sequelize, DataTypes) => {
tableName: 'users'
})
return Users
}
}
3 changes: 2 additions & 1 deletion server/models/1-posts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'

const { Model } = require('sequelize')

module.exports = (sequelize, DataTypes) => {
Expand Down Expand Up @@ -31,4 +32,4 @@ module.exports = (sequelize, DataTypes) => {
tableName: 'posts'
})
return Posts
}
}
2 changes: 1 addition & 1 deletion server/models/2-comments.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ module.exports = (sequelize, DataTypes) => {
tableName: 'comments'
})
return Comments
}
}
2 changes: 1 addition & 1 deletion server/models/3-followers.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ module.exports = (sequelize, DataTypes) => {
tableName: 'followers'
})
return Followers
}
}
2 changes: 1 addition & 1 deletion server/routes/AuthRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ router.get('/session',
controller.CheckSession
)

module.exports = router
module.exports = router
2 changes: 1 addition & 1 deletion server/seeders/0-userseeds.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ module.exports = {
async down (queryInterface, Sequelize) {
return queryInterface.bulkDelete('users')
}
}
}
6 changes: 2 additions & 4 deletions server/seeders/1-postseeds.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
'use strict'

const { Users, sequelize } = require('../models')
const { Users } = require('../models')
const falso = require('@ngneat/falso')



module.exports = {
async up (queryInterface, Sequelize) {
let user = await Users.findAll({raw:true})
Expand All @@ -23,4 +21,4 @@ module.exports = {
async down (queryInterface, Sequelize) {
return queryInterface.bulkDelete('posts')
}
}
}
6 changes: 2 additions & 4 deletions server/seeders/2-commentseeds.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
'use strict'

const { Users, Posts, sequelize } = require('../models')
const { Users, Posts } = require('../models')
const falso = require("@ngneat/falso")



module.exports = {
async up (queryInterface, Sequelize) {
let user = await Users.findAll({raw:true})
Expand All @@ -25,4 +23,4 @@ module.exports = {
async down (queryInterface, Sequelize) {
return queryInterface.bulkDelete('comments')
}
}
}
13 changes: 7 additions & 6 deletions server/seeders/3-followerseeds.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
'use strict'

const { Users } = require('../models')

module.exports = {
up: async (queryInterface, Sequelize) => {
async up (queryInterface, Sequelize) {
const users = await Users.findAll({ raw: true })
const followers = users
.map(({ id }) => ({
Expand All @@ -14,10 +16,9 @@ module.exports = {
updatedAt: new Date()
}))
.filter((u) => u.followerId !== null)
await queryInterface.bulkInsert('followers', followers)
return queryInterface.bulkInsert('followers', followers)
},

down: async (queryInterface, Sequelize) => {
await queryInterface.bulkDelete('followers')
async down (queryInterface, Sequelize) {
return queryInterface.bulkDelete('followers')
}
}
}

0 comments on commit ab12f35

Please sign in to comment.