eminux/MatchLiveTv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Club come entità principale, branding e fix infrastruttura streaming.

Browse Source 
Introduce clubs con abbonamento, branding Active Storage e flusso registrazione società; corregge healthcheck MediaMTX (immagine distroless) e allinea dominio produzione matchlivetv.it.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Emiliano Frascaro
2026-05-27 09:16:24 +02:00
parent 471291b2c4
commit 4083bc5dee
53 changed files with 1120 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/services/billing/assign_plan.rb
View File

@@ -1,8 +1,8 @@
module Billing
class AssignPlan
def self.call(team:, plan_slug:, status: "active", stripe_attrs: {})
def self.call(club:, plan_slug:, status: "active", stripe_attrs: {})
plan = Plan[plan_slug]
sub = team.subscription || team.build_subscription
sub = club.subscription || club.build_subscription
attrs = { plan: plan, status: status }.merge(stripe_attrs.symbolize_keys)
sub.assign_attributes(attrs)
sub.save!

16
backend/app/services/billing/stripe/checkout_session.rb
View File

@@ -3,8 +3,8 @@ module Billing
class CheckoutSession
VALID_PLANS = %w[premium_light premium_full].freeze
def initialize(team:, user:, plan_slug: "premium_light")
@team = team
def initialize(club:, user:, plan_slug: "premium_light")
@club = club
@user = user
@plan_slug = plan_slug.to_s
end
@@ -24,8 +24,8 @@ module Billing
line_items: [{ price: price_id, quantity: 1 }],
success_url: success_url,
cancel_url: cancel_url,
metadata: { team_id: @team.id, user_id: @user.id, plan_slug: @plan_slug },
subscription_data: { metadata: { team_id: @team.id, plan_slug: @plan_slug } }
metadata: { club_id: @club.id, user_id: @user.id, plan_slug: @plan_slug },
subscription_data: { metadata: { club_id: @club.id, plan_slug: @plan_slug } }
)
session.url
end
@@ -51,13 +51,13 @@ module Billing
end
def ensure_customer_id!
sub = @team.subscription || @team.build_subscription(plan: Plan["free"], status: "active")
sub = @club.subscription || @club.build_subscription(plan: Plan["free"], status: "active")
return sub.stripe_customer_id if sub.stripe_customer_id.present?
customer = ::Stripe::Customer.create(
email: @user.email,
name: @team.name,
metadata: { team_id: @team.id }
name: @club.name,
metadata: { club_id: @club.id }
)
sub.update!(stripe_customer_id: customer.id)
customer.id
@@ -72,7 +72,7 @@ module Billing
end
def dashboard_url
"#{MatchLiveTv.app_public_url.chomp('/')}/teams/#{@team.id}/dashboard"
"#{MatchLiveTv.app_public_url.chomp('/')}/clubs/#{@club.id}"
end
end
end

50
backend/app/services/billing/stripe/webhook_handler.rb
View File

