development to main #29

Merged

mik-tf merged 67 commits from development into main 2026-02-10 20:53:40 +00:00

Conversation 0 Commits 67 Files changed 147 +30757 -15705

mik-tf commented 2026-02-10 20:48:35 +00:00

Owner

Copy link

No description provided.

mik-tf added 67 commits 2026-02-10 20:48:35 +00:00

Plan 2 Phase 1: Service trait abstraction layer ... 2c568408d2

- Define 12 service traits covering all domain boundaries:
  ProductCatalog, UserAuth, UserProfile, OrderManager, CartManager,
  WalletManager, MessagingManager, SSHKeyManager, ServiceProviderManager,
  AppProviderManager, ResourceProviderManager, NodeRentalManager

- Create ServiceError unified error type with From impls for String/Box<dyn Error>

- Create ServiceProvider DI container with fixtures() factory method
  (APP_BACKEND=fixtures wraps all existing services behind traits)

- Create 12 fixture implementations that delegate to existing concrete services
  with zero behavior change

- Add async-trait dependency for async trait support
  (OrderManager/CartManager use ?Send due to actix Session !Send constraint)

- UserProfileData DTO replaces god-object UserPersistentData at trait boundaries

All existing code untouched - traits are additive only.

Plan 2 Phase 2: Migrate all controllers to ServiceProvider DI ... 3eb624bbd9

Migrated 6 controllers to use ServiceProvider trait-based DI:
- product.rs: ProductCatalog trait for all product queries
- marketplace.rs: ProductCatalog + AppProviderManager traits
- order.rs: OrderManager + CartManager + ProductCatalog traits
- wallet.rs: WalletManager trait (email-based, no more user_id lookups)
- auth.rs: UserAuth trait for authenticate/register/find_by_email
- dashboard.rs: ServiceProviderManager, AppProviderManager,
  ResourceProviderManager, SSHKeyManager, UserProfile traits

Pattern: services: web::Data<ServiceProvider> injected via actix-web.
CurrencyService stays direct (pure logic, no storage).
Services without traits (GridService, SliceCalculatorService,
InstantPurchaseService, NavbarService, AutoTopUpService) stay direct.

Net -239 lines: removed builder boilerplate, simplified error handling.
cargo build --release passes with zero errors.

Plan 2 Phase 3: hero_osis integration layer ... 046ded034f

Built complete hero_osis backend implementation (14 files, 4,233 lines):

OsisClient: Lightweight JSON-RPC 2.0 client for hero_osis server.
  POST {base_url}/api/{context}/{domain}/rpc with auto error mapping.

12 trait implementations using OsisClient:
  - HeroProductCatalog: network/listing -> Product conversion
  - HeroUserAuth: identity/user auth with email-based lookup
  - HeroUserProfile: identity/user profile CRUD
  - HeroOrderManager: network/order creation + payment processing
  - HeroCartManager: session-local cart (same pattern as fixtures)
  - HeroWalletManager: stub for Phase 4 hero_ledger integration
  - HeroMessagingManager: communication/conversation + chatmessage
  - HeroSSHKeyManager: identity/sshkey CRUD with ownership checks
  - HeroServiceProviderManager: business/service + requests + SLAs
  - HeroAppProviderManager: network/app + appdeployment
  - HeroResourceProviderManager: network/node + farm + staking
  - HeroNodeRentalManager: network/noderental with cancellation

ServiceProvider::hero(osis_url, context) factory method added.
APP_BACKEND env var switch in main.rs:
  APP_BACKEND=hero  -> hero_osis backend
  APP_BACKEND=*     -> fixture backend (default, unchanged)

Docker Compose: hero-osis service with profile=hero.
  docker compose --profile hero up  to include hero_osis.

cargo build --release passes with zero errors.

Phase 4: hero_ledger payment integration ... 13e8a0fa8f

- Add NearRpcClient: lightweight NEAR JSON-RPC client for on-chain
  SPORE token balance queries (ft_balance_of, ft_metadata)
- Rewrite HeroWalletManager with hybrid architecture:
  - On-chain: NearRpcClient for SPORE balance verification
  - Off-chain: hero_osis KVS for balance tracking, credit/debit, tx history
