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

feat(mission): add the submission start date time #765

Merged
merged 10 commits into from
Oct 15, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,20 @@ export default {

const Template: ComponentStory<typeof MyMissionItem> = (args) => <MyMissionItem {...args} />;

export const NotSubmittedMission = Template.bind({});
NotSubmittedMission.args = {
export const PreparedMission = Template.bind({});
PreparedMission.args = {
mission: missionsDummy["1"][0],
recruitmentId: "1",
};

export const InProgressMission = Template.bind({});
InProgressMission.args = {
mission: missionsDummy["1"][1],
recruitmentId: "1",
};

export const SubmittingMission = Template.bind({});
SubmittingMission.args = {
mission: missionsDummy["2"][0],
recruitmentId: "1",
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from "classnames";
import { Mission } from "../../../../types/domains/recruitments";
import { Mission, MissionStatus } from "../../../../types/domains/recruitments";
import { MISSION_STATUS } from "../../../constants/recruitment";
import MissionDetail from "./MissionDetail/MissionDetail";
import styles from "../MyApplicationItem.module.css";
Expand All @@ -21,6 +21,14 @@ const MyMissionItem = ({ mission, recruitmentId }: MyMissionItemProps) => {
const { missionItem, applyButtonLabel, formattedStartDateTime, formattedEndDateTime } =
useMission({ mission, recruitmentId });

const viewable = (
[
MISSION_STATUS.IN_PROGRESS,
MISSION_STATUS.SUBMITTING,
MISSION_STATUS.UNSUBMITTABLE,
] as MissionStatus[]
).includes(missionItem.status);

const routeToAssignmentSubmit =
({ recruitmentId, mission }: { recruitmentId: string; mission: Mission }) =>
() => {
Expand Down Expand Up @@ -61,7 +69,7 @@ const MyMissionItem = ({ mission, recruitmentId }: MyMissionItemProps) => {
<li>
<Button
className={buttonStyles["assignment-button"]}
disabled={missionItem.status !== MISSION_STATUS.SUBMITTING}
disabled={!viewable}
onClick={routeToMissionView}
>
과제 보기
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ export function createMockMission(overrides: Partial<Mission> = {}): Mission {
const defaultMission: Mission = {
id: 1,
title: "테스트 미션",
description: "테스트 설명",
submittable: true,
submitted: false,
startDateTime: "2023-01-01T00:00:00" as ISO8601DateString,
endDateTime: "2023-12-31T23:59:59" as ISO8601DateString,
description: "테스트 설명",
submissionMethod: "PUBLIC_PULL_REQUEST",
status: MISSION_STATUS.SUBMITTING,
submitted: false,
testable: true,
judgment: null,
submissionMethod: "PUBLIC_PULL_REQUEST",
};

return {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/constants/recruitment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ export const RECRUITMENT_STATUS = {
} as const;

export const MISSION_STATUS = {
PREPARED: "PREPARED",
IN_PROGRESS: "IN_PROGRESS",
SUBMITTABLE: "SUBMITTABLE",
SUBMITTING: "SUBMITTING",
UNSUBMITTABLE: "UNSUBMITTABLE",
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/hooks/useMission.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ type MissionProps = {

export const getMissionLabel = (submitted: boolean, missionStatus: Mission["status"]) => {
const labelMap = {
PREPARED: BUTTON_LABEL.BEFORE_SUBMIT,
IN_PROGRESS: BUTTON_LABEL.BEFORE_SUBMIT,
SUBMITTABLE: BUTTON_LABEL.BEFORE_SUBMIT,
SUBMITTING: submitted ? BUTTON_LABEL.EDIT : BUTTON_LABEL.SUBMIT,
UNSUBMITTABLE: BUTTON_LABEL.UNSUBMITTABLE,
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/hooks/useMissionJudgment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ const useMissionJudgment = ({ missionItem, recruitmentId }: MissionJudgementProp
const isSubmitted = submitted;
const isJudgmentNotStartedOrTimedOut =
judgment?.status !== JUDGMENT_STATUS.STARTED || isJudgmentTimedOut(judgment);
const isMissionActive = !(
[MISSION_STATUS.ENDED, MISSION_STATUS.UNSUBMITTABLE] as MissionStatus[]
).includes(status);
const isMissionActive = status === MISSION_STATUS.SUBMITTING;

const isJudgmentAvailable = isSubmitted && isJudgmentNotStartedOrTimedOut && isMissionActive;

Expand Down
Loading