From 76cc185a1d0f3f974151fa870778a9d6010e510e Mon Sep 17 00:00:00 2001 From: yystopf Date: Wed, 29 Jun 2022 17:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=AE=A1=E6=A0=B8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/reviews_controller.rb | 19 +++++++++ app/models/issue.rb | 1 + app/models/journal.rb | 2 + app/models/review.rb | 27 +++++++++++++ .../pull_requests/reviews/create_service.rb | 40 +++++++++++++++++++ app/views/reviews/create.json.jbuilder | 10 +++++ config/routes.rb | 1 + db/migrate/20220629054645_create_reviews.rb | 15 +++++++ spec/models/review_spec.rb | 5 +++ 9 files changed, 120 insertions(+) create mode 100644 app/controllers/reviews_controller.rb create mode 100644 app/models/review.rb create mode 100644 app/services/api/v1/projects/pull_requests/reviews/create_service.rb create mode 100644 app/views/reviews/create.json.jbuilder create mode 100644 db/migrate/20220629054645_create_reviews.rb create mode 100644 spec/models/review_spec.rb diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb new file mode 100644 index 000000000..175660605 --- /dev/null +++ b/app/controllers/reviews_controller.rb @@ -0,0 +1,19 @@ +class ReviewsController < ApplicationController + before_action :require_login + before_action :load_project + before_action :load_pull_request + + def create + @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) + end + + private + def review_params + params.require(:review).permit(:content, :commit_id, :status) + end + + def load_pull_request + @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id]) + end + +end \ No newline at end of file diff --git a/app/models/issue.rb b/app/models/issue.rb index 2a3b95958..fa8c43ea9 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -68,6 +68,7 @@ class Issue < ApplicationRecord has_many :issue_tags, through: :issue_tags_relates has_many :issue_times, dependent: :destroy has_many :issue_depends, dependent: :destroy + has_many :reviews, dependent: :destroy scope :issue_includes, ->{includes(:user)} scope :issue_many_includes, ->{includes(journals: :user)} scope :issue_issue, ->{where(issue_classify: [nil,"issue"])} diff --git a/app/models/journal.rb b/app/models/journal.rb index 5bf05b0d2..297c7a148 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -12,11 +12,13 @@ # parent_id :integer # comments_count :integer default("0") # reply_id :integer +# review_id :integer # # Indexes # # index_journals_on_created_on (created_on) # index_journals_on_journalized_id (journalized_id) +# index_journals_on_review_id (review_id) # index_journals_on_user_id (user_id) # journals_journalized_id (journalized_id,journalized_type) # diff --git a/app/models/review.rb b/app/models/review.rb new file mode 100644 index 000000000..f2d3e678d --- /dev/null +++ b/app/models/review.rb @@ -0,0 +1,27 @@ +# == Schema Information +# +# Table name: reviews +# +# id :integer not null, primary key +# issue_id :integer +# reviewer_id :integer +# content :text(65535) +# commit_id :string(255) +# status :integer default("0") +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_reviews_on_issue_id (issue_id) +# index_reviews_on_reviewer_id (reviewer_id) +# + +class Review < ApplicationRecord + + belongs_to :issue + belongs_to :reviewer, class_name: 'User', foreign_key: :reviewer_id + has_one :journal, dependent: :destroy + + enum status: {common: 0, approved: 1, rejected: 2} +end diff --git a/app/services/api/v1/projects/pull_requests/reviews/create_service.rb b/app/services/api/v1/projects/pull_requests/reviews/create_service.rb new file mode 100644 index 000000000..c003256dc --- /dev/null +++ b/app/services/api/v1/projects/pull_requests/reviews/create_service.rb @@ -0,0 +1,40 @@ +class Api::V1::Projects::PullRequests::Reviews::CreateService < ApplicationService + include ActiveModel::Model + + attr_reader :project, :pull_request, :issue, :status, :commit_id, :content, :current_user + attr_accessor :review, :journal + + validates :status, inclusion: { in: %w(common approved rejected), message: '请输入正确的Type'} + + def initialize(project, pull_request, params, current_user) + @project = project + @pull_request = pull_request + @issue = pull_request&.issue + @status = params[:status] + @commit_id = params[:commit_id] + @content = params[:content] + @current_user = current_user + end + + def call + raise Error, errors.full_messages.join(", ") unless valid? + ActiveRecord::Base.transaction do + create_review + create_journal + end + + return @journal, @review + rescue + raise Error, '服务器错误,请联系系统管理员!' + end + + private + def create_review + @review = issue.reviews.create!(status: status, content: content, commit_id: commit_id, reviewer_id: @current_user.id) + end + + def create_journal + @journal = issue.journals.create!(notes: content, user_id: @current_user.id, review_id: @review.id) + end + +end \ No newline at end of file diff --git a/app/views/reviews/create.json.jbuilder b/app/views/reviews/create.json.jbuilder new file mode 100644 index 000000000..57e6933e5 --- /dev/null +++ b/app/views/reviews/create.json.jbuilder @@ -0,0 +1,10 @@ +json.issue do + json.partial! 'pull_requests/detail', issue: @pull_request.issue +end +json.journal_id @journal.id +json.journal_notes @journal.notes +json.review_id @review.id +json.commit_id @review.commit_id +json.content @review.content +json.status @review.status +json.created_at format_time(@review.created_at) \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index c0e845a85..79b937b00 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -528,6 +528,7 @@ Rails.application.routes.draw do post :refuse_merge get :files get :commits + resources :reviews, only: [:create] end collection do post :check_can_merge diff --git a/db/migrate/20220629054645_create_reviews.rb b/db/migrate/20220629054645_create_reviews.rb new file mode 100644 index 000000000..5027b074d --- /dev/null +++ b/db/migrate/20220629054645_create_reviews.rb @@ -0,0 +1,15 @@ +class CreateReviews < ActiveRecord::Migration[5.2] + def change + create_table :reviews do |t| + t.references :issue + t.references :reviewer + t.text :content + t.string :commit_id + t.integer :status, default: 0 + + t.timestamps + end + + add_reference :journals, :review + end +end diff --git a/spec/models/review_spec.rb b/spec/models/review_spec.rb new file mode 100644 index 000000000..8fc758155 --- /dev/null +++ b/spec/models/review_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Review, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end