Skip to content

3. Константинов Максим Артемович. 613 #110

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.

Sign up for GitHub

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

Closed
terrymcgrowl wants to merge 1 commit into from
Closed

3. Константинов Максим Артемович. 613 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 59 additions & 8 deletions src/part2/cart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

from typing import Final

from .crud import read_product, update_product # noqa: F401
from .storage import ( # noqa: F401
from .crud import read_product, update_product
from .storage import (
NAME_INDEX,
PRICE_INDEX,
QUANTITY_INDEX,
Expand All @@ -22,9 +22,15 @@

type CartLine = tuple[int, int]

# TODO: задайте позиции полей внутри кортежа CartLine
LINE_PRODUCT_ID_INDEX: Final = 0
LINE_QUANTITY_INDEX: Final = 0
LINE_QUANTITY_INDEX: Final = 1


def find_cart_line(cart: list[CartLine], product_id: int) -> CartLine | None:
"""Return the cart line for ``product_id``, if present."""
return next(
(line for line in cart if line[LINE_PRODUCT_ID_INDEX] == product_id), None
)


def add_to_cart(
Expand Down Expand Up @@ -53,8 +59,30 @@ def add_to_cart(
The cart line for ``product_id`` after the addition, or ``None``
when the product is unknown or the store cannot cover the request.
"""
# TODO: реализуйте функцию
return (0, 0)
product = read_product(storage, product_id)
if product is None:
return None
available = product[QUANTITY_INDEX]
if available < quantity:
print(
f"not enough stock for product {product_id}: {available} available, "
f"{quantity} requested"
)
return None
update_product(
storage,
product_id,
(product[NAME_INDEX], product[PRICE_INDEX], available - quantity),
)
line = find_cart_line(cart, product_id)
if line is None:
line = (product_id, quantity)
cart.append(line)
return line
index = cart.index(line)
updated = (product_id, line[LINE_QUANTITY_INDEX] + quantity)
cart[index] = updated
return updated


def remove_from_cart(
Expand Down Expand Up @@ -85,5 +113,28 @@ def remove_from_cart(
zero means the line was dropped), or ``None`` when the cart has no
line for the product or holds too few units.
"""
# TODO: реализуйте функцию
return (0, 0)
line = find_cart_line(cart, product_id)
if line is None:
print(f"product {product_id} is not in the cart")
return None
held = line[LINE_QUANTITY_INDEX]
if held < quantity:
print(
f"cart holds only {held} unit(s) of product {product_id}, cannot remove {quantity}"
)
return None
product = read_product(storage, product_id)
if product is None:
return None
update_product(
storage,
product_id,
(product[NAME_INDEX], product[PRICE_INDEX], product[QUANTITY_INDEX] + quantity),
)
remaining = held - quantity
index = cart.index(line)
if remaining == 0:
del cart[index]
else:
cart[index] = (product_id, remaining)
return (product_id, remaining)
45 changes: 33 additions & 12 deletions src/part2/crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

from decimal import Decimal

from .storage import ( # noqa: F401
from .storage import (
NAME_INDEX,
PRODUCT_ID_INDEX,
PRODUCT_ID_MIN,
Product,
)
from .utils import normalize_price # noqa: F401
from .utils import normalize_price


def generate_product_id(storage: list[Product]) -> int:
Expand All @@ -34,8 +34,11 @@ def generate_product_id(storage: list[Product]) -> int:
:data:`~src.part2.storage.PRODUCT_ID_MIN` when ``storage`` is
empty.
"""
# TODO: реализуйте функцию
return 0
return (
max(product[PRODUCT_ID_INDEX] for product in storage) + 1
if storage
else PRODUCT_ID_MIN
)


def create_product(
Expand All @@ -56,8 +59,13 @@ def create_product(
``storage`` is left unchanged and a message naming the clashing
name is printed.
"""
# TODO: реализуйте функцию
return 0
name, price, quantity = fields
if any(product[NAME_INDEX] == name for product in storage):
print(f"product name {name!r} is already taken")
return None
product_id = generate_product_id(storage)
storage.append((product_id, name, normalize_price(price), quantity))
return product_id


def read_product(storage: list[Product], product_id: int) -> Product | None:
Expand All @@ -72,8 +80,11 @@ def read_product(storage: list[Product], product_id: int) -> Product | None:
``None`` when no product carries that identifier (a message is
printed in that case).
"""
# TODO: реализуйте функцию
return (0, "", Decimal(0), 0)
for product in storage:
if product[PRODUCT_ID_INDEX] == product_id:
return product
print(f"no product with id {product_id}")
return None


def update_product(
Expand All @@ -99,8 +110,14 @@ def update_product(
``None`` when no product carries that identifier (``storage`` is
left unchanged and a message is printed).
"""
# TODO: реализуйте функцию
return (0, "", Decimal(0), 0)
name, price, quantity = fields
for index, product in enumerate(storage):
if product[PRODUCT_ID_INDEX] == product_id:
updated = (product_id, name, normalize_price(price), quantity)
storage[index] = updated
return updated
print(f"no product with id {product_id}")
return None


def delete_product(storage: list[Product], product_id: int) -> int | None:
Expand All @@ -116,5 +133,9 @@ def delete_product(storage: list[Product], product_id: int) -> int | None:
product carried that identifier (``storage`` is left unchanged and
a message is printed).
"""
# TODO: реализуйте функцию
return 0
for index, product in enumerate(storage):
if product[PRODUCT_ID_INDEX] == product_id:
del storage[index]
return product_id
print(f"no product with id {product_id}")
return None
10 changes: 4 additions & 6 deletions src/part2/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@

type Product = tuple[int, str, Decimal, int]

# TODO: задайте позиции полей внутри кортежа Product
PRODUCT_ID_INDEX: Final = 0
NAME_INDEX: Final = 0
PRICE_INDEX: Final = 0
QUANTITY_INDEX: Final = 0
NAME_INDEX: Final = 1
PRICE_INDEX: Final = 2
QUANTITY_INDEX: Final = 3

# TODO: задайте идентификатор первого товара в пустом хранилище
PRODUCT_ID_MIN: Final[int] = 0
PRODUCT_ID_MIN: Final[int] = 1
10 changes: 4 additions & 6 deletions src/part2/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
currency values free of binary floating-point error.
"""

from decimal import ROUND_HALF_UP, Decimal # noqa: F401
from decimal import ROUND_HALF_UP, Decimal
from typing import Final


# TODO: задайте число знаков после запятой и шаг квантования
PRICE_PRECISION: Final[int] = 0
PRICE_STEP: Final = Decimal(0)
PRICE_PRECISION: Final[int] = 2
PRICE_STEP: Final = Decimal(1).scaleb(-PRICE_PRECISION)


def normalize_price(price: Decimal) -> Decimal:
Expand All @@ -25,5 +24,4 @@ def normalize_price(price: Decimal) -> Decimal:
``price`` quantised to :data:`PRICE_PRECISION` fractional digits,
with halves rounded up.
"""
# TODO: реализуйте функцию
return Decimal(0)
return price.quantize(PRICE_STEP, rounding=ROUND_HALF_UP)
60 changes: 48 additions & 12 deletions src/part3/crud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@

from decimal import Decimal

from .storage import ( # noqa: F401
from .storage import (
NAME_INDEX,
PRODUCT_ID_INDEX,
PRODUCT_ID_MIN,
Product,
)
from .utils import normalize_price, normalize_product_name # noqa: F401
from .utils import normalize_price, normalize_product_name


def generate_product_id(storage: list[Product]) -> int:
Expand All @@ -40,8 +40,11 @@ def generate_product_id(storage: list[Product]) -> int:
:data:`~src.part3.storage.PRODUCT_ID_MIN` when ``storage`` is
empty.
"""
# TODO: реализуйте функцию (используйте своё решение части 2)
return 0
return (
max(product[PRODUCT_ID_INDEX] for product in storage) + 1
if storage
else PRODUCT_ID_MIN
)


def create_product(
Expand All @@ -64,8 +67,17 @@ def create_product(
normalised name already exists. In the ``None`` case ``storage``
is left unchanged and an explanatory message is printed.
"""
# TODO: реализуйте функцию
return 0
name, price, quantity = fields
name = normalize_product_name(name)
if not name:
print("product name must not be blank")
return None
if any(product[NAME_INDEX] == name for product in storage):
print(f"product name {name!r} is already taken")
return None
product_id = generate_product_id(storage)
storage.append((product_id, name, normalize_price(price), quantity))
return product_id


def read_product(storage: list[Product], product_id: int) -> Product | None:
Expand All @@ -80,8 +92,11 @@ def read_product(storage: list[Product], product_id: int) -> Product | None:
``None`` when no product carries that identifier (a message is
printed in that case).
"""
# TODO: реализуйте функцию (используйте своё решение части 2)
return (0, "", Decimal(0), 0)
for product in storage:
if product[PRODUCT_ID_INDEX] == product_id:
return product
print(f"no product with id {product_id}")
return None


def update_product(
Expand Down Expand Up @@ -110,8 +125,25 @@ def update_product(
unchanged and an explanatory message is printed. Renaming a
product to its own current name is allowed.
"""
# TODO: реализуйте функцию
return (0, "", Decimal(0), 0)
name, price, quantity = fields
name = normalize_product_name(name)
if not name:
print("product name must not be blank")
return None
for index, product in enumerate(storage):
if product[PRODUCT_ID_INDEX] != product_id:
continue
if any(
other[PRODUCT_ID_INDEX] != product_id and other[NAME_INDEX] == name
for other in storage
):
print(f"product name {name!r} is already taken")
return None
updated = (product_id, name, normalize_price(price), quantity)
storage[index] = updated
return updated
print(f"no product with id {product_id}")
return None


def delete_product(storage: list[Product], product_id: int) -> int | None:
Expand All @@ -127,5 +159,9 @@ def delete_product(storage: list[Product], product_id: int) -> int | None:
product carried that identifier (``storage`` is left unchanged and
a message is printed).
"""
# TODO: реализуйте функцию (используйте своё решение части 2)
return 0
for index, product in enumerate(storage):
if product[PRODUCT_ID_INDEX] == product_id:
del storage[index]
return product_id
print(f"no product with id {product_id}")
return None
Loading
Loading