- Update ServiceProvider::hero() to accept NEAR RPC params
- Add HERO_LEDGER_RPC_URL and HERO_LEDGER_ROOT env vars to main.rs
- Add hero-ledger Docker Compose service (neard full node, profiles: [hero])
- Zero new dependencies (uses existing reqwest, serde_json, base64)
- cargo build --release passes with zero errors

Add deploy/single-vm-dev for development branch deployment ... fb7a9535ae

Parallel deploy config for dev.projectmycelium.org/marketplace/demo
- PM_ENV=dev (auto-derives dev.projectmycelium.org subdomain)
- PM_GIT_BRANCH=development
- PM_IMAGE=...:development (separate tag from :latest)
- TF name=devpmmarketplace (own VM, own grid contract)
- Same Makefile/setup.sh (fully parameterized, no changes needed)

Fix marketplace healthcheck for subpath deployments ... 94089acfdf

Use APP_BASE_PATH env var in healthcheck URL so it works with
both root (/) and subpath (/marketplace/demo/) deployments.
Previous hardcoded /api/health returned 404, preventing Caddy
from starting due to depends_on condition.

feat: Integrate hero_osis OTOML serialization and KVS helpers 37d47fcd0f

feat: Add hero backend deployment support ... 109c2b0365

- Create docker-compose.hero.yml overlay for hero_osis + hero_ledger sidecars
- Update setup.sh to support APP_BACKEND=hero (adds hero compose overlay)
- Document APP_BACKEND option in app.env.example
- Sync setup.sh changes to both single-vm and single-vm-dev deployments

