Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
festivelo_backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Festivelo
festivelo_backend
Commits
bb4fdbbd
Commit
bb4fdbbd
authored
6 months ago
by
Jinyeong Kim
Browse files
Options
Downloads
Patches
Plain Diff
fix user controller
parent
bdf7628f
No related branches found
No related tags found
1 merge request
!19
Ws to test_usercontroller
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
app.js
+8
-8
8 additions, 8 deletions
app.js
controllers/userManagementController.js
+0
-1
0 additions, 1 deletion
controllers/userManagementController.js
models/trips.js
+4
-3
4 additions, 3 deletions
models/trips.js
route/userManagement.js
+6
-6
6 additions, 6 deletions
route/userManagement.js
with
18 additions
and
18 deletions
app.js
+
8
−
8
View file @
bb4fdbbd
...
...
@@ -21,12 +21,12 @@ app.use(cors({
credentials
:
true
,
}));
//비밀번호 변경 라우트 등록
const
passwordRoutes
=
require
(
'
./route/conf_password
'
);
//닉네임 변경 라우트 등록
const
confNameRoutes
=
require
(
'
./route/conf_name.js
'
);
//회원 탈퇴 라우트 등록
const
deleteUser
=
require
(
'
./route/del_user
'
);
//비밀번호 암호화용 모듈
//
const passwordRoutes = require('./route/conf_password');
//
//닉네임 변경 라우트 등록
//
const confNameRoutes = require('./route/conf_name.js');
//
//회원 탈퇴 라우트 등록
//
const deleteUser = require('./route/del_user');
//
//비밀번호 암호화용 모듈
const
bcrypt
=
require
(
'
bcrypt
'
);
//User define
const
User
=
require
(
'
./models/user
'
);
...
...
@@ -34,8 +34,7 @@ const User = require('./models/user');
const
Trip
=
require
(
'
./models/trips
'
);
//Favorite define
const
Favorite
=
require
(
'
./models/favorite
'
);
//사용자 관리 라우트
const
userManagementRoutes
=
require
(
'
./route/userManagement
'
);
// JSON 요청 본문을 파싱하는 미들웨어 추가
app
.
use
(
express
.
json
());
//비밀번호 변경 라우트 추가
...
...
@@ -45,6 +44,7 @@ app.use(express.json());
// //회원 탈퇴 라우트
// app.use('/del_user', deleteUser);
//사용자 관리 라우트
const
userManagementRoutes
=
require
(
'
./route/userManagement
'
);
app
.
use
(
'
/userManagement
'
,
userManagementRoutes
);
//여행 라우트
const
tripRoutes
=
require
(
'
./route/tripRoute
'
);
// 라우트 파일 경로
...
...
This diff is collapsed.
Click to expand it.
controllers/userManagementController.js
+
0
−
1
View file @
bb4fdbbd
...
...
@@ -94,4 +94,3 @@ exports.deleteUser = async (req, res) => {
};
module
.
exports
=
router
;
\ No newline at end of file
This diff is collapsed.
Click to expand it.
models/trips.js
+
4
−
3
View file @
bb4fdbbd
...
...
@@ -61,9 +61,10 @@ tripSchema.pre('save', function (next) {
const
start
=
new
Date
(
trip
.
start_date
);
const
end
=
new
Date
(
trip
.
end_date
);
// 기존 `plans` 데이터를 유지
const
plans
=
trip
.
plans
||
new
Map
();
// // 기존 `plans` 데이터를 유지
// const plans = trip.plans || new Map();
// plans가 없는 경우 초기화
const
plans
=
trip
.
plans
instanceof
Map
?
trip
.
plans
:
new
Map
(
Object
.
entries
(
trip
.
plans
||
{}));
let
currentDay
=
1
;
// 새 day만 추가
...
...
This diff is collapsed.
Click to expand it.
route/userManagement.js
+
6
−
6
View file @
bb4fdbbd
const
express
=
require
(
'
express
'
);
const
router
=
express
.
Router
();
const
User
=
require
(
'
../models/user
'
);
// User 스키마 참조
router
.
post
(
'
/change
'
,
changeName
);
router
.
post
(
'
/changePassword
'
,
changePassword
);
router
.
delete
(
'
/:userId
'
,
deleteUser
);
const
userManagementController
=
require
(
'
../controllers/userManagementController
'
);
const
router
=
express
.
Router
();
router
.
post
(
'
/change
'
,
userManagementController
.
changeName
);
router
.
post
(
'
/changePassword
'
,
userManagementController
.
changePassword
);
router
.
delete
(
'
/:userId
'
,
userManagementController
.
deleteUser
);
module
.
exports
=
router
;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment