Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
When Meet - 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
websystem2023-2
When Meet - Backend
Commits
8ce5b334
Commit
8ce5b334
authored
1 year ago
by
Wo-ogie
Browse files
Options
Downloads
Patches
Plain Diff
refactor: Meeting 관련 기능 재사용 가능하도록 controller-service 구조로 변경
parent
693fe0dd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
controllers/meeting.js
+14
-67
14 additions, 67 deletions
controllers/meeting.js
services/meeting.js
+79
-0
79 additions, 0 deletions
services/meeting.js
with
93 additions
and
67 deletions
controllers/meeting.js
+
14
−
67
View file @
8ce5b334
const
bcrypt
=
require
(
'
bcrypt
'
);
const
{
Meeting
,
Participant
,
Schedule
}
=
require
(
'
../models
'
);
const
meetingRepositotry
=
require
(
'
../repository/meeting
'
);
const
{
sendMeetingVoteEndNotificationEmail
}
=
require
(
'
../services/mail
'
);
const
{
Meeting
,
Participant
}
=
require
(
'
../models
'
);
const
meetingRepository
=
require
(
'
../repository/meeting
'
);
const
{
getMeetingById
,
getMeetingWithParticipantsById
,
getMeetingWithParticipantsAndSchedulesById
,
closeMeetingById
,
}
=
require
(
'
../services/meeting
'
);
const
{
createMeetingNotFoundError
,
createMeetingIsAlreadyClosedError
,
createPasswordNotMatchedError
,
createPasswordIsNullError
,
}
=
require
(
'
../errors/meetingErrors
'
);
...
...
@@ -28,51 +31,6 @@ async function encryptPassword(password, next) {
}
}
async
function
getMeetingById
(
meetingId
)
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
}
async
function
getMeetingWithParticipantsById
(
meetingId
)
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
include
:
[
{
model
:
Participant
,
},
],
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
}
async
function
getMeetingWithParticipantsAndSchedulesById
(
meetingId
)
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
include
:
[
{
model
:
Participant
,
include
:
[
{
model
:
Schedule
,
},
],
},
],
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
}
async
function
getParticipantByNameAndMeetingId
(
name
,
meetingId
)
{
const
participant
=
await
Participant
.
findOne
({
where
:
{
...
...
@@ -218,7 +176,7 @@ exports.getTopThreeConfirmedTimes = async (req, res, next) => {
return
res
.
status
(
400
).
json
({
message
:
'
Purpose is required
'
});
}
try
{
const
results
=
await
meetingReposito
t
ry
.
getTopThreeConfirmedTimes
(
purpose
);
const
results
=
await
meetingRepository
.
getTopThreeConfirmedTimes
(
purpose
);
return
res
.
json
({
topThreeConfirmedTimes
:
results
,
});
...
...
@@ -227,31 +185,20 @@ exports.getTopThreeConfirmedTimes = async (req, res, next) => {
}
};
function
validateMeetingIsNotClosed
(
meeting
)
{
if
(
meeting
.
isClosed
===
true
)
{
throw
createMeetingIsAlreadyClosedError
();
}
}
exports
.
closeMeeting
=
async
(
req
,
res
,
next
)
=>
{
try
{
// TODO: query 최적화 필요
const
{
meetingId
}
=
req
.
params
;
const
meeting
=
await
getMeetingWithParticipantsById
(
meetingId
);
let
meeting
=
await
getMeetingById
(
meetingId
);
await
validatePasswordIsMatched
(
req
.
body
.
adminPassword
,
meeting
.
adminPassword
,
);
validateMeetingIsNotClosed
(
meeting
);
meeting
.
isClosed
=
true
;
await
meeting
.
save
();
await
closeMeetingById
(
meetingId
);
await
Promise
.
all
(
meeting
.
Participants
.
filter
((
participant
)
=>
participant
.
email
).
map
(
(
participant
)
=>
sendMeetingVoteEndNotificationEmail
(
participant
.
email
,
meetingId
),
),
);
meeting
=
await
getMeetingWithParticipantsById
(
meetingId
);
return
res
.
json
(
MeetingResponse
.
from
(
meeting
));
}
catch
(
error
)
{
return
next
(
error
);
...
...
This diff is collapsed.
Click to expand it.
services/meeting.js
0 → 100644
+
79
−
0
View file @
8ce5b334
const
{
sendMeetingVoteEndNotificationEmail
}
=
require
(
'
./mail
'
);
const
{
Meeting
,
Participant
,
Schedule
}
=
require
(
'
../models
'
);
const
{
createMeetingNotFoundError
,
createMeetingIsAlreadyClosedError
,
}
=
require
(
'
../errors/meetingErrors
'
);
const
getMeetingById
=
async
(
meetingId
)
=>
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
};
const
getMeetingWithParticipantsById
=
async
(
meetingId
)
=>
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
include
:
[
{
model
:
Participant
,
},
],
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
};
const
getMeetingWithParticipantsAndSchedulesById
=
async
(
meetingId
)
=>
{
const
meeting
=
await
Meeting
.
findOne
({
where
:
{
id
:
meetingId
},
include
:
[
{
model
:
Participant
,
include
:
[
{
model
:
Schedule
,
},
],
},
],
});
if
(
!
meeting
)
{
throw
createMeetingNotFoundError
();
}
return
meeting
;
};
function
validateMeetingIsNotClosed
(
meeting
)
{
if
(
meeting
.
isClosed
===
true
)
{
throw
createMeetingIsAlreadyClosedError
();
}
}
const
closeMeetingById
=
async
(
meetingId
)
=>
{
const
meeting
=
getMeetingById
(
meetingId
);
validateMeetingIsNotClosed
(
meeting
);
meeting
.
isClosed
=
true
;
await
meeting
.
save
();
await
Promise
.
all
(
meeting
.
Participants
.
filter
((
participant
)
=>
participant
.
email
).
map
(
(
participant
)
=>
sendMeetingVoteEndNotificationEmail
(
participant
.
email
,
meetingId
),
),
);
};
module
.
exports
=
{
getMeetingById
,
getMeetingWithParticipantsById
,
getMeetingWithParticipantsAndSchedulesById
,
closeMeetingById
,
};
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