@@ -25,28 +25,25 @@ module Billing
private
def handle_checkout_completed(session)
team_id = metadata_team_id(session)
return if team_id.blank?
club = resolve_club(session)
return unless club
team = Team.find_by(id: team_id)
return unless team
sub = team.subscription || team.build_subscription
sub = club.subscription || club.build_subscription
sub.update!(stripe_customer_id: session.customer) if session.customer.present?
if session.subscription.present?
stripe_sub = ::Stripe::Subscription.retrieve(session.subscription)
plan_slug = metadata_plan_slug(session) || "premium_light"
plan_slug = "premium_full" if plan_slug == "premium"
sync_subscription(stripe_sub, team: team, plan_slug: plan_slug)
sync_subscription(stripe_sub, club: club, plan_slug: plan_slug)
end
end
def sync_subscription(stripe_sub, team: nil, plan_slug: nil)
team ||= Team.joins(:subscription)
def sync_subscription(stripe_sub, club: nil, plan_slug: nil)
club ||= Club.joins(:subscription)
.find_by(subscriptions: { stripe_subscription_id: stripe_sub.id })
team ||= Team.find_by(id: metadata_team_id(stripe_sub))
return unless team
club ||= resolve_club(stripe_sub)
return unless club
plan_slug ||= metadata_plan_slug(stripe_sub) || "premium_light"
plan_slug = "premium_full" if plan_slug == "premium"
@@ -56,7 +53,7 @@ module Billing
period_end = unix_time(stripe_sub.current_period_end)
Billing::AssignPlan.call(
team: team,
club: club,
plan_slug: plan.slug,
status: status,
stripe_attrs: {
@@ -70,12 +67,12 @@ module Billing
end
def downgrade_to_free(stripe_sub)
team = Team.joins(:subscription)
club = Club.joins(:subscription)
.find_by(subscriptions: { stripe_subscription_id: stripe_sub.id })
return unless team
return unless club
Billing::AssignPlan.call(
team: team,
club: club,
plan_slug: "free",
status: "active",
stripe_attrs: {
@@ -90,11 +87,21 @@ module Billing
def mark_past_due(invoice)
return if invoice.subscription.blank?
team = Team.joins(:subscription)
club = Club.joins(:subscription)
.find_by(subscriptions: { stripe_subscription_id: invoice.subscription })
return unless team&.subscription
return unless club&.subscription
team.subscription.update!(status: "past_due")
club.subscription.update!(status: "past_due")
end
def resolve_club(obj)
club_id = metadata_club_id(obj)
return Club.find_by(id: club_id) if club_id.present?
team_id = metadata_team_id(obj)
return Team.find_by(id: team_id)&.club if team_id.present?
nil
end
def unix_time(value)
@@ -110,6 +117,13 @@ module Billing
meta["plan_slug"] || meta[:plan_slug] || (meta.respond_to?(:plan_slug) ? meta.plan_slug : nil)
end
def metadata_club_id(obj)
meta = obj.metadata
return nil if meta.blank?
meta["club_id"] || meta[:club_id] || (meta.respond_to?(:club_id) ? meta.club_id : nil)
end
def metadata_team_id(obj)
meta = obj.metadata
return nil if meta.blank?

17
backend/app/services/teams/entitlements.rb
View File

@@ -4,10 +4,11 @@ module Teams
def initialize(team)
@team = team
@club = team.club
end
def subscription
@subscription ||= @team.subscription || ensure_free_subscription!
@subscription ||= @club.subscription || ensure_free_subscription!
end
def plan
@@ -59,7 +60,7 @@ module Teams
end
def members_count_for(kind)
@team.user_teams.where(role: "member", staff_kind: kind).count
@team.user_teams.where(staff_kind: kind).count
end
def pending_invitations_count
@@ -75,8 +76,8 @@ module Teams
end
def concurrent_streams_used
StreamSession.joins(:match)
.where(matches: { team_id: @team.id })
StreamSession.joins(match: :team)
.where(teams: { club_id: @club.id })
.where(status: ACTIVE_STREAM_STATUSES)
.count
end
@@ -101,7 +102,7 @@ module Teams
platform = platform.to_s
unless active?
raise EntitlementError.new(
"Abbonamento non attivo per questa squadra",
"Abbonamento non attivo per la società",
code: "subscription_inactive",
billing_url: billing_url
)
@@ -196,7 +197,7 @@ module Teams
end
def billing_url
"#{MatchLiveTv.app_public_url.chomp('/')}/teams/#{@team.id}/billing"
"#{MatchLiveTv.app_public_url.chomp('/')}/clubs/#{@club.id}/billing"
end
def staff_manage_url
@@ -232,8 +233,8 @@ module Teams
private
def ensure_free_subscription!
Billing::AssignPlan.call(team: @team, plan_slug: "free")
@team.reload.subscription
Billing::AssignPlan.call(club: @club, plan_slug: "free")
@club.reload.subscription
end
end
end

85
backend/app/services/teams/staff_assignment.rb Normal file
View File

@@ -0,0 +1,85 @@
module Teams
class StaffAssignmentError < StandardError
attr_reader :message
def initialize(message)
@message = message
super(message)
end
end
class StaffAssignment
def self.call(team:, user:, staff_kind:, membership: nil)
new(team: team, user: user, staff_kind: staff_kind, membership: membership).call
end
def initialize(team:, user:, staff_kind:, membership: nil)
@team = team
@user = user
@staff_kind = staff_kind.to_s
@membership = membership
end
def call
unless TeamInvitation::STAFF_KINDS.include?(@staff_kind)
raise StaffAssignmentError, "Ruolo staff non valido"
end
StaffEmailValidator.assert_available!(team: @team, email: @user.email, staff_kind: @staff_kind, except_user: @user)
ut = @membership || @user.user_teams.find_by!(team: @team)
return ut if ut.staff_kind == @staff_kind
ent = Entitlements.new(@team)
ent.assert_can_invite!(staff_kind: @staff_kind)
ut.update!(staff_kind: @staff_kind)
ut
end
end
class StaffEmailValidator
def self.assert_available!(team:, email:, staff_kind:, except_user: nil)
new(team: team, email: email, staff_kind: staff_kind, except_user: except_user).assert_available!
end
def initialize(team:, email:, staff_kind:, except_user: nil)
@team = team
@email = email.to_s.downcase.strip
@staff_kind = staff_kind.to_s
@except_user = except_user
end
def assert_available!
if @except_user
ut = @team.user_teams.find_by(user: @except_user)
if ut&.staff_kind.present? && ut.staff_kind != @staff_kind
other_label = ut.staff_kind == "regia" ? "regia" : "trasmissione"
raise StaffAssignmentError,
"Questo account è già staff #{other_label}. Trasmissione e regia devono essere email diverse."
end
end
conflict = conflicting_assignment
return unless conflict
other_label = conflict[:kind] == "regia" ? "regia" : "trasmissione"
raise StaffAssignmentError,
"L'email #{@email} è già assegnata come staff #{other_label}. Trasmissione e regia devono essere persone (email) diverse."
end
def conflicting_assignment
other_kind = @staff_kind == "transmission" ? "regia" : "transmission"
user_scope = @team.user_teams.joins(:user).where(users: { email: @email }).where(staff_kind: other_kind)
user_scope = user_scope.where.not(user_id: @except_user.id) if @except_user
return { kind: other_kind, source: :member } if user_scope.exists?
inv = @team.team_invitations.pending.where("LOWER(email) = ?", @email).where(staff_kind: other_kind)
return { kind: other_kind, source: :invitation } if inv.exists?
nil
end
end
end