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
File renamed without changes.
511 changes: 496 additions & 15 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
"description": "",
"main": "index.js",
"scripts": {
"start": "node ./src/index.js",
"start": "ts-node ./src/index.ts",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"@types/express": "^4.17.17",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"dotenv": "^16.1.3",
"express": "^4.18.2",
"helmet": "^7.0.0",
"passport": "^0.6.0",
"pg": "^8.11.1",
"typeorm": "^0.3.17"
},
Expand All @@ -26,7 +28,7 @@
"husky": "^8.0.1",
"jest": "^28.1.2",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1"
},
"type": "module"
"prettier": "^2.7.1",
"typescript": "^5.1.6"
}
}
23 changes: 0 additions & 23 deletions src/config/dataSource.js

This file was deleted.

23 changes: 23 additions & 0 deletions src/config/dataSource.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import * as typeorm from 'typeorm';
import { config } from 'dotenv';
import { join } from 'path';

config();

const dataSource = new typeorm.DataSource({
type: 'postgres',
host: process.env.DB_HOST || 'localhost',
port: Number(process.env.DB_PORT) || 5432,
username: process.env.DB_USER || 'postgres',
password: process.env.DB_PASSWORD || 'postgres',
database: process.env.DB_NAME || 'naromaro',
synchronize: true,
entities: [
join(__dirname, '/../entity/Post.ts'),
join(__dirname, '/../entity/category.ts'),

join(__dirname, '/../entity/user.ts'),
],
});

export default dataSource;
42 changes: 42 additions & 0 deletions src/controller/category.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import * as categoryService from '../service/categoryService';
import { Request, Response } from 'express';
export const getCategory = async (req: Request, res: Response, next) => {
try {
const categoryList = await categoryService.getCategory(req);
res.status(200).json(categoryList);
} catch (err) {
next(err);
}
};
export const pickCategory = async (req:Request, res:Response, next) => {
try {
const categoryList = await categoryService.pickCategory();
res.status(200).json(categoryList);
} catch (err) {
next(err);
}
};
export const deleteCategory = async (req:Request, res:Response, next) => {
try {
const categoryList = await categoryService.deleteCategory(req);
res.status(200).json(categoryList);
} catch (err) {
next(err);
}
};
export const createCategory = async (req:Request, res:Response, next) => {
try {
const postList = await categoryService.createCategory(req);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
export const updateCategory = async (req:Request, res:Response, next) => {
try {
const postList = await categoryService.updateCategory(req);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
10 changes: 0 additions & 10 deletions src/controller/post.js

This file was deleted.

46 changes: 46 additions & 0 deletions src/controller/post.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import * as postService from '../service/postService';
import { Request, Response } from 'express';
export const getPostList = async (req: any, res: Response, next) => {
try {
if (!req.user) {
throw Error('unathorizted');
}//로그인 한 유저인지 확인작업
console.log(req.user);
const postList = await postService.getPostList(req, req.body.categoryName);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
export const pickPost = async (req: Request, res: Response, next) => {
try {
const postList = await postService.pickPost();
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
export const deletePost = async (req: Request, res: Response, next) => {
try {
const postList = await postService.deletePost(req);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
export const createPost = async (req: Request, res: Response, next) => {
try {
const postList = await postService.createPost(req, req.body.categoryName);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
export const updatePost = async (req: Request, res: Response, next) => {
try {
const postList = await postService.updatePost(req);
res.status(200).json(postList);
} catch (err) {
next(err);
}
};
27 changes: 27 additions & 0 deletions src/controller/user.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { NextFunction, Request, Response } from 'express';
import * as userService from '../service/userService';

export const register = async (req: any, res: Response, next: NextFunction) => {
try {
if (req.user) throw Error('already login');
const { username, password } = req.body;
await userService.register(username, password);
res.sendStatus(201);
} catch (err) {
res.status(400).json({ message: err.message });
}
};

export const login = async (req: any, res: Response, next: NextFunction) => {
try {
if (req.user) throw Error('already login');
const { username, password } = req.body;
const id = await userService.validateUser(username, password);

const accessToken = id.toString() + 'access';

res.json({ accessToken: accessToken });
} catch (err) {
res.status(400).json({ message: err.message });
}
};
24 changes: 0 additions & 24 deletions src/entity/Post.js

This file was deleted.

55 changes: 55 additions & 0 deletions src/entity/Post.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
import { Category } from './category';
@Entity()
export class Post {
@PrimaryGeneratedColumn()
id: number;

@Column()
name: string;
@Column()
author: string;
@Column()
write: string;
@Column()
when: Date;
@Column()
isPicked: boolean;
@ManyToOne(() => Category, (category) => category.posts)
category: Category;
}

/*const postSchema = new EntitySchema({
name: 'post',
tableName: 'post',
columns: {
id: {
type: 'int',
primary: true,
generated: true,
},
name: {
type: 'varchar',
length: 255,
},
author: {
type: 'varchar',
length: 255,
nullable: true,
},
write:{
type:'varchar',
length: 255,
},//db 저장 데이터추가
when:{
type:'date',
},
isPicked:{
type:'boolean',
}

},
});

export default postSchema;
*/
32 changes: 32 additions & 0 deletions src/entity/category.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import {Entity, PrimaryGeneratedColumn, Column, OneToMany} from 'typeorm';
import { Post } from './Post';

@Entity()
export class Category {
@PrimaryGeneratedColumn()
id: number;

@Column()
color: string;

@OneToMany(()=> Post, (post) => post.category)
posts: Post[];
}
/*
const postSchema = new EntitySchema({
name: 'post',
tableName: 'post',
columns: {
id: {
type: 'int',
primary: true,
generated: true,
},
color:{
type:'text'
}

},});

export default postSchema;
*/
47 changes: 47 additions & 0 deletions src/entity/user.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
import { Category } from './category';
@Entity()
export class User {
@PrimaryGeneratedColumn()
id: number;

@Column()
username: string;
@Column()
password: string;
}

/*const postSchema = new EntitySchema({
name: 'post',
tableName: 'post',
columns: {
id: {
type: 'int',
primary: true,
generated: true,
},
name: {
type: 'varchar',
length: 255,
},
author: {
type: 'varchar',
length: 255,
nullable: true,
},
write:{
type:'varchar',
length: 255,
},//db 저장 데이터추가
when:{
type:'date',
},
isPicked:{
type:'boolean',
}

},
});

export default postSchema;
*/
Loading