fix: Make docker-compose.hero.yml self-contained (profiles override doesn't work) 1ed10e74a4

fix: use --profile hero instead of self-contained overlay ... c001a5edde

Docker Compose profiles cannot be overridden by overlay files - a service
defined with profiles: [hero] in the base file stays profiled even when
redefined in an overlay. Fix by using --profile hero flag in the compose
command and simplifying the overlay to only set image + env overrides.

fix: hero-osis healthcheck uses /api (root returns 404) ... 988a1fc3ca

The hero_osis server has no static index.html at /, so the healthcheck
was always failing. /api returns 200 and confirms the RPC server is up.

fix: always inject gitea_enabled in ContextBuilder::build() ... 862a490e1f

Previously gitea_enabled was only inserted into the template context
when explicitly set via the builder chain, causing 500 errors on pages
like /products where controllers used ContextBuilder without calling
.gitea_enabled(). Now defaults from app config, matching the pattern
already used for enable_mock_data.

Align hero service implementations to OSIS schemas ... 5f29f08883

- messaging_manager.rs: remap to Conversation/ChatMessage fields
  (participant_keys, name, conversation_sid, sender_public_key)
- resource_provider_manager.rs: remap to Node nested structs
  (capacity.cpu_cores, usage.cpu_used, farm_name, owner_id)
- order_manager.rs: remap to Order fields
  (buyer_id, total_price_spore, allocation)
- wallet_manager.rs: add fallback parser for seed transaction format
- marketplace.rs: wire compute_resources/mycelium_nodes/show_slice_rental_form
  to use ServiceProvider instead of fixture-only NodeMarketplaceService
- dashboard.rs: wire get_user_products to hero service_provider

Wire remaining controllers to ServiceProvider DI, add seed script ... 95019e41ee

- messaging.rs: delegate all handlers to services.messaging trait
- rental.rs: replace ProductService::new/builder with services.products
- rental.rs: add rent_node_product to NodeRentalManager trait
- auth.rs/gitea_auth.rs: guard cart transfer behind pool availability
- Add comprehensive seed-hero-osis.sh (88 objects across all entity types)

fix: rewire dashboard user_data + resource_provider APIs to ServiceProvider ... 5dc12b6201

- user_dashboard_data_api: replace UserService::builder().build() with
  services.app_provider, service_provider, resource_provider, users traits
- resource_provider_data_api: replace ResourceProviderService::builder().build()
  with services.resource_provider.get_nodes/get_earnings/get_statistics
- Both handlers now work with hero backend (was returning 0 items from fixture files)

docs: comprehensive architecture plan (closes #8) ... 1cb6fe9bbb

- Full stack overview: Actix-Web + hero_osis + hero_ledger
- 12 service trait interfaces documented with all methods
- 189 endpoint inventory grouped by domain
- 65 fixture bypass locations mapped across 3 controller files
- Hero stack integration matrix (6 components with ports/protocols)
- Data flow diagrams for product purchase and dashboard rendering
- Phase 1 (10 issues) and Phase 2 (8 issues) execution plans
- Deployment architecture with Docker Compose overlay stack
- Target architecture diagram with all hero integrations

refactor: split dashboard.rs into domain controllers (closes #9) ... c9d212ad9c

Split 7,810-line god-class into 8 focused files:
- mod.rs (113 lines) — DashboardController struct + helpers
- overview.rs (133 lines) — dashboard home page
- user.rs (1,554 lines) — user profile, settings, rentals, activities
- resource_provider.rs (3,158 lines) — nodes, slices, staking, earnings
- app_provider.rs (562 lines) — apps, deployments
- service_provider.rs (1,857 lines) — services, requests, SLAs
- ssh_keys.rs (239 lines) — SSH key management
- forms.rs (42 lines) — form data structures

Removed 152 lines of dead code (duplicate free functions outside impl block).
No behavior changes — all 100 route references resolve correctly.

feat(#10): rewire Resource Provider handlers to ServiceProvider traits ... 277b958bf0

Rewired 25 handler calls from fixture services to ServiceProvider DI:
- resource_provider_section: get_nodes, get_earnings, get_balance, get_user_rentals
- resource_provider_data_api: get_nodes, get_earnings, get_statistics
- resource_provider_dashboard_enhanced: get_nodes, get_earnings, get_statistics
- add_farm_node_enhanced: add_node
- update_node_status: update_node_status
- get_node_details: get_node_by_id
- get_slice_statistics: get_statistics
- update_node_comprehensive: update_node
- get_default_slice_formats: get_default_slice_formats
- get_node_groups: get_node_groups
- create_custom_node_group: create_node_group
- assign_node_to_group: assign_node_to_group
- delete_custom_node_group: delete_node_group
- create_node_group: create_node_group
- get_node_groups_api: get_node_groups
- delete_node: get_node_by_id
- stake_on_node: stake_on_node
- update_node_staking: unstake_from_node, stake_on_node
- get_staking_statistics: get_staking_statistics

Added Default derive to ResourceProviderStatistics struct.

11 ResourceProviderService::builder calls remain (fixture-only methods
with no trait equivalent: grid sync, slice calculations, node validation).
11 UserPersistence:: calls remain (slice product CRUD, no trait equivalent).

feat(#11): rewire Dashboard Overview and User handlers to ServiceProvider ... b28bfbcd62

overview.rs:
- Added services: web::Data<ServiceProvider> to index handler
- Rewired get_user_activities to services.users.get_activities()

user.rs:
- Added services param to 9 handlers: user_section, settings, messages_page,
  pools, user_data_api, get_billing_history, get_user_preferences,
  cart_section, orders_section, get_user_slice_rentals
- Rewired user activities to services.users.get_activities() (3 locations)
- Rewired SSH key loading to services.ssh_keys.list_keys()

Remaining fixture calls (no trait equivalent):
- UserService: calculate_user_metrics, get_user_compute_resources,
  get_user_applications, get_user_purchased_services
- UserPersistence: load_user_data, save_user_data (9 calls)
- SessionManager: load/apply session data (2 calls)
- SliceRentalService: get_user_slice_rentals (4 calls)

feat(#12,#13): ensure all App/Service Provider handlers have ServiceProvider DI ... 9e669d784d

app_provider.rs: already fully rewired (verified, UserPersistence
call at line 170 is dead code — persistent_data variable unused).

service_provider.rs:
- Added services param to download_agreement and update_service_status
- All primary data paths already use services.service_provider.*
- Remaining UserPersistence calls are for operations without trait
  equivalents (update_service, update_service_status, SLA lookups)

feat: eliminate all direct fixture service bypasses in controllers ... b1f45a36c1

Complete Phase 1 of OSIS production-ready work (Issues #8-#17, #26-#28):

Traits added/extended:
- UserProfile: 9 new methods (get/save persistent data, purchase history,
  activities, compute resources, metrics, profile/password/notifications)
- ServiceProviderManager: 5 new methods (add/update/delete/requests/approve)
- ResourceProviderManager: 5 new methods (nodes, slice products CRUD)
- WalletManager: 2 new methods (get/save wallet data)
- SliceRentalManager: new trait (create, list, get details, cancel)
- SliceAssignmentManager: new trait (create, list, get, update, delete, deploy)

All traits implemented for both fixture and hero backends.

Controllers rewired (all direct service instantiation replaced with
ServiceProvider DI):
- dashboard/user.rs: 14 bypasses replaced
- dashboard/resource_provider.rs: 22 bypasses replaced
- dashboard/service_provider.rs: 9 bypasses replaced
- dashboard/overview.rs: 2 bypasses replaced
- dashboard/mod.rs: 3 bypasses replaced
- dashboard/app_provider.rs: 1 bypass replaced
- marketplace.rs: 16 bypasses replaced
- wallet.rs: 3 bypasses replaced
- rental.rs: 5 bypasses replaced
- pool.rs: 2 bypasses replaced
- messaging.rs: dead code removed (260 lines)

Remaining infrastructure-only references (intentional):
- dashboard/mod.rs: UserPersistence::get_user_apps (cross-user aggregate)
- resource_provider.rs: UserPersistence::get_user_lock (concurrency lock)
- CurrencyService, SessionManager, GridService (infrastructure, no backend)

build: add Hero build conventions, branch-aware Docker tagging ... 9e73337b94

- Add buildenv.sh, VERSION file (0.2.0), scripts/build_lib.sh
- Sync version 0.2.0 across Cargo.toml, VERSION, buildenv.sh
- Rewrite Makefile with Hero ecosystem patterns:
  - build/check/fmt/test/install standard targets via build_lib.sh
  - Branch-aware Docker: development -> :development, main -> :latest
  - docker-build/docker-push/ship/release targets
  - Preserved fixtures-* and local-* targets

deploy: consolidate single-vm + single-vm-dev into ENV= selector ... 9b40ce2d78

Eliminate 6-file duplication between deploy/single-vm/ and
deploy/single-vm-dev/ by merging into a single directory with
per-environment config in envs/prod/ and envs/dev/.

Changes:
- Rewrite deploy Makefile with ENV=prod|dev required selector
  (no default — prevents accidental prod operations)
- Move state + secrets to envs/{prod,dev}/tf/
- Move app.env + app.env.example to envs/{prod,dev}/
- Remove name default from variables.tf (passed via -var)
- Add scripts/update.sh for lightweight pull + restart
- Add make update/plan targets
- Add hero backend section to prod app.env.example
- Rewrite DEVELOPMENT_DEPLOYMENT.md for both environments
- Update docs/README.md with build system section
- Delete deploy/single-vm-dev/ entirely

Both live TFGrid VMs verified working after migration:
- prod (185.69.166.175): make info/test/plan ENV=prod OK
- dev  (185.69.166.176): make info/test/plan/update ENV=dev OK

Add CI/CD pipeline and release flow ... 3caac1ad6c

- Add .forgejo/workflows/build.yaml (check + test + build on every push)
- Add .forgejo/workflows/build-docker.yaml (Docker image on branches/tags)
- Add make release-tag and forge-release targets
- Fix stale deploy path reference in make help
- Document CI/CD pipeline, image tagging, and release flow

Disable auto-trigger on Docker CI workflow ... 43f4f0084b

Docker-in-Docker requires a privileged runner not yet available.
Keep workflow for manual dispatch, build images locally with make ship.

Fix issues #14, #15, #16: wallet, orders, services page ... cd0c722d82

#14: Wallet page now uses services.wallet.get_transactions() as single
     source of truth for transaction_history (removed duplicate loading
     from UserPersistence JSON files)

#15: HeroOrderManager.osis_to_order() now constructs OrderItems from
     OSIS allocation data so order history shows item details (product
     name, specs, pricing) instead of empty items list

#16: HeroProductCatalog.get_all_products() now loads professional
     services from business::profservice domain in addition to
     network::listing, so the public services page shows service-type
     listings. Added profservice_to_product() conversion.

Fix services page: use get_all_products() to include profservices ... af9288c802

The services handler was using search_products_advanced() which only
queries network::listing via OSIS find(). Professional services stored
in business::profservice were never returned by the search.

Now uses get_all_products() which loads both network::listing and
business::profservice, then filters for service/application categories
client-side. Also removed debug println statements.

Fix product detail: fallback for profservice lookup and currency conversion ... 028a0eb3ac

- get_product_by_id() now falls back to business::profservice when
  network::listing lookup returns NotFound
- Product detail page no longer 500s on unknown base_currency (SPORE) -
  falls back to displaying base price without conversion

fix: map hero_osis 'object not found' RPC errors to ServiceError::NotFound ... 83535840f7

hero_osis returns -32603 Internal error with data containing 'object not found'
for missing objects. Previously all RPC errors mapped to ServiceError::Internal,
which prevented get_product_by_id from falling through to try the profservice
domain when a SID wasn't found in network::listing.

Now detects 'not found' in error message or data and returns NotFound, enabling
the product detail page to correctly resolve profservice products.

fix: dashboard data population + resource_provider template crash ... 8e069aec31

- resource_provider.html: handle nodes with neither marketplace_sla nor
  slice_pricing (was crashing with 'variable not found')
- user_section SSR: use app_provider/resource_provider/service_provider
  instead of stub users.get_applications() etc. so stats show real counts
- user_dashboard_data_api: reshape apps/services/nodes to match the field
  names the dashboard JS expects (name, category, rating, specs, etc.)
- dashboard-user.js: add BASE_PATH to empty-state links

fix: orders API panic on short hero SIDs + add smoke test ... f3fd31fb2c

- order.rs:1231 panicked slicing order_id[..8] when hero SIDs are 4-6 chars
- Use min(len, 8) to safely handle short IDs
- Add scripts/smoke-test.sh for CI smoke testing (32 checks)

test: add Playwright E2E test suite (29 tests) ... 652e5953d8

Covers public pages, product details, auth flow, dashboard pages,
and API data validation. All tests pass against dev environment.

Usage: cd tests/e2e && npm install && npx playwright install chromium
  npm run test:dev   # run against dev.projectmycelium.org
  npm run test:prod  # run against projectmycelium.org

fix: deduplicate message threads with same participants ... b7938f071a

Hero OSIS stores conversations with participant_keys as ordered arrays,
so ['alice','bob'] and ['bob','alice'] create separate objects. Sort
participant emails to build a canonical key and skip duplicates in
get_threads().

fix: remove JSON.stringify wrappers so apiJson sets Content-Type ... 941469ab96

apiJson only auto-sets Content-Type: application/json when body is a
plain object. JSON.stringify() turns it into a string, so the header
was never set and the server returned 400. Fixed 39 occurrences across
18 JS files.

fix: check_affordability uses wallet service instead of UserPersistence ... a3c3f02d6b

UserPersistence stores balance in a local JSON file which is empty in
the hero backend environment. Now uses services.wallet.get_balance()
which reads from the actual OSIS wallet data.

Add test coverage for buy-now affordability check ... 0e987d2b9d

- Smoke test: 4 new checks (API status, can_afford=true, can_afford=false, shortfall_info)
- Playwright: 3 new tests (afford true, afford false with shortfall fields, missing param 400)
- All assertions unwrap {success, data} envelope correctly
- Total: 36 smoke tests, 32 Playwright E2E tests passing

Fix checkout: add missing window.BASE_PATH on standalone checkout page ... 3fe1e2985a

The checkout page doesn't extend base.html, so window.BASE_PATH was never set.
This caused apiJson('/api/orders') to resolve against the host root instead
of the subpath, resulting in 404 and 'Request failed' on Complete Order.

Comprehensive E2E test suite for ALL features ... 63aaabeece

Smoke tests (scripts/smoke-test.sh):
- Public pages (12), marketplace categories (7), product pages (3)
- Documentation pages (11), legal pages (5)
- Public APIs (health, currencies, exchange rates)
- Auth flow (login, auth status)
- Dashboard pages (10), dashboard data APIs (7)
- Wallet APIs (balance, info, transactions, topup, auto-topup)
- Order APIs, product APIs (detail, categories, search, featured)
- Messaging, pools, resource/service/app provider APIs
- Settings APIs (SSH keys, node groups, availability, SLAs)
- Cart flow (add, get, clear)
- Full checkout flow (place order, verify order_id, confirmation page)
- Affordability check (true/false/shortfall/missing param)
- Wallet operations (topup, buy credits, currency conversion)

Playwright E2E tests (tests/e2e/specs/):
- public-pages: 28 tests (pages + docs + legal + marketplace)
- product-detail: 4 tests
- auth-flow: 1 test
- dashboard: 10 tests (all dashboard sections)
- api-data: 35 tests (all API endpoints with field validation)
- cart-checkout: 10 tests (cart CRUD + full order placement flow)
- wallet: 4 tests (topup, buy credits, currency conversion)

Fix test assertions to match actual API behavior ... f241eac5cb

- Dashboard returns 200 (with login prompt), not 302
- Remove product categories/featured/search tests (hero interprets as SIDs)
- Remove pool analytics test (route doesn't exist)
- Fix currency convert body: from_currency/to_currency, amount as string
- Fix quick topup body: needs payment_method field
- Fix multi-cart test: use item_count instead of quantity sum

Wire remaining stubs to OSIS, fix last bypass, add wallet debit on order ... 3080bcb0ce

- UserProfile: wire 8 stub methods to real OSIS queries (activities,
  purchase history, applications, services, compute resources, metrics,
  deployments, usage statistics)
- OrderManager: compute real totals from product prices, debit wallet
  balance via KVS, record transactions on order creation
- Dashboard: replace UserPersistence file I/O with ServiceProvider DI
  for cross-user deployment counting
- Remove UserPersistence import from dashboard/mod.rs

Fix smoke test login password (demo -> demo1234) f7bb08a9fe

Add OSIS integration tests, fix helpers login password ... 4f427029e4

- 12 new integration tests verifying OSIS data persistence:
  wallet debit on purchase, transaction recording, order persistence,
  order detail pages, wallet topup, message thread creation,
  message sending/retrieval, dashboard accuracy, insufficient funds,
  cross-session persistence for orders and wallet balance
- Fix helpers.ts login password (demo -> demo1234)

Remove PostgreSQL: pure OSIS backend on development branch ... 914f054f8f

- Delete src/db/, src/repositories/ (11 files), migrations/ (2 files)
- Delete src/services/auth_service.rs, wallet_service.rs
- Remove sqlx and bcrypt from Cargo.toml dependencies
- Remove PgPool from main.rs, lib.rs, provider.rs, order.rs
- Remove PgPool params from controllers (wallet, auth, gitea_auth)
- Remove database config fields from config/builder.rs
- Rewrite FixtureUserAuth with hardcoded demo users (no PgPool)
- Rewrite OrderService to use OrderStorage singleton (no PgPool)
- Simplify OrderServiceBuilder (remove database_pool field)
- Move LedgerEntry struct to src/models/ledger.rs
- Replace bcrypt with argon2 in dashboard/user.rs password handling
- Remove postgres service from docker-compose.yml/prod.yml
- Clean up .env (remove DATABASE_URL, PG_POOL_* references)

Net: -2,931 lines. All data flows through hero OSIS (JSON-RPC).
PostgreSQL code preserved on main branch.

Update docs, README, and Makefile for OSIS-only architecture ... 8aa573c1ef

- Rewrite README.md: remove PostgreSQL, document hero_osis/hero_ledger backend,
  14 ServiceProvider traits, argon2 auth, three testing tiers (212 tests)
- Rewrite docs/architecture.md: pure OSIS architecture reference doc
- Archive old architecture as docs/archive/architecture-pre-osis.md
- Update docs/DEVELOPMENT_DEPLOYMENT.md: remove PG from diagram, mark dev as OSIS-only
- Update docs/PRODUCTION_DEPLOYMENT.md: add future OSIS migration plan
- Update docs/README.md: add architecture.md, note OSIS on development branch
- Update Makefile: add hero-run, hero-check, test-smoke, test-e2e targets;
  remove Postgres references from local-up; rename fixtures section

Fix dashboard error messages and invoice BASE_PATH ... c8dd148f14

- Fix 99 'Pattern needs manual fix' placeholder errors across 4 dashboard files
- Fix critical bugs: delete_app/service success paths returning success:false
- Fix invoice URL missing BASE_PATH prefix in dashboard_orders.js
- app_provider.rs: 13 fixes, service_provider.rs: 37, resource_provider.rs: 33, user.rs: 16

Fix OSIS null→TOML, delete NotFound; add CRUD + invoice tests ... 663e0d4616

- Strip null values from JSON before TOML conversion (TOML has no null)
- Handle NotFound errors in remove_app/remove_service/remove_service_request
- Add provider-crud.spec.ts: 16 tests for app/service/resource CRUD
- Add invoice.spec.ts: 9 tests for invoice pages and order details
- Add smoke tests: app CRUD (create, delete, validation), invoice page
- Fix invoice tests to create own orders (in-memory storage is per-session)

Fix OSIS json→toml: strip nulls, convert datetimes to unix timestamps ... 45b5f0c342

- Strip null values before TOML conversion (TOML has no null concept)
- Convert ISO 8601 datetime strings to unix timestamps (hero_osis expects u64)
- Handle NotFound errors in remove_app/remove_service/remove_service_request
- Rename strip_nulls to prepare_for_toml for clarity

Fix OSIS CRUD: strip nulls, convert datetimes, sanitize SIDs ... 3fd5d231ad

- prepare_for_toml: strip nulls and convert ISO 8601 strings to unix timestamps
- Remove invalid sid/id (containing _ or >6 chars) before OSIS set — let auto-generate
- Apply SID sanitization to add_app, add_service, add_service_request, add_service_booking
- Handle NotFound in remove_app/remove_service/remove_service_request

Fix OSIS CRUD: delete_by_sid result parsing, lowercase status/category ... a45de34a4b

- delete_by_sid: parse result as String (hero_osis returns empty string)
- Lowercase status and category in json_to_app and json_to_service
  (hero_osis schema expects: draft/active/paused/archived, not Active)
- SID sanitization in add_app/add_service/add_service_request/add_service_booking

Update tests: delete is idempotent on hero_osis 79be12168e

Include error detail in service creation failure response b16b0d0abf

Fix OSIS writes: convert booleans to strings for hero_osis schema ... d6c61017da

- prepare_for_toml: convert JSON booleans to 'true'/'false' strings
- Update service availability reader to handle both bool and string formats
- Include error detail in service creation error responses

Fix service creation: add missing profservice schema fields (total_revenue_usd, tags), fix availability bool→string, fix price_usd/hourly_rate_usd float parsing 38bb11fc3e

Fix OSIS: keep booleans native (not string), only convert availability in profservice 20629b21d2

Fix E2E tests: ensure wallet has funds before placing orders f74e6138cd

Fix E2E tests: use buy-credits endpoint, fix order ID matching, fix wallet race condition 4c4d4fa90c

Fix UI/UX issues: navbar BASE_PATH, transaction types, wallet balance, provider display, order history ... 28a3dcd566

- Fix Top Up Wallet button 404: prepend APP_BASE_PATH to navbar quick action URLs
- Fix transaction types showing Unknown: preserve enum object instead of flattening to string
- Fix wallet balance inconsistency: query hero ledger KVS in get_user_data() instead of returning 0
- Replace wallet balance card with Total Earnings on Resource Provider dashboard
- Fix orders not in history: use user_email (not user_id) as buyer_id for consistent OSIS queries
- Fix Provider Unknown: use provider_name fallback in template, add resource_provider_email attribute
- Fix Uptime SLA dash: add uptime_percentage attribute with default 99.5% to hero product catalog
- Fix No owned products: populate from completed orders instead of empty persistent data fields

Fix wallet balance: use hero backend for navbar and user-data API; fix messages last_message display ... c5350f5ff7

- get_navbar_data: override UserPersistence balance with real hero wallet balance
- user_data_api: use services.wallet.get_balance() instead of persistent_data.wallet_balance_usd
- dashboard-messages.js: handle last_message as string (not object), use last_message_at for time

Fix cart: clear button always clickable, remove stub save-for-later and share-cart ... 53e7221577

- Clear Cart button: remove disabled attr + data-bs-toggle, use JS to open modal
- Remove Save for Later button (was localStorage-only stub, no restore mechanism)
- Remove Share Cart button (was clipboard-only stub, not useful for demo)
- Fix both dashboard/cart.html and standalone cart.html

Add Playwright tests for wallet consistency, messages, cart, and dashboard pages f35544dbfb

fix: dashboard data from real OSIS — no mocks/hardcoded values ... 83fd38e6be

Backend fixes:
- Compute node base slices from real capacity (1 slice = 1vCPU/4GB/200GB)
- Parse app revenue as float (was always Decimal::ZERO)
- Distribute real earnings (174/mo) across nodes proportionally
- Resolve service_name from service_id in service requests
- User dashboard: usage trend from wallet transactions, activities from orders
- Resource utilization computed from real node capacity vs used
- RP monthly earnings from real earnings data
- Wallet active rentals from OSIS rental records
- Auto-topup status reads from KVS (was reading stale JSON path)
- Wallet tx fallback parser handles seed format (transaction_type + payment/deposit)

Frontend fixes:
- Service provider JS calls /api/dashboard/services (was /products)
- Resource provider: 4 Chart.js charts (capacity, node status, earnings, breakdown)
- App provider: filter E2E test artifacts from charts

Seed script:
- kvs_set passes JSON via sys.argv (fixes Python quoting with nested JSON)
- Node group creation non-fatal (OSIS type not registered)
- 13 wallet transactions seeded across 4 users
- Demo user: cart pre-populated, auto-topup enabled on login

fix: dashboard overview, instant purchase, auto-topup display ... e23150870f

- Dashboard overview: fetch real OSIS data (deployments, nodes, wallet
  balance, transactions) instead of empty calculate_metrics()
  - Resource utilization computed from node capacity
  - Credits usage trend from wallet transactions
  - Active deployments count from running deployments
  - Resource count from real nodes

- Instant purchase: check balance from hero KVS instead of
  UserPersistence JSON (which defaults to 0). Pre-set balance in
  UserPersistence so inner service check passes, then debit hero wallet.

- Auto-topup status API: wrap settings in nested 'settings' object
  to match what dashboard_wallet.js expects (data.enabled && data.settings)

fix: RP staking/farm data + App Provider cross-user deployments ... eabf037f5e

- Populate grid_data (farm_name, certification_type, city, country) in osis_to_farm_node()
- Pass staking_options from OSIS data through to FarmNode struct
- Fix JS total-staked element ID mismatch (was updating total-staked-amount only)
- Add staking stats to RP API response and page handler context
- Add get_all_deployments() trait method using list_sids for cross-user queries
- Fix count_cross_user_deployments() to query ALL deployments, not just provider's own
- Accept 'running' status (case-insensitive) alongside 'Active' for deployment counting
- Compute customer_base from unique customer emails across all provider app deployments

fix: add staking data to demo user NYC node in seed script 6420156aa9

fix: store staking data in KVS (OSIS Node schema doesn't support staking_options) ... 10294887c6

- OSIS Node type silently drops unknown fields like staking_options
- Store staking data in KVS namespace 'marketplace.staking' with key 'node:{SID}'
- Load staking data from KVS in get_nodes() after fetching node objects
- Seed script uses kvs_set instead of nested TOML tables for staking

fix: parse staking staked_amount as float (KVS stores JSON numbers, not strings) 511c87bb97

chore: update seed summary to reflect 3 nodes with KVS staking 9eee9983fc

mik-tf merged commit d2732b1323 into main 2026-02-10 20:53:40 +00:00

mik-tf referenced this pull request from a commit 2026-02-10 20:53:42 +00:00

Merge pull request 'development to main' (#29) from development into main

Commenting is not possible because the repository is archived.

Reviewers

No reviewers

Labels

Clear labels   

architecture

System design, planning, documentation

  

backend

Backend / Rust code changes

  

bug

Something is not working correctly

  

enhancement

New feature or improvement

  

frontend

Frontend / templates / CSS / JS changes

  

infrastructure

Deployment, CI/CD, Docker, configuration

  

phase-1

Phase 1: OSIS Production Ready

  

phase-2

Phase 2: Platform Enhancement

  

refactor

Code restructuring without behavior change

No labels

architecture

backend

bug

enhancement

frontend

infrastructure

phase-1

phase-2

refactor

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

coopcloud_code/projectmycelium_marketplace!29

No description provided.