Merge branch 'refactoring-entities-file-21' into 'master'

Separate job entities into own class files

See merge request gitlab-org/gitlab!24948

changelogs/unreleased/refactoring-entities-file-21.yml

+---
+title: Separate job entities into own class files
+merge_request: 24948
+author: Rajendra Kadam
+type: added

lib/api/entities.rb

@@ -317,40 +317,6 @@ module API
       expose :id, :token
     end
 
-    class JobArtifactFile < Grape::Entity
-      expose :filename
-      expose :cached_size, as: :size
-    end
-
-    class JobArtifact < Grape::Entity
-      expose :file_type, :size, :filename, :file_format
-    end
-
-    class JobBasic < Grape::Entity
-      expose :id, :status, :stage, :name, :ref, :tag, :coverage, :allow_failure
-      expose :created_at, :started_at, :finished_at
-      expose :duration
-      expose :user, with: Entities::User
-      expose :commit, with: Entities::Commit
-      expose :pipeline, with: Entities::PipelineBasic
-
-      expose :web_url do |job, _options|
-        Gitlab::Routing.url_helpers.project_job_url(job.project, job)
-      end
-    end
-
-    class Job < JobBasic
-      # artifacts_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5)
-      expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? }
-      expose :job_artifacts, as: :artifacts, using: JobArtifact
-      expose :runner, with: Runner
-      expose :artifacts_expire_at
-    end
-
-    class JobBasicWithProject < JobBasic
-      expose :project, with: Entities::ProjectIdentity
-    end
-
     class Trigger < Grape::Entity
       include ::API::Helpers::Presentable
 

lib/api/entities/job.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Job < Entities::JobBasic
+      # artifacts_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5)
+      expose :artifacts_file, using: Entities::JobArtifactFile, if: -> (job, opts) { job.artifacts? }
+      expose :job_artifacts, as: :artifacts, using: Entities::JobArtifact
+      expose :runner, with: Entities::Runner
+      expose :artifacts_expire_at
+    end
+  end
+end

lib/api/entities/job_artifact.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobArtifact < Grape::Entity
+      expose :file_type, :size, :filename, :file_format
+    end
+  end
+end

lib/api/entities/job_artifact_file.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobArtifactFile < Grape::Entity
+      expose :filename
+      expose :cached_size, as: :size
+    end
+  end
+end

lib/api/entities/job_basic.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobBasic < Grape::Entity
+      expose :id, :status, :stage, :name, :ref, :tag, :coverage, :allow_failure
+      expose :created_at, :started_at, :finished_at
+      expose :duration
+      expose :user, with: Entities::User
+      expose :commit, with: Entities::Commit
+      expose :pipeline, with: Entities::PipelineBasic
+
+      expose :web_url do |job, _options|
+        Gitlab::Routing.url_helpers.project_job_url(job.project, job)
+      end
+    end
+  end
+end

lib/api/entities/job_basic_with_project.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class JobBasicWithProject < Entities::JobBasic
+      expose :project, with: Entities::ProjectIdentity
+    end
+  end
+end