From c9de47d664125871e29bbf094ef86226b1835945 Mon Sep 17 00:00:00 2001 From: sw1py Date: Fri, 25 Sep 2026 23:51:25 +0300 Subject: [PATCH 1/7] Solve task 1 --- src/part1/constants.py | 17 ++++++------- src/part1/snowflake.py | 57 +++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index 9abfbba2..4705a214 100644 --- a/src/part1/constants.py +++ b/src/part1/constants.py @@ -16,23 +16,22 @@ # TODO: замените заглушки (0) на корректные значения, см. TASK.md. -# Все константы, зависящие от ёмкостей *_BITS, должны вычисляться из них. # Twitter's original Snowflake epoch: 2010-11-04 01:42:54.657 UTC. -EPOCH_MS_DEFAULT: Final[int] = 0 +EPOCH_MS_DEFAULT: Final[int] = 1288834974657 # Node identifier used when the caller does not supply one. -NODE_ID_DEFAULT: Final[int] = 0 +NODE_ID_DEFAULT: Final[int] = 1 # Width of each field, in bits. -TIMESTAMP_BITS: Final[int] = 0 -NODE_ID_BITS: Final[int] = 0 -SEQUENCE_ID_BITS: Final[int] = 0 +TIMESTAMP_BITS: Final[int] = 41 +NODE_ID_BITS: Final[int] = 10 +SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 0 -NODE_ID_MAX: Final[int] = 0 -SEQUENCE_ID_MAX: Final[int] = 0 +TIMESTAMP_MS_MAX: Final[int] = 2 ** TIMESTAMP_BITS - 1 +NODE_ID_MAX: Final[int] = 2 ** NODE_ID_BITS - 1 +SEQUENCE_ID_MAX: Final[int] = 2 ** SEQUENCE_ID_BITS - 1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index d3abf050..24cc4c63 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -21,37 +21,27 @@ NODE_ID_MAX, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, + NODE_ID_BITS, + SEQUENCE_ID_BITS ) def read_current_millis(epoch_ms: int) -> int: - """Read the number of milliseconds elapsed since the custom epoch. - Args: - epoch_ms: The custom epoch expressed as Unix milliseconds. + user_time = int(time.time() * 1000) + + differnse_time = user_time - epoch_ms - Returns: - The count of whole milliseconds between ``epoch_ms`` and now. May be - negative if ``epoch_ms`` lies in the future. - """ - # TODO: реализуйте функцию - return 0 + return differnse_time def decode_timestamp_ms(snowflake_id: int, epoch_ms: int = EPOCH_MS_DEFAULT) -> int: - """Read the timestamp field out of a Snowflake identifier. - Args: - snowflake_id: An identifier produced against the same epoch. - epoch_ms: The epoch the identifier was generated against. Defaults to - the original Twitter epoch (2010-11-04 01:42:54.657 UTC). + user_mc = snowflake_id >> (NODE_ID_BITS + SEQUENCE_ID_BITS) - Returns: - The absolute Unix time in milliseconds at which the identifier was - generated. - """ - # TODO: реализуйте функцию - return 0 + absolut_time = user_mc + epoch_ms + + return absolut_time def decode_node_id(snowflake_id: int) -> int: @@ -64,8 +54,8 @@ def decode_node_id(snowflake_id: int) -> int: The node identifier packed into ``snowflake_id``, in the range ``[0, NODE_ID_MAX]``. """ - # TODO: реализуйте функцию - return 0 + identifier_id = (snowflake_id >> SEQUENCE_ID_BITS) & NODE_ID_MAX + return identifier_id def decode_sequence_id(snowflake_id: int) -> int: @@ -78,8 +68,8 @@ def decode_sequence_id(snowflake_id: int) -> int: The per-millisecond sequence counter packed into ``snowflake_id``, in the range ``[0, SEQUENCE_ID_MAX]``. """ - # TODO: реализуйте функцию - return 0 + sequence_id = snowflake_id & SEQUENCE_ID_MAX + return sequence_id def generate_snowflake_id( @@ -110,5 +100,20 @@ def generate_snowflake_id( timestamp field (roughly 69 years after ``epoch_ms``). In each of those cases an explanatory message is printed to stdout first. """ - # TODO: реализуйте функцию - return 0 + if node_id < 0 or node_id > NODE_ID_MAX: + print(f"node_id must be in [0, {NODE_ID_MAX}], got {node_id}") + return None + if sequence_id < 0 or sequence_id > SEQUENCE_ID_MAX: + print(f"sequence_id must be in [0, {SEQUENCE_ID_MAX}], got {sequence_id}") + return None + elapsed_ms = read_current_millis(epoch_ms) + if elapsed_ms > TIMESTAMP_MS_MAX: + print(f"timestamp overflows: {elapsed_ms} > {TIMESTAMP_MS_MAX}") + return None + snowflake_id = ( + (elapsed_ms << (NODE_ID_BITS + SEQUENCE_ID_BITS)) + | (node_id << SEQUENCE_ID_BITS) + | sequence_id + ) + return snowflake_id + From 91e402f8bf986d58d8d8e0ca6efe0bc7233bab7c Mon Sep 17 00:00:00 2001 From: sw1py Date: Sat, 26 Sep 2026 00:20:23 +0300 Subject: [PATCH 2/7] =?UTF-8?q?1.=20=D0=94=D1=8F=D0=B1=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=91=D0=BE=D0=B3=D0=B4=D0=B0=D0=BD=20=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87.=20613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/part1/snowflake.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 24cc4c63..5f2a0fbb 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -13,16 +13,16 @@ :func:`decode_node_id` and :func:`decode_sequence_id`. """ -import time # noqa: F401 +import time -from .constants import ( # noqa: F401 +from .constants import ( EPOCH_MS_DEFAULT, + NODE_ID_BITS, NODE_ID_DEFAULT, NODE_ID_MAX, + SEQUENCE_ID_BITS, SEQUENCE_ID_MAX, TIMESTAMP_MS_MAX, - NODE_ID_BITS, - SEQUENCE_ID_BITS ) From 65fc2c7942d714a8f021e710f42b1f37fa6e3ef1 Mon Sep 17 00:00:00 2001 From: sw1py Date: Sat, 26 Sep 2026 00:32:13 +0300 Subject: [PATCH 3/7] =?UTF-8?q?1.=20=D0=94=D1=8F=D0=B1=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=91=D0=BE=D0=B3=D0=B4=D0=B0=D0=BD=20=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87.=20613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/part1/constants.py | 6 +++--- src/part1/snowflake.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/part1/constants.py b/src/part1/constants.py index 4705a214..f07ba214 100644 --- a/src/part1/constants.py +++ b/src/part1/constants.py @@ -29,9 +29,9 @@ SEQUENCE_ID_BITS: Final[int] = 12 # Largest value each field can hold. -TIMESTAMP_MS_MAX: Final[int] = 2 ** TIMESTAMP_BITS - 1 -NODE_ID_MAX: Final[int] = 2 ** NODE_ID_BITS - 1 -SEQUENCE_ID_MAX: Final[int] = 2 ** SEQUENCE_ID_BITS - 1 +TIMESTAMP_MS_MAX: Final[int] = 2**TIMESTAMP_BITS - 1 +NODE_ID_MAX: Final[int] = 2**NODE_ID_BITS - 1 +SEQUENCE_ID_MAX: Final[int] = 2**SEQUENCE_ID_BITS - 1 # Здесь можно добавить собственные вспомогательные константы # (например, сдвиги полей при сборке идентификатора). diff --git a/src/part1/snowflake.py b/src/part1/snowflake.py index 5f2a0fbb..970866cc 100644 --- a/src/part1/snowflake.py +++ b/src/part1/snowflake.py @@ -29,7 +29,7 @@ def read_current_millis(epoch_ms: int) -> int: user_time = int(time.time() * 1000) - + differnse_time = user_time - epoch_ms return differnse_time @@ -116,4 +116,3 @@ def generate_snowflake_id( | sequence_id ) return snowflake_id - From a4060519c201bd77ec6d117c3df6917ce7417282 Mon Sep 17 00:00:00 2001 From: sw1py Date: Fri, 2 Oct 2026 19:53:54 +0300 Subject: [PATCH 4/7] Gg_vp --- src/part2/cart.py | 90 +++++++++++++++++++++++++++++++++++++++++--- src/part2/crud.py | 61 +++++++++++++++++++++++------- src/part2/storage.py | 9 +++-- src/part2/utils.py | 10 +++-- 4 files changed, 142 insertions(+), 28 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 063f9aea..61a64636 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -11,12 +11,13 @@ from typing import Final -from .crud import read_product, update_product # noqa: F401 +from .crud import read_product from .storage import ( # noqa: F401 NAME_INDEX, PRICE_INDEX, QUANTITY_INDEX, Product, + PRODUCT_ID_INDEX ) @@ -24,8 +25,25 @@ # 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 stored under ``product_id``. + + Args: + cart: The store of cart line. + product_id: The identifier to look up. + + Returns: + The matching ``(product_id, line_quantity)`` record, + ``None`` when no cart line carries that identifier (a message is + printed in that case). + """ + for cart_line in cart: + if cart_line[LINE_PRODUCT_ID_INDEX] == product_id: + return cart_line + print(f"No cart line with id {product_id}") + return None def add_to_cart( storage: list[Product], @@ -53,8 +71,40 @@ 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 not product: + return None + if product[QUANTITY_INDEX] < quantity: + print(f"Not enough stock for product {product_id}: {product[QUANTITY_INDEX]} available, {quantity} requested.") + return None + dif = product[QUANTITY_INDEX] - quantity + for index_product, cell in enumerate(storage): + if cell[PRODUCT_ID_INDEX] == product[PRODUCT_ID_INDEX]: + refresh_product = [0, 0, 0, 0] + refresh_product[PRODUCT_ID_INDEX] = cell[PRODUCT_ID_INDEX] + refresh_product[NAME_INDEX] = cell[NAME_INDEX] + refresh_product[PRICE_INDEX] = cell[PRICE_INDEX] + refresh_product[QUANTITY_INDEX] = dif + refresh_product = tuple(refresh_product) + storage[index_product] = refresh_product + for index_line, purchase in enumerate(cart): + if purchase[LINE_PRODUCT_ID_INDEX] == product_id: + refresh_line = [0, 0] + refresh_line[LINE_PRODUCT_ID_INDEX] = purchase[LINE_PRODUCT_ID_INDEX] + refresh_line[LINE_QUANTITY_INDEX] = purchase[LINE_QUANTITY_INDEX] + quantity + purchase = tuple(refresh_line) + cart[index_line] = purchase + return purchase + new_line = [0, 0] + new_line[LINE_PRODUCT_ID_INDEX] = product_id + new_line[LINE_QUANTITY_INDEX] = quantity + new_line = tuple(new_line) + cart.append(new_line) + return new_line + + + + def remove_from_cart( @@ -85,5 +135,33 @@ 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) + our_line = find_cart_line(cart, product_id) + if not our_line: + return None + if our_line[LINE_QUANTITY_INDEX] < quantity: + print(f"Cart holds only {our_line[LINE_QUANTITY_INDEX]} unit(s) of product {product_id}, can't remove {quantity}") + return None + product = read_product(storage, product_id) + if not product: + return None + for index_cart_line, cart_line in enumerate(cart): + if our_line[LINE_PRODUCT_ID_INDEX] == cart_line[LINE_PRODUCT_ID_INDEX]: + updation_line = [0, 0] + updation_line[LINE_PRODUCT_ID_INDEX] = our_line[LINE_PRODUCT_ID_INDEX] + updation_line[LINE_QUANTITY_INDEX] = our_line[LINE_QUANTITY_INDEX] - quantity + updation_line = tuple(updation_line) + for index_product, stored_product in enumerate(storage): + if stored_product[PRODUCT_ID_INDEX] == product[PRODUCT_ID_INDEX]: + refresh_product = [0, 0, 0, 0] + refresh_product[PRODUCT_ID_INDEX] = stored_product[PRODUCT_ID_INDEX] + refresh_product[NAME_INDEX] = stored_product[NAME_INDEX] + refresh_product[PRICE_INDEX] = stored_product[PRICE_INDEX] + refresh_product[QUANTITY_INDEX] = stored_product[QUANTITY_INDEX] + quantity + refresh_product = tuple(refresh_product) + storage[index_product] = refresh_product + if updation_line[LINE_QUANTITY_INDEX] == 0: + del cart[index_cart_line] + else: + cart[index_cart_line] = updation_line + return updation_line + diff --git a/src/part2/crud.py b/src/part2/crud.py index d026cbcb..64039588 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -14,13 +14,16 @@ from decimal import Decimal -from .storage import ( # noqa: F401 +from storage import ( # noqa: F401 NAME_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, Product, + PRICE_INDEX, + QUANTITY_INDEX + ) -from .utils import normalize_price # noqa: F401 +from utils import normalize_price # noqa: F401 def generate_product_id(storage: list[Product]) -> int: @@ -34,10 +37,10 @@ def generate_product_id(storage: list[Product]) -> int: :data:`~src.part2.storage.PRODUCT_ID_MIN` when ``storage`` is empty. """ - # TODO: реализуйте функцию - return 0 - - + if not storage: + return PRODUCT_ID_MIN + product_id = max(product[PRODUCT_ID_INDEX] for product in storage) + 1 + return product_id def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: @@ -56,8 +59,15 @@ def create_product( ``storage`` is left unchanged and a message naming the clashing name is printed. """ - # TODO: реализуйте функцию - return 0 + + for product in storage: + if product[NAME_INDEX] == fields[0]: + print(f"Product name {product[NAME_INDEX]} is already taken.") + return None + new_product_id = generate_product_id(storage) + new_product = (new_product_id, fields[0], normalize_price(fields[1]), fields[2]) + storage.append(new_product) + return new_product_id def read_product(storage: list[Product], product_id: int) -> Product | None: @@ -72,8 +82,13 @@ 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( @@ -99,8 +114,20 @@ 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) + real_price = fields[1] + norm_price = normalize_price(real_price) + for index_old_product, old_product in enumerate(storage): + if old_product[PRODUCT_ID_INDEX] == product_id: + old_product = list(old_product) + old_product[NAME_INDEX] = fields[0] + old_product[PRICE_INDEX] = norm_price + old_product[QUANTITY_INDEX] = fields[2] + updation_product = tuple(old_product) + storage[index_old_product] = updation_product + return updation_product + print(f"No product with id {product_id}") + return None + def delete_product(storage: list[Product], product_id: int) -> int | None: @@ -116,5 +143,11 @@ 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 product in storage: + if product[PRODUCT_ID_INDEX] == product_id: + storage.remove(product) + return product_id + + print(f"No product with id {product_id}") + return None + diff --git a/src/part2/storage.py b/src/part2/storage.py index b63d5fc7..481f40af 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -26,9 +26,10 @@ # 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 + diff --git a/src/part2/utils.py b/src/part2/utils.py index ec0348d3..269bb170 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -11,8 +11,8 @@ # 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: @@ -25,5 +25,7 @@ def normalize_price(price: Decimal) -> Decimal: ``price`` quantised to :data:`PRICE_PRECISION` fractional digits, with halves rounded up. """ - # TODO: реализуйте функцию - return Decimal(0) + ratio = price / PRICE_STEP + steps = ratio.quantize(Decimal(1.), rounding=ROUND_HALF_UP) + real_price = steps * PRICE_STEP + return real_price From cb1fb21cd44e1a20eb1fbd7dc8c785fb2a200647 Mon Sep 17 00:00:00 2001 From: sw1py Date: Fri, 2 Oct 2026 22:06:32 +0300 Subject: [PATCH 5/7] =?UTF-8?q?2.=20=D0=94=D1=8F=D0=B1=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=91=D0=BE=D0=B3=D0=B4=D0=B0=D0=BD=20=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87.=20613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/part2/cart.py | 4 ++-- src/part2/crud.py | 9 ++++----- src/part2/utils.py | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 61a64636..7d4ad634 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -12,12 +12,12 @@ from typing import Final from .crud import read_product -from .storage import ( # noqa: F401 +from .storage import ( NAME_INDEX, PRICE_INDEX, + PRODUCT_ID_INDEX, QUANTITY_INDEX, Product, - PRODUCT_ID_INDEX ) diff --git a/src/part2/crud.py b/src/part2/crud.py index 64039588..c184f3c6 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -14,16 +14,15 @@ from decimal import Decimal -from storage import ( # noqa: F401 +from storage import ( NAME_INDEX, + PRICE_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, + QUANTITY_INDEX, Product, - PRICE_INDEX, - QUANTITY_INDEX - ) -from utils import normalize_price # noqa: F401 +from utils import normalize_price def generate_product_id(storage: list[Product]) -> int: diff --git a/src/part2/utils.py b/src/part2/utils.py index 269bb170..25df1db7 100644 --- a/src/part2/utils.py +++ b/src/part2/utils.py @@ -6,7 +6,7 @@ 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 @@ -26,6 +26,6 @@ def normalize_price(price: Decimal) -> Decimal: with halves rounded up. """ ratio = price / PRICE_STEP - steps = ratio.quantize(Decimal(1.), rounding=ROUND_HALF_UP) + steps = ratio.quantize(Decimal("1."), rounding=ROUND_HALF_UP) real_price = steps * PRICE_STEP return real_price From 93374336ceccdee6f20bfcef406a58c1a5adff6c Mon Sep 17 00:00:00 2001 From: sw1py Date: Fri, 2 Oct 2026 22:37:08 +0300 Subject: [PATCH 6/7] =?UTF-8?q?2.=20=D0=94=D1=8F=D0=B1=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=91=D0=BE=D0=B3=D0=B4=D0=B0=D0=BD=20=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87.=20613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/part2/cart.py | 37 +++++++++++++++++++++++-------------- src/part2/crud.py | 10 ++++------ src/part2/storage.py | 1 - 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 7d4ad634..5a46185d 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -27,9 +27,10 @@ LINE_PRODUCT_ID_INDEX: Final = 0 LINE_QUANTITY_INDEX: Final = 1 -def find_cart_line(cart: list[CartLine], product_id: int) -> CartLine|None: + +def find_cart_line(cart: list[CartLine], product_id: int) -> CartLine | None: """Return the cart line stored under ``product_id``. - + Args: cart: The store of cart line. product_id: The identifier to look up. @@ -42,9 +43,9 @@ def find_cart_line(cart: list[CartLine], product_id: int) -> CartLine|None: for cart_line in cart: if cart_line[LINE_PRODUCT_ID_INDEX] == product_id: return cart_line - print(f"No cart line with id {product_id}") return None + def add_to_cart( storage: list[Product], cart: list[CartLine], @@ -75,7 +76,9 @@ def add_to_cart( if not product: return None if product[QUANTITY_INDEX] < quantity: - print(f"Not enough stock for product {product_id}: {product[QUANTITY_INDEX]} available, {quantity} requested.") + print( + f"Not enough stock for product {product_id}: {product[QUANTITY_INDEX]} available, {quantity} requested." + ) return None dif = product[QUANTITY_INDEX] - quantity for index_product, cell in enumerate(storage): @@ -90,8 +93,12 @@ def add_to_cart( for index_line, purchase in enumerate(cart): if purchase[LINE_PRODUCT_ID_INDEX] == product_id: refresh_line = [0, 0] - refresh_line[LINE_PRODUCT_ID_INDEX] = purchase[LINE_PRODUCT_ID_INDEX] - refresh_line[LINE_QUANTITY_INDEX] = purchase[LINE_QUANTITY_INDEX] + quantity + refresh_line[LINE_PRODUCT_ID_INDEX] = purchase[ + LINE_PRODUCT_ID_INDEX + ] + refresh_line[LINE_QUANTITY_INDEX] = ( + purchase[LINE_QUANTITY_INDEX] + quantity + ) purchase = tuple(refresh_line) cart[index_line] = purchase return purchase @@ -102,10 +109,6 @@ def add_to_cart( cart.append(new_line) return new_line - - - - def remove_from_cart( storage: list[Product], @@ -137,9 +140,12 @@ def remove_from_cart( """ our_line = find_cart_line(cart, product_id) if not our_line: + print(f"No cart line with id {product_id}") return None if our_line[LINE_QUANTITY_INDEX] < quantity: - print(f"Cart holds only {our_line[LINE_QUANTITY_INDEX]} unit(s) of product {product_id}, can't remove {quantity}") + print( + f"Cart holds only {our_line[LINE_QUANTITY_INDEX]} unit(s) of product {product_id}, can't remove {quantity}" + ) return None product = read_product(storage, product_id) if not product: @@ -148,7 +154,9 @@ def remove_from_cart( if our_line[LINE_PRODUCT_ID_INDEX] == cart_line[LINE_PRODUCT_ID_INDEX]: updation_line = [0, 0] updation_line[LINE_PRODUCT_ID_INDEX] = our_line[LINE_PRODUCT_ID_INDEX] - updation_line[LINE_QUANTITY_INDEX] = our_line[LINE_QUANTITY_INDEX] - quantity + updation_line[LINE_QUANTITY_INDEX] = ( + our_line[LINE_QUANTITY_INDEX] - quantity + ) updation_line = tuple(updation_line) for index_product, stored_product in enumerate(storage): if stored_product[PRODUCT_ID_INDEX] == product[PRODUCT_ID_INDEX]: @@ -156,7 +164,9 @@ def remove_from_cart( refresh_product[PRODUCT_ID_INDEX] = stored_product[PRODUCT_ID_INDEX] refresh_product[NAME_INDEX] = stored_product[NAME_INDEX] refresh_product[PRICE_INDEX] = stored_product[PRICE_INDEX] - refresh_product[QUANTITY_INDEX] = stored_product[QUANTITY_INDEX] + quantity + refresh_product[QUANTITY_INDEX] = ( + stored_product[QUANTITY_INDEX] + quantity + ) refresh_product = tuple(refresh_product) storage[index_product] = refresh_product if updation_line[LINE_QUANTITY_INDEX] == 0: @@ -164,4 +174,3 @@ def remove_from_cart( else: cart[index_cart_line] = updation_line return updation_line - diff --git a/src/part2/crud.py b/src/part2/crud.py index c184f3c6..fb682e67 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -40,6 +40,8 @@ def generate_product_id(storage: list[Product]) -> int: return PRODUCT_ID_MIN product_id = max(product[PRODUCT_ID_INDEX] for product in storage) + 1 return product_id + + def create_product( storage: list[Product], fields: tuple[str, Decimal, int] ) -> int | None: @@ -58,7 +60,7 @@ def create_product( ``storage`` is left unchanged and a message naming the clashing name is printed. """ - + for product in storage: if product[NAME_INDEX] == fields[0]: print(f"Product name {product[NAME_INDEX]} is already taken.") @@ -86,8 +88,6 @@ def read_product(storage: list[Product], product_id: int) -> Product | None: return product print(f"No product with id {product_id}") return None - - def update_product( @@ -128,7 +128,6 @@ def update_product( return None - def delete_product(storage: list[Product], product_id: int) -> int | None: """Remove the product stored under ``product_id`` from ``storage``. @@ -146,7 +145,6 @@ def delete_product(storage: list[Product], product_id: int) -> int | None: if product[PRODUCT_ID_INDEX] == product_id: storage.remove(product) return product_id - + print(f"No product with id {product_id}") return None - diff --git a/src/part2/storage.py b/src/part2/storage.py index 481f40af..35821c5f 100644 --- a/src/part2/storage.py +++ b/src/part2/storage.py @@ -32,4 +32,3 @@ # TODO: задайте идентификатор первого товара в пустом хранилище PRODUCT_ID_MIN: Final[int] = 1 - From c0e0371cf331ee08486e57738930d3fb02287289 Mon Sep 17 00:00:00 2001 From: sw1py Date: Fri, 2 Oct 2026 23:32:42 +0300 Subject: [PATCH 7/7] =?UTF-8?q?2.=20=D0=94=D1=8F=D0=B1=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=BE=20=D0=91=D0=BE=D0=B3=D0=B4=D0=B0=D0=BD=20=D0=9A?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82=D0=B8=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D1=87.=20613?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/part2/cart.py | 108 +++++++++++++++++++++++----------------------- src/part2/crud.py | 22 +++++----- 2 files changed, 64 insertions(+), 66 deletions(-) diff --git a/src/part2/cart.py b/src/part2/cart.py index 5a46185d..e116a8a4 100644 --- a/src/part2/cart.py +++ b/src/part2/cart.py @@ -73,42 +73,40 @@ def add_to_cart( when the product is unknown or the store cannot cover the request. """ product = read_product(storage, product_id) - if not product: + if product is None: return None if product[QUANTITY_INDEX] < quantity: print( - f"Not enough stock for product {product_id}: {product[QUANTITY_INDEX]} available, {quantity} requested." + f"not enough stock for product {product_id}: " + f"{product[QUANTITY_INDEX]} available, {quantity} requested" ) return None - dif = product[QUANTITY_INDEX] - quantity + for index_product, cell in enumerate(storage): - if cell[PRODUCT_ID_INDEX] == product[PRODUCT_ID_INDEX]: - refresh_product = [0, 0, 0, 0] - refresh_product[PRODUCT_ID_INDEX] = cell[PRODUCT_ID_INDEX] - refresh_product[NAME_INDEX] = cell[NAME_INDEX] - refresh_product[PRICE_INDEX] = cell[PRICE_INDEX] - refresh_product[QUANTITY_INDEX] = dif - refresh_product = tuple(refresh_product) - storage[index_product] = refresh_product - for index_line, purchase in enumerate(cart): - if purchase[LINE_PRODUCT_ID_INDEX] == product_id: - refresh_line = [0, 0] - refresh_line[LINE_PRODUCT_ID_INDEX] = purchase[ - LINE_PRODUCT_ID_INDEX - ] - refresh_line[LINE_QUANTITY_INDEX] = ( - purchase[LINE_QUANTITY_INDEX] + quantity - ) - purchase = tuple(refresh_line) - cart[index_line] = purchase - return purchase - new_line = [0, 0] - new_line[LINE_PRODUCT_ID_INDEX] = product_id - new_line[LINE_QUANTITY_INDEX] = quantity - new_line = tuple(new_line) - cart.append(new_line) + if cell[PRODUCT_ID_INDEX] == product_id: + storage[index_product] = ( + cell[PRODUCT_ID_INDEX], + cell[NAME_INDEX], + cell[PRICE_INDEX], + cell[QUANTITY_INDEX] - quantity, + ) + break + else: + return None + + for index_line, purchase in enumerate(cart): + if purchase[LINE_PRODUCT_ID_INDEX] == product_id: + new_line: CartLine = ( + purchase[LINE_PRODUCT_ID_INDEX], + purchase[LINE_QUANTITY_INDEX] + quantity, + ) + cart[index_line] = new_line return new_line + new_line = (product_id, quantity) + cart.append(new_line) + return new_line + def remove_from_cart( storage: list[Product], @@ -139,38 +137,40 @@ def remove_from_cart( line for the product or holds too few units. """ our_line = find_cart_line(cart, product_id) - if not our_line: - print(f"No cart line with id {product_id}") + if our_line is None: + print(f"product {product_id} is not in the cart") return None if our_line[LINE_QUANTITY_INDEX] < quantity: print( - f"Cart holds only {our_line[LINE_QUANTITY_INDEX]} unit(s) of product {product_id}, can't remove {quantity}" + f"cart holds only {our_line[LINE_QUANTITY_INDEX]} unit(s) " + f"of product {product_id}, cannot remove {quantity}" ) return None + product = read_product(storage, product_id) - if not product: + if product is None: return None - for index_cart_line, cart_line in enumerate(cart): - if our_line[LINE_PRODUCT_ID_INDEX] == cart_line[LINE_PRODUCT_ID_INDEX]: - updation_line = [0, 0] - updation_line[LINE_PRODUCT_ID_INDEX] = our_line[LINE_PRODUCT_ID_INDEX] - updation_line[LINE_QUANTITY_INDEX] = ( - our_line[LINE_QUANTITY_INDEX] - quantity + + for index_product, stored_product in enumerate(storage): + if stored_product[PRODUCT_ID_INDEX] == product_id: + storage[index_product] = ( + stored_product[PRODUCT_ID_INDEX], + stored_product[NAME_INDEX], + stored_product[PRICE_INDEX], + stored_product[QUANTITY_INDEX] + quantity, ) - updation_line = tuple(updation_line) - for index_product, stored_product in enumerate(storage): - if stored_product[PRODUCT_ID_INDEX] == product[PRODUCT_ID_INDEX]: - refresh_product = [0, 0, 0, 0] - refresh_product[PRODUCT_ID_INDEX] = stored_product[PRODUCT_ID_INDEX] - refresh_product[NAME_INDEX] = stored_product[NAME_INDEX] - refresh_product[PRICE_INDEX] = stored_product[PRICE_INDEX] - refresh_product[QUANTITY_INDEX] = ( - stored_product[QUANTITY_INDEX] + quantity - ) - refresh_product = tuple(refresh_product) - storage[index_product] = refresh_product - if updation_line[LINE_QUANTITY_INDEX] == 0: + break + else: + return None + + for index_cart_line, cart_line in enumerate(cart): + if cart_line[LINE_PRODUCT_ID_INDEX] == product_id: + new_quantity = cart_line[LINE_QUANTITY_INDEX] - quantity + if new_quantity == 0: del cart[index_cart_line] - else: - cart[index_cart_line] = updation_line - return updation_line + return (product_id, 0) + updated_line: CartLine = (product_id, new_quantity) + cart[index_cart_line] = updated_line + return updated_line + + return None diff --git a/src/part2/crud.py b/src/part2/crud.py index fb682e67..6578b837 100644 --- a/src/part2/crud.py +++ b/src/part2/crud.py @@ -14,15 +14,13 @@ from decimal import Decimal -from storage import ( +from .storage import ( NAME_INDEX, - PRICE_INDEX, PRODUCT_ID_INDEX, PRODUCT_ID_MIN, - QUANTITY_INDEX, Product, ) -from utils import normalize_price +from .utils import normalize_price def generate_product_id(storage: list[Product]) -> int: @@ -113,18 +111,18 @@ def update_product( ``None`` when no product carries that identifier (``storage`` is left unchanged and a message is printed). """ - real_price = fields[1] - norm_price = normalize_price(real_price) + norm_price = normalize_price(fields[1]) for index_old_product, old_product in enumerate(storage): if old_product[PRODUCT_ID_INDEX] == product_id: - old_product = list(old_product) - old_product[NAME_INDEX] = fields[0] - old_product[PRICE_INDEX] = norm_price - old_product[QUANTITY_INDEX] = fields[2] - updation_product = tuple(old_product) + updation_product: Product = ( + old_product[PRODUCT_ID_INDEX], + fields[0], + norm_price, + fields[2], + ) storage[index_old_product] = updation_product return updation_product - print(f"No product with id {product_id}") + print(f"no product with id {product_id}") return None