Merge pull request #360 from Nullskulls/feat/project-types

feat(ship): add project types

Author: dhamariT

app/assets/stylesheets/pages/certification/ships/_index.scss

@@ -65,7 +65,8 @@
     border-radius: 12px;
   }
 
-  &__label {
+  &__label,
+  &__filters label {
     display: block;
     font-size: 0.75rem;
     text-transform: uppercase;
@@ -306,15 +307,6 @@
     gap: var(--space-m);
     padding: var(--space-m) var(--space-l);
     margin-bottom: var(--space-l);
-
-    label {
-      display: block;
-      font-size: 0.75rem;
-      text-transform: uppercase;
-      letter-spacing: 0.06em;
-      color: var(--muted);
-      margin-bottom: var(--space-xxs);
-    }
   }
 
   &__filter {
@@ -604,6 +596,25 @@
     margin-top: var(--space-xs);
   }
 
+  // Inline type tags in table rows and mobile cards.
+  &__type-tag {
+    display: inline-flex;
+    align-items: center;
+    padding: 1px 7px;
+    border-radius: 999px;
+    font-size: 0.7rem;
+    font-weight: 600;
+    letter-spacing: 0.02em;
+    background: rgba(255, 255, 255, 0.12);
+    color: rgba(255, 255, 255, 0.9);
+    white-space: nowrap;
+
+    &--own {
+      background: rgba(255, 176, 122, 0.2);
+      color: var(--color-brand-orange);
+    }
+  }
+
   // --- Empty state -------------------------------------------------------
   &__empty {
     padding: var(--space-xl);

app/controllers/admin/certification/ships_controller.rb

@@ -7,23 +7,30 @@ class Admin::Certification::ShipsController < Admin::Certification::ApplicationC
   def index
     authorize ::Certification::Ship
 
-    @status = params[:status].presence_in(%w[pending approved returned all]) || "pending"
-    @sort = params[:sort] == "newest" ? "newest" : "oldest"
-    @search = params[:search].to_s.strip
-    @from = parse_date(params[:from])
-    @to = parse_date(params[:to])
+    @status       = params[:status].presence_in(%w[pending approved returned all]) || "pending"
+    @sort         = params[:sort] == "newest" ? "newest" : "oldest"
+    @search       = params[:search].to_s.strip
+    @from         = parse_date(params[:from])
+    @to           = parse_date(params[:to])
+    @project_type = params[:project_type].presence
 
     scope = policy_scope(::Certification::Ship)
-              .includes(:reviewer, :returned_by, project: { memberships: :user })
     scope = scope.where(status: @status) unless @status == "all"
     scope = scope.where("certification_ship_reviews.created_at >= ?", @from.beginning_of_day) if @from
     scope = scope.where("certification_ship_reviews.created_at <= ?", @to.end_of_day) if @to
     scope = apply_search(scope) if @search.present?
 
+    @type_counts = scope.joins(:project).group("projects.project_type").count
+
+    scope = scope.by_project_type(@project_type) if @project_type.present?
+
     @pagy, @ships = pagy(:offset,
-                         scope.order(created_at: @sort == "newest" ? :desc : :asc),
+                         scope.includes(:reviewer, :returned_by, project: { memberships: :user })
+                              .order(created_at: @sort == "newest" ? :desc : :asc),
                          limit: 25)
 
+    @own_project_ids = current_user.memberships.pluck(:project_id).to_set
+
     @stats = ::Certification::Ship.dashboard_stats
     @lb_period = params[:lb].presence_in(%w[daily weekly alltime]) || "daily"
     @leaderboards = {

app/jobs/one_time/backfill_project_type_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class OneTime::BackfillProjectTypeJob < ApplicationJob
+  queue_as :literally_whenever
+
+  def scope
+    Project.where(project_type: nil, deleted_at: nil).where.not(shipped_at: nil)
+  end
+
+  def perform
+    count = 0
+
+    scope.find_each do |project|
+      Project::TypeCheckJob.perform_later(project)
+      count += 1
+    end
+
+    Rails.logger.info "[OneTime::BackfillProjectType] Enqueued #{count} type-check jobs"
+  end
+end

app/jobs/project/type_check_job.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Project::TypeCheckJob < ApplicationJob
+  queue_as :default
+
+  discard_on ActiveJob::DeserializationError
+  retry_on StandardError, wait: :polynomially_longer, attempts: 3
+
+  def perform(project)
+    result = SwAi::ProjectTypeService.new(project).call
+    return unless result.ok && result.type.present?
+
+    project.update_column(:project_type, result.type)
+    sync_type_to_gorse_later(project)
+  end
+
+  private
+
+  def sync_type_to_gorse_later(project)
+    project.sync_to_gorse_later
+    project.posts.of_ship_events.find_each(&:sync_to_gorse_later)
+  end
+end

app/models/certification/ship.rb

@@ -103,6 +103,12 @@ def owner
         .where.not(project_id: user.memberships.select(:project_id))
     }
 
+    scope :by_project_type, ->(type) {
+      type == "unclassified" \
+        ? joins(:project).where(projects: { project_type: nil })
+        : joins(:project).where(projects: { project_type: type })
+    }
+
     def self.available_for(user)
       super.merge(for_reviewer(user))
     end

app/models/gorse/post_payload.rb

@@ -53,15 +53,14 @@ def hidden?
     attr_reader :post
 
     def categories
-      [ "feed", post_type, project_categories ].flatten.compact_blank.uniq
+      [ "feed", post_type, post.project&.project_type ].compact_blank.uniq
     end
 
     def labels
       Gorse::Labels.cast(
         type: post_type,
         project_id: post.project_id,
         author_id: post.user_id,
-        project_categories: project_categories,
         project_type: post.project&.project_type,
         has_media: has_media?,
         certification_status: ship_certification_status
@@ -72,10 +71,6 @@ def post_type
       post.postable_type.to_s.demodulize.underscore
     end
 
-    def project_categories
-      Array(post.project&.project_categories)
-    end
-
     def comment
       if post.postable.respond_to?(:body)
         post.postable.body.to_s.truncate(240)

app/models/gorse/project_payload.rb

@@ -37,12 +37,11 @@ def hidden?
     attr_reader :project
 
     def categories
-      [ "project", project.project_type, project.project_categories ].flatten.compact_blank.uniq
+      [ "project", project.project_type ].compact_blank.uniq
     end
 
     def labels
       Gorse::Labels.cast(
-        project_categories: project.project_categories,
         project_type: project.project_type,
         ship_status: project.ship_status,
         tutorial: project.tutorial?,

app/models/post/ship_event.rb

@@ -74,6 +74,7 @@ class Post::ShipEvent < ApplicationRecord
   scope :legacy_voting_scale, -> { where(voting_scale_version: LEGACY_VOTING_SCALE_VERSION) }
 
   after_commit :decrement_user_vote_balance, on: :create
+  after_commit :schedule_type_check, on: :create
 
   validates :body, presence: { message: "Update message can't be blank" }
   validates :body, length: { maximum: BODY_MAX_LENGTH }, on: :create
@@ -168,6 +169,11 @@ def decrement_user_vote_balance
     post.user.increment!(:vote_balance, -VOTE_COST_PER_SHIP)
   end
 
+  def schedule_type_check
+    project = post&.project
+    Project::TypeCheckJob.perform_later(project) if project && project.project_type.nil?
+  end
+
   # Drives the Mission::Submission state machine off ship cert transitions.
   # See docs/missions-design.md "Certification interaction" for the spec.
   def sync_mission_submission_status

app/models/project.rb

@@ -256,23 +256,13 @@ def follow_up_targets_for(user)
   # allows nil, but not "").
   normalizes :hardware_stage, with: ->(value) { value.presence }
   validates :hardware_stage, inclusion: { in: HARDWARE_STAGES }, allow_nil: true
-  validate :validate_project_categories
   validate :hardware_stage_locked_after_funding_request
 
   def hardware_stage_locked_after_funding_request
     return unless hardware_stage_changed? && has_any_funding_request?
     errors.add(:hardware_stage, "cannot be changed after a funding request has been submitted")
   end
 
-  def validate_project_categories
-    return if project_categories.blank?
-
-    invalid_types = project_categories - AVAILABLE_CATEGORIES
-    if invalid_types.any?
-      errors.add(:project_categories, "contains invalid types: #{invalid_types.join(', ')}")
-    end
-  end
-
   def validate_repo_cloneable
     return false if repo_url.blank?
 

app/policies/admin/certification/ship_policy.rb

@@ -15,7 +15,7 @@ def next? = user&.can_review?
   class Scope < ApplicationPolicy::Scope
     def resolve
       return scope.none unless user&.can_review?
-      scope.for_reviewer(user)
+      scope.joins(:project).where(projects: { deleted_at: nil })
     end
   end