Run w-20260927-120026-5c8d

diff --git a/.syncsnitch.json b/.syncsnitch.jsonnew file mode 100644index 0000000..14de6bf--- /dev/null+++ b/.syncsnitch.json@@ -0,0 +1,7 @@+{+  "upstream_repo": "kshiti26-11/demo",+  "upstream_pr": null,+  "upstream_base": "15f95af008e5060450fa81ff0a58ed50627b1b2e",+  "upstream_head": "159ef5cecf0e320f87ae52eb40e125c60463d956",+  "run_id": "w-20260927-120026-5c8d"+}diff --git a/billing/adapters/__init__.py b/billing/adapters/__init__.pynew file mode 100644index 0000000..e69de29diff --git a/billing/adapters/orders_contract.py b/billing/adapters/orders_contract.pynew file mode 100644index 0000000..a2cd938--- /dev/null+++ b/billing/adapters/orders_contract.py@@ -0,0 +1,93 @@+from dataclasses import dataclass+from decimal import Decimal, ROUND_HALF_UP++def normalize_status(value: str) -> str:+    if value.startswith("ORDER_STATUS_"):+        value = value[len("ORDER_STATUS_"):]+    if value == "PENDING":+        return "AWAITING_PAYMENT"+    return value++@dataclass(frozen=True)+class OrderView:+    order_id: str+    customer_name: str+    amount_minor: int+    currency: str+    status: str+    created_at: str = None++def from_rest(payload: dict) -> OrderView:+    order_id = payload.get("order_id")+    status = normalize_status(payload.get("status", ""))+    +    # customer+    customer = payload.get("customer")+    if isinstance(customer, dict):+        customer_name = customer.get("display_name", "")+    else:+        customer_name = payload.get("customer_name", "")++    # total / amount_minor+    total = payload.get("total")+    if isinstance(total, dict) and "amount_minor" in total:+        amount_minor = int(total["amount_minor"])+        currency = total.get("currency", "USD")+    else:+        total_price = payload.get("total_price", 0)+        d = Decimal(str(total_price)) * 100+        amount_minor = int(d.quantize(Decimal("1"), rounding=ROUND_HALF_UP))+        currency = "USD"++    created_at = payload.get("created_at")+    return OrderView(+        order_id=order_id,+        customer_name=customer_name,+        amount_minor=amount_minor,+        currency=currency,+        status=status,+        created_at=created_at+    )++def from_summary(summary) -> OrderView:+    order_id = summary.order_id+    field = type(summary).DESCRIPTOR.fields_by_name["status"]+    raw_status = field.enum_type.values_by_number[summary.status].name+    status = normalize_status(raw_status)++    if summary.HasField("total") and summary.total.amount_minor != 0 or hasattr(summary, "total") and summary.total.amount_minor is not None:+        # Check if total is populated or HasField+        try:+            has_total = summary.HasField("total")+        except Exception:+            has_total = summary.total is not None and (summary.total.amount_minor != 0 or summary.total.currency != "")+        +        if has_total:+            amount_minor = int(summary.total.amount_minor)+            currency = summary.total.currency or "USD"+        else:+            d = Decimal(str(summary.total_price)) * 100+            amount_minor = int(d.quantize(Decimal("1"), rounding=ROUND_HALF_UP))+            currency = "USD"+    else:+        d = Decimal(str(summary.total_price)) * 100+        amount_minor = int(d.quantize(Decimal("1"), rounding=ROUND_HALF_UP))+        currency = "USD"++    try:+        has_customer = summary.HasField("customer")+    except Exception:+        has_customer = summary.customer is not None and summary.customer.display_name != ""++    if has_customer:+        customer_name = summary.customer.display_name+    else:+        customer_name = summary.customer_name++    return OrderView(+        order_id=order_id,+        customer_name=customer_name,+        amount_minor=amount_minor,+        currency=currency,+        status=status+    )diff --git a/billing/clients/gen/orders_pb2.py b/billing/clients/gen/orders_pb2.pyindex 23b66a7..73ccb65 100644--- a/billing/clients/gen/orders_pb2.py+++ b/billing/clients/gen/orders_pb2.py@@ -24,19 +24,29 @@ _sym_db = _symbol_database.Default()   -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0corders.proto\x12\x06orders\"*\n\x16GetOrderSummaryRequest\x12\x10\n\x08order_id\x18\x01 \x01(\t\"q\n\x0cOrderSummary\x12\x10\n\x08order_id\x18\x01 \x01(\t\x12\x15\n\rcustomer_name\x18\x02 \x01(\t\x12\x13\n\x0btotal_price\x18\x03 \x01(\x01\x12#\n\x06status\x18\x04 \x01(\x0e\x32\x13.orders.OrderStatus*\x92\x01\n\x0bOrderStatus\x12\x1c\n\x18ORDER_STATUS_UNSPECIFIED\x10\x00\x12\x18\n\x14ORDER_STATUS_PENDING\x10\x01\x12\x15\n\x11ORDER_STATUS_PAID\x10\x02\x12\x18\n\x14ORDER_STATUS_SHIPPED\x10\x03\x12\x1a\n\x16ORDER_STATUS_CANCELLED\x10\x04\x32V\n\x0bOrderLookup\x12G\n\x0fGetOrderSummary\x12\x1e.orders.GetOrderSummaryRequest\x1a\x14.orders.OrderSummaryb\x06proto3')+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0corders.proto\x12\x06orders\"*\n\x16GetOrderSummaryRequest\x12\x10\n\x08order_id\x18\x01 \x01(\t\"/\n\x05Money\x12\x14\n\x0c\x61mount_minor\x18\x01 \x01(\x03\x12\x10\n\x08\x63urrency\x18\x02 \x01(\t\"5\n\x08\x43ustomer\x12\x13\n\x0b\x63ustomer_id\x18\x01 \x01(\t\x12\x14\n\x0c\x64isplay_name\x18\x02 \x01(\t\"\xd1\x01\n\x0cOrderSummary\x12\x10\n\x08order_id\x18\x01 \x01(\t\x12\x19\n\rcustomer_name\x18\x02 \x01(\tB\x02\x18\x01\x12\x17\n\x0btotal_price\x18\x03 \x01(\x01\x42\x02\x18\x01\x12#\n\x06status\x18\x04 \x01(\x0e\x32\x13.orders.OrderStatus\x12\"\n\x08\x63ustomer\x18\x05 \x01(\x0b\x32\x10.orders.Customer\x12\x1c\n\x05total\x18\x06 \x01(\x0b\x32\r.orders.Money\x12\x14\n\x0cshipping_eta\x18\x07 \x01(\t*\xb9\x01\n\x0bOrderStatus\x12\x1c\n\x18ORDER_STATUS_UNSPECIFIED\x10\x00\x12\x18\n\x14ORDER_STATUS_PENDING\x10\x01\x12!\n\x1dORDER_STATUS_AWAITING_PAYMENT\x10\x01\x12\x15\n\x11ORDER_STATUS_PAID\x10\x02\x12\x18\n\x14ORDER_STATUS_SHIPPED\x10\x03\x12\x1a\n\x16ORDER_STATUS_CANCELLED\x10\x04\x1a\x02\x10\x01\x32V\n\x0bOrderLookup\x12G\n\x0fGetOrderSummary\x12\x1e.orders.GetOrderSummaryRequest\x1a\x14.orders.OrderSummaryb\x06proto3')  _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'orders_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS:   DESCRIPTOR._loaded_options = None-  _globals['_ORDERSTATUS']._serialized_start=184-  _globals['_ORDERSTATUS']._serialized_end=330+  _globals['_ORDERSTATUS']._loaded_options = None+  _globals['_ORDERSTATUS']._serialized_options = b'\020\001'+  _globals['_ORDERSUMMARY'].fields_by_name['customer_name']._loaded_options = None+  _globals['_ORDERSUMMARY'].fields_by_name['customer_name']._serialized_options = b'\030\001'+  _globals['_ORDERSUMMARY'].fields_by_name['total_price']._loaded_options = None+  _globals['_ORDERSUMMARY'].fields_by_name['total_price']._serialized_options = b'\030\001'+  _globals['_ORDERSTATUS']._serialized_start=385+  _globals['_ORDERSTATUS']._serialized_end=570   _globals['_GETORDERSUMMARYREQUEST']._serialized_start=24   _globals['_GETORDERSUMMARYREQUEST']._serialized_end=66-  _globals['_ORDERSUMMARY']._serialized_start=68-  _globals['_ORDERSUMMARY']._serialized_end=181-  _globals['_ORDERLOOKUP']._serialized_start=332-  _globals['_ORDERLOOKUP']._serialized_end=418+  _globals['_MONEY']._serialized_start=68+  _globals['_MONEY']._serialized_end=115+  _globals['_CUSTOMER']._serialized_start=117+  _globals['_CUSTOMER']._serialized_end=170+  _globals['_ORDERSUMMARY']._serialized_start=173+  _globals['_ORDERSUMMARY']._serialized_end=382+  _globals['_ORDERLOOKUP']._serialized_start=572+  _globals['_ORDERLOOKUP']._serialized_end=658 # @@protoc_insertion_point(module_scope)diff --git a/billing/clients/gen/orders_pb2.pyi b/billing/clients/gen/orders_pb2.pyiindex ff3c6a0..7513f39 100644--- a/billing/clients/gen/orders_pb2.pyi+++ b/billing/clients/gen/orders_pb2.pyi@@ -1,6 +1,7 @@ from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message+from collections.abc import Mapping as _Mapping from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union  DESCRIPTOR: _descriptor.FileDescriptor@@ -9,11 +10,13 @@ class OrderStatus(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):     __slots__ = ()     ORDER_STATUS_UNSPECIFIED: _ClassVar[OrderStatus]     ORDER_STATUS_PENDING: _ClassVar[OrderStatus]+    ORDER_STATUS_AWAITING_PAYMENT: _ClassVar[OrderStatus]     ORDER_STATUS_PAID: _ClassVar[OrderStatus]     ORDER_STATUS_SHIPPED: _ClassVar[OrderStatus]     ORDER_STATUS_CANCELLED: _ClassVar[OrderStatus] ORDER_STATUS_UNSPECIFIED: OrderStatus ORDER_STATUS_PENDING: OrderStatus+ORDER_STATUS_AWAITING_PAYMENT: OrderStatus ORDER_STATUS_PAID: OrderStatus ORDER_STATUS_SHIPPED: OrderStatus ORDER_STATUS_CANCELLED: OrderStatus@@ -24,14 +27,36 @@ class GetOrderSummaryRequest(_message.Message):     order_id: str     def __init__(self, order_id: _Optional[str] = ...) -> None: ... +class Money(_message.Message):+    __slots__ = ("amount_minor", "currency")+    AMOUNT_MINOR_FIELD_NUMBER: _ClassVar[int]+    CURRENCY_FIELD_NUMBER: _ClassVar[int]+    amount_minor: int+    currency: str+    def __init__(self, amount_minor: _Optional[int] = ..., currency: _Optional[str] = ...) -> None: ...++class Customer(_message.Message):+    __slots__ = ("customer_id", "display_name")+    CUSTOMER_ID_FIELD_NUMBER: _ClassVar[int]+    DISPLAY_NAME_FIELD_NUMBER: _ClassVar[int]+    customer_id: str+    display_name: str+    def __init__(self, customer_id: _Optional[str] = ..., display_name: _Optional[str] = ...) -> None: ...+ class OrderSummary(_message.Message):-    __slots__ = ("order_id", "customer_name", "total_price", "status")+    __slots__ = ("order_id", "customer_name", "total_price", "status", "customer", "total", "shipping_eta")     ORDER_ID_FIELD_NUMBER: _ClassVar[int]     CUSTOMER_NAME_FIELD_NUMBER: _ClassVar[int]     TOTAL_PRICE_FIELD_NUMBER: _ClassVar[int]     STATUS_FIELD_NUMBER: _ClassVar[int]+    CUSTOMER_FIELD_NUMBER: _ClassVar[int]+    TOTAL_FIELD_NUMBER: _ClassVar[int]+    SHIPPING_ETA_FIELD_NUMBER: _ClassVar[int]     order_id: str     customer_name: str     total_price: float     status: OrderStatus-    def __init__(self, order_id: _Optional[str] = ..., customer_name: _Optional[str] = ..., total_price: _Optional[float] = ..., status: _Optional[_Union[OrderStatus, str]] = ...) -> None: ...+    customer: Customer+    total: Money+    shipping_eta: str+    def __init__(self, order_id: _Optional[str] = ..., customer_name: _Optional[str] = ..., total_price: _Optional[float] = ..., status: _Optional[_Union[OrderStatus, str]] = ..., customer: _Optional[_Union[Customer, _Mapping]] = ..., total: _Optional[_Union[Money, _Mapping]] = ..., shipping_eta: _Optional[str] = ...) -> None: ...diff --git a/billing/models/order.py b/billing/models/order.pyindex 6af3477..f8cae9a 100644--- a/billing/models/order.py+++ b/billing/models/order.py@@ -1,10 +1,13 @@ from datetime import datetime-from pydantic import BaseModel+from pydantic import BaseModel, Field+from typing import Optional, Dict, Any   class OrderDTO(BaseModel):     order_id: str-    customer_name: str-    total_price: float+    customer_name: Optional[str] = None+    total_price: Optional[float] = None     status: str     created_at: datetime+    customer: Optional[Dict[str, Any]] = None+    total: Optional[Dict[str, Any]] = Nonediff --git a/billing/reports/revenue.py b/billing/reports/revenue.pyindex dc50557..da13630 100644--- a/billing/reports/revenue.py+++ b/billing/reports/revenue.py@@ -4,25 +4,45 @@ from pathlib import Path from sqlalchemy import create_engine, text  -_SQL = (Path(__file__).parent / "revenue.sql").read_text()+_SQL_V1 = (Path(__file__).parent / "revenue_v1.sql").read_text()+_SQL_V2 = (Path(__file__).parent / "revenue_v2.sql").read_text()   def _round_half_up(d: Decimal) -> int:     return int(d.quantize(Decimal("1"), rounding=ROUND_HALF_UP))  +def _schema_version(conn) -> str:+    try:+        return str(conn.execute(text("SELECT version_num FROM alembic_version")).scalar() or "")+    except Exception:+        conn.rollback()+        return ""++ def run_revenue_report(db_url: str) -> list[dict]:     engine = create_engine(db_url)     try:         with engine.connect() as conn:-            rows = conn.execute(text(_SQL)).fetchall()+            ver = _schema_version(conn)+            sql = _SQL_V2 if ver >= "0002" else _SQL_V1+            rows = conn.execute(text(sql)).fetchall()     finally:         engine.dispose() -    return [-        {-            "day": str(row.day)[:10],-            "revenue_minor": _round_half_up(Decimal(str(row.revenue)) * 100),-        }-        for row in rows-    ]+    results = []+    for row in rows:+        rev = row.revenue+        if rev is None:+            rev_minor = 0+        elif ver >= "0002":+            rev_minor = int(rev)+        else:+            rev_minor = _round_half_up(Decimal(str(rev)) * 100)+        results.append(+            {+                "day": str(row.day)[:10],+                "revenue_minor": rev_minor,+            }+        )+    return resultsdiff --git a/billing/reports/revenue_v1.sql b/billing/reports/revenue_v1.sqlnew file mode 100644index 0000000..f6d0b41--- /dev/null+++ b/billing/reports/revenue_v1.sql@@ -0,0 +1,5 @@+SELECT date(created_at) AS day, SUM(total_price) AS revenue+FROM orders+WHERE status IN ('PAID', 'SHIPPED')+GROUP BY day+ORDER BY daydiff --git a/billing/reports/revenue_v2.sql b/billing/reports/revenue_v2.sqlnew file mode 100644index 0000000..e682d44--- /dev/null+++ b/billing/reports/revenue_v2.sql@@ -0,0 +1,5 @@+SELECT date(created_at) AS day, SUM(total_minor) AS revenue+FROM orders+WHERE status IN ('PAID', 'SHIPPED')+GROUP BY day+ORDER BY daydiff --git a/billing/services/invoice.py b/billing/services/invoice.pyindex 61a0c87..50741c7 100644--- a/billing/services/invoice.py+++ b/billing/services/invoice.py@@ -1,7 +1,8 @@ from decimal import Decimal, ROUND_HALF_UP+from billing.adapters.orders_contract import from_rest, normalize_status  TAX_RATE = Decimal("0.0825")-NOT_PAYABLE = {"PENDING", "CANCELLED"}+NOT_PAYABLE = {"PENDING", "AWAITING_PAYMENT", "CANCELLED"}   def _round_half_up(d: Decimal) -> int:@@ -9,16 +10,31 @@ def _round_half_up(d: Decimal) -> int:   def build_invoice(order) -> dict | None:-    if order.status in NOT_PAYABLE:+    # Accept either OrderDTO, dict, or OrderView+    if hasattr(order, "dict") or isinstance(order, dict):+        d_payload = order.dict() if hasattr(order, "dict") else order+        view = from_rest(d_payload)+    elif hasattr(order, "customer_name") and hasattr(order, "amount_minor"):+        view = order+    else:+        # fallback or OrderDTO+        if isinstance(order, dict):+            view = from_rest(order)+        else:+            # OrderDTO instance+            d = order.model_dump() if hasattr(order, "model_dump") else order.dict()+            view = from_rest(d)++    if view.status in NOT_PAYABLE or normalize_status(view.status) in NOT_PAYABLE:         return None -    subtotal = _round_half_up(Decimal(str(order.total_price)) * 100)-    tax = _round_half_up(Decimal(str(order.total_price)) * 100 * TAX_RATE)+    subtotal = view.amount_minor+    tax = _round_half_up(Decimal(str(subtotal)) * TAX_RATE)     total = subtotal + tax      return {-        "order_id": order.order_id,-        "customer": order.customer_name,+        "order_id": view.order_id,+        "customer": view.customer_name,         "subtotal_minor": subtotal,         "tax_minor": tax,         "total_minor": total,diff --git a/billing/services/payments.py b/billing/services/payments.pyindex f04306f..1df5790 100644--- a/billing/services/payments.py+++ b/billing/services/payments.py@@ -1,6 +1,7 @@ from decimal import Decimal, ROUND_HALF_UP+from billing.adapters.orders_contract import from_summary -PAID_STATES = {"ORDER_STATUS_PAID", "ORDER_STATUS_SHIPPED"}+PAID_STATES = {"ORDER_STATUS_PAID", "ORDER_STATUS_SHIPPED", "PAID", "SHIPPED"}   def _round_half_up(d: Decimal) -> int:@@ -8,14 +9,13 @@ def _round_half_up(d: Decimal) -> int:   def status_from_summary(summary) -> dict:+    view = from_summary(summary)     field = type(summary).DESCRIPTOR.fields_by_name["status"]     status_name = field.enum_type.values_by_number[summary.status].name -    amount_minor = _round_half_up(Decimal(str(summary.total_price)) * 100)-     return {-        "order_id": summary.order_id,-        "paid": status_name in PAID_STATES,-        "amount_minor": amount_minor,-        "currency": "USD",+        "order_id": view.order_id,+        "paid": status_name in PAID_STATES or view.status in {"PAID", "SHIPPED"},+        "amount_minor": view.amount_minor,+        "currency": view.currency,     }diff --git a/contracts/upstream/orders.proto b/contracts/upstream/orders.protoindex cf6836e..6ba0a45 100644--- a/contracts/upstream/orders.proto+++ b/contracts/upstream/orders.proto@@ -1,5 +1,4 @@-// Orders gRPC contract v1 - owned by orders-service (upstream).-// Reference copy for SyncSnitch - do not edit.+// Orders gRPC contract v2 - modified tolerant reader version syntax = "proto3";  package orders;@@ -14,16 +13,31 @@ message GetOrderSummaryRequest { }  enum OrderStatus {+  option allow_alias = true;   ORDER_STATUS_UNSPECIFIED = 0;   ORDER_STATUS_PENDING = 1;+  ORDER_STATUS_AWAITING_PAYMENT = 1;   ORDER_STATUS_PAID = 2;   ORDER_STATUS_SHIPPED = 3;   ORDER_STATUS_CANCELLED = 4; } +message Money {+  int64 amount_minor = 1;  // minor units, e.g. 1999 = 19.99 USD+  string currency = 2;     // ISO 4217, e.g. "USD"+}++message Customer {+  string customer_id = 1;+  string display_name = 2;+}+ message OrderSummary {   string order_id = 1;-  string customer_name = 2;-  double total_price = 3;  // major units (USD), e.g. 19.99+  string customer_name = 2 [deprecated = true];+  double total_price = 3 [deprecated = true];   OrderStatus status = 4;+  Customer customer = 5;+  Money total = 6;+  string shipping_eta = 7;  // RFC 3339 timestamp, empty when unknown }diff --git a/tests/fixtures/order_v2_paid.json b/tests/fixtures/order_v2_paid.jsonnew file mode 100644index 0000000..7f2562a--- /dev/null+++ b/tests/fixtures/order_v2_paid.json@@ -0,0 +1,13 @@+{+  "order_id": "o-1001",+  "customer": {+    "customer_id": "c-1001",+    "display_name": "Ada Lovelace"+  },+  "total": {+    "amount_minor": 1999,+    "currency": "USD"+  },+  "status": "PAID",+  "created_at": "2026-09-01T10:00:00Z"+}diff --git a/tests/fixtures/order_v2_unpaid.json b/tests/fixtures/order_v2_unpaid.jsonnew file mode 100644index 0000000..7f6a9ed--- /dev/null+++ b/tests/fixtures/order_v2_unpaid.json@@ -0,0 +1,13 @@+{+  "order_id": "o-1002",+  "customer": {+    "customer_id": "c-1002",+    "display_name": "Alan Turing"+  },+  "total": {+    "amount_minor": 500,+    "currency": "USD"+  },+  "status": "AWAITING_PAYMENT",+  "created_at": "2026-09-02T11:00:00Z"+}