Tirsvad-Udemy-100-days-of-code/016-oop-coffee-machine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring Phase 2 (MIL-002) into main #19

Merged
Tirsvad merged 3 commits from mil-001-project-setup into main 2026-10-07 05:04:34 +02:00
Conversation 0 Commits 3 Files Changed 15
+562 -11
Tirsvad commented 2026-10-07 05:03:34 +02:00
Owner
Copy Link
Copy Source

Summary

PR #17 (Implement coffee machine program and tests, MIL-002) was merged into mil-001-project-setup after PR #16 had already merged that branch into main, so the Phase 2 code never reached main. This PR brings it in.

Content, as reviewed in #17:

  • Menu/MenuItem, CoffeeMaker and MoneyMachine with the assignment's method names, and the main loop (python -m coffee_machine).
  • Drink prices, ingredient amounts and message text in constants.py.
  • 25 pytest tests and the code review record RC-007 against QC-PY-001.

Verification

ruff format, ruff check, mypy --strict clean; pytest 25 passed; doxygen Doxyfile no warnings.

Notes for the reviewer

  • No new code: the diff is the Phase 2 work already reviewed in #17.
  • After this merges, retarget PR #18 (README, MIL-003) to main.

Closes #6
Closes #7
Closes #8
Closes #9
Closes #10
Closes #11

## Summary PR #17 (Implement coffee machine program and tests, MIL-002) was merged into `mil-001-project-setup` after PR #16 had already merged that branch into `main`, so the Phase 2 code never reached `main`. This PR brings it in. Content, as reviewed in #17: - `Menu`/`MenuItem`, `CoffeeMaker` and `MoneyMachine` with the assignment's method names, and the main loop (`python -m coffee_machine`). - Drink prices, ingredient amounts and message text in `constants.py`. - 25 pytest tests and the code review record RC-007 against QC-PY-001. ## Verification `ruff format`, `ruff check`, `mypy --strict` clean; `pytest` 25 passed; `doxygen Doxyfile` no warnings. ## Notes for the reviewer - No new code: the diff is the Phase 2 work already reviewed in #17. - After this merges, retarget PR #18 (README, MIL-003) to `main`. Closes #6 Closes #7 Closes #8 Closes #9 Closes #10 Closes #11
Tirsvad added 3 commits 2026-10-07 05:03:34 +02:00
Implement coffee machine program and tests (MIL-002)
CI / test (push) Successful in 50s
Details
2b6b3bee46 
Add the Menu, MenuItem, CoffeeMaker and MoneyMachine classes with the
assignment's method names, and a main loop that supports drink names,
report and off. Resources are checked before payment, and payment
before the drink is made.

Move drink prices, ingredient amounts and all message text into
constants.py. Add 25 pytest tests for every class and the main loop,
and record the review against QC-PY-001 as RC-007.

Task: MIL-002#1
Task: MIL-002#2
Task: MIL-002#3
Task: MIL-002#4
Task: MIL-002#5
Task: MIL-002#6
Closes #6
Closes #7
Closes #8
Closes #9
Closes #10
Closes #11
Resolve pending commit link for RC-007
CI / test (push) Successful in 46s
Details
CI / test (pull_request) Successful in 48s
Details
0cdc814198 
Link the Version History row of RC-007 to commit 2b6b3be and add the
link definition.

Refs #6
Refs #7
Refs #8
Refs #9
Refs #10
Refs #11
Merge pull request 'Implement coffee machine program and tests (MIL-002)' (#17) from mil-002-coffee-machine into mil-001-project-setup
CI / test (push) Successful in 48s
Details
CI / test (pull_request) Successful in 49s
Details
1cd2a92e45 
Reviewed-on: Tirsvad-Udemy-100_days_of_code/016-oop_coffee_machine#17
Tirsvad merged commit b10384bbaa into main 2026-10-07 05:04:34 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Tirsvad
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Tirsvad-Udemy-100-days-of-code/016-oop-coffee-machine#19