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

Develop - deviceId 헤더 적용, API 엔드포인트 변경, 목록 조회 API 페이지네이션 적용, 버그 수정 #26

Merged
merged 42 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0c6c8d4
feat: swagger 달기
Hyun-git Jul 4, 2024
edfad8e
lint
seohyun0120 Jul 4, 2024
3857297
fix: 로그 수정, 키워드 카테고리 미들웨어 수정
seohyun0120 Jul 4, 2024
3cbb54d
fix: 키워드 카테고리 못 찾았을 때 에러 핸들링
seohyun0120 Jul 4, 2024
b76c143
feat: add meme's swagger
pjw5521 Jul 4, 2024
bac9363
Merge pull request #22 from mash-up-kr/feature/fix-throw-issue
pjw5521 Jul 4, 2024
bf42b8d
fix: keywordCategory 스웨거 추가
Hyun-git Jul 5, 2024
383b28a
fix: add user
Hyun-git Jul 5, 2024
33c50c1
오타 수정
seohyun0120 Jul 5, 2024
428b3ba
keyword swagger
seohyun0120 Jul 5, 2024
3a9f32e
lint, 문구 수정
seohyun0120 Jul 5, 2024
9164fe3
Merge pull request #23 from mash-up-kr/swagger
Hyun-git Jul 6, 2024
3b47c1d
fix: 모든 routes에 logger middleware 적용
seohyun0120 Jul 6, 2024
d1c2b73
lint
seohyun0120 Jul 6, 2024
b6f6dce
fix: user middleware 우선 통과하도록 수정
seohyun0120 Jul 6, 2024
2a34ba1
feat: 밈 swagger 문서 개선
seohyun0120 Jul 6, 2024
e4e4c5f
fix: 밈 생성, 수정 시 keywordIds를 string이 아닌 ObjectId로 넣도록 수정
seohyun0120 Jul 6, 2024
684342c
fix: 인기 키워드 서비스에서 밈 조회 쿼리 수정
seohyun0120 Jul 6, 2024
cbcfb05
fix: 응답에 data 필드 추가
seohyun0120 Jul 6, 2024
b6ba6b1
Merge pull request #24 from mash-up-kr/feature/update-swagger-docs
seohyun0120 Jul 6, 2024
18cb206
fix: 키워드로 밈 검색 시 페이지네이션 적용, 밈 검색 쿼리 수정, swagger 수정
seohyun0120 Jul 6, 2024
8fff68f
fix: 페이지네이션 적용
seohyun0120 Jul 6, 2024
91371df
fix: deviceId를 헤더로 받도록 변경
seohyun0120 Jul 6, 2024
7a8ccfb
fix: 엔드포인트 수정
seohyun0120 Jul 6, 2024
9e09374
fix: header 적용에 따른 URI 변경
seohyun0120 Jul 6, 2024
7988555
lint
seohyun0120 Jul 6, 2024
1dddbc6
fix: body에서 header로 변경
seohyun0120 Jul 6, 2024
04d3dab
feat: 밈 목록 조회 스웨거 수정
seohyun0120 Jul 6, 2024
2c3701c
fix: 키워드 검색 밈 목록에도 timestamp추가
seohyun0120 Jul 6, 2024
41d8d39
fix: 키워드 카테고리 swagger 수정
seohyun0120 Jul 6, 2024
9ed00c6
fix: 페이지네이션 적용
seohyun0120 Jul 6, 2024
b3b25b3
fix: 최근 본 밈, 저장한 밈 목록에서 모든 필드 표시되도록 변경
seohyun0120 Jul 6, 2024
1fe147d
feat: 나의 파밈함 페이지네이션 적용
seohyun0120 Jul 6, 2024
d150d7d
fix: 스웨거 적용
seohyun0120 Jul 6, 2024
08ae1cd
fix: 스웨거 설명 수정
seohyun0120 Jul 6, 2024
17b8eb4
feat: 추천 밈 조회 api 엔드포인트 변경
seohyun0120 Jul 6, 2024
af2bfbc
feat: 추천 밈 조회 api 엔드포인트 변경
seohyun0120 Jul 6, 2024
55f1d21
Merge pull request #25 from mash-up-kr/feature/deviceid-to-header
seohyun0120 Jul 6, 2024
a1d291a
fix: 중복 값 삭제 하는 로직 + isDeleted 안보이게
Hyun-git Jul 7, 2024
52249e1
fix: 키워드 목록 반환 형식 변경
Hyun-git Jul 7, 2024
6ff16e9
feat: 유저 생성, 조회 시 _id 필드 추가
seohyun0120 Jul 7, 2024
0a71de8
Merge pull request #27 from mash-up-kr/feature/add-user-id
seohyun0120 Jul 7, 2024
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
225 changes: 220 additions & 5 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"lodash": "^4.17.21",
"pino": "^9.1.0",
"pino-pretty": "^11.0.0",
"swagger-jsdoc": "^6.2.8",
"swagger-ui-express": "^5.0.1",
"ts-node": "^10.9.2",
"yamljs": "^0.3.0"
},
Expand Down
16 changes: 16 additions & 0 deletions src/app.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import express, { Application } from 'express';
import mongoose from 'mongoose';
import swaggerUi from 'swagger-ui-express';
import swaggerJSDoc from 'swagger-jsdoc';

import router from './routes';
import config from './util/config';
Expand All @@ -9,6 +11,20 @@ const DATABASE_URL = `${config.DB_URL}`;

const app: Application = express();

const options = {
definition: {
openapi: '3.0.0',
info: {
title: 'Farmeme API',
version: '1.0.0',
},
},
apis: ['./src/routes/*.ts'],
};

const swaggerSpec = swaggerJSDoc(options);
app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));

app.use(express.json());
app.use(express.urlencoded({ extended: true }));

Expand Down
Loading