From ffbe4942b7d88f6292d534dcb6e7328fe609e825 Mon Sep 17 00:00:00 2001 From: qyzh Date: Fri, 11 Dec 2020 17:01:52 +0800 Subject: [PATCH] delete some interface --- app/controllers/application_controller.rb | 3 +- app/controllers/concerns/ci/db_connectable.rb | 2 +- app/controllers/sponsor_tiers_controller.rb | 11 +-- app/controllers/sponsorships_controller.rb | 11 +-- app/models/attachment.rb | 48 ++++++---- app/models/ci/user.rb | 96 +++++++++---------- app/models/coin_change.rb | 14 +++ app/models/passed_waitlist.rb | 12 +++ app/models/praise_tread.rb | 6 +- app/models/project.rb | 6 +- app/models/pull_request.rb | 3 - app/models/sponsor_tier.rb | 12 +++ app/models/sponsorship.rb | 14 +++ app/models/stopped_sponsorship.rb | 15 +++ app/models/user.rb | 96 +++++++++---------- app/models/waitlist.rb | 12 +++ app/models/wallet.rb | 11 +++ config/routes.rb | 4 +- .../sponsor_tiers_controller_spec.rb | 2 +- 19 files changed, 227 insertions(+), 151 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5d99f390..4924b5ed 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -346,7 +346,8 @@ class ApplicationController < ActionController::Base User.current = User.find 8686 elsif params[:debug] == 'admin' logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....." - user = User.find 36480 + # user = User.find 36480 + user = User.find 5 User.current = user cookies.signed[:user_id] = user.id end diff --git a/app/controllers/concerns/ci/db_connectable.rb b/app/controllers/concerns/ci/db_connectable.rb index a4de9c4b..2aaff87b 100644 --- a/app/controllers/concerns/ci/db_connectable.rb +++ b/app/controllers/concerns/ci/db_connectable.rb @@ -1,7 +1,7 @@ module Ci::DbConnectable extend ActiveSupport::Concern - include do + included do end # Dynamically sets the database connection. diff --git a/app/controllers/sponsor_tiers_controller.rb b/app/controllers/sponsor_tiers_controller.rb index 4a552b0c..f3739806 100644 --- a/app/controllers/sponsor_tiers_controller.rb +++ b/app/controllers/sponsor_tiers_controller.rb @@ -1,6 +1,7 @@ class SponsorTiersController < ApplicationController before_action :set_sponsor_tier, only: [:show, :edit, :update, :destroy] before_action :check_sponsor, only: [:show] + before_action :require_login, only: [:create, :update, :destroy] # GET /sponsor_tiers # GET /sponsor_tiers.json @@ -16,16 +17,6 @@ class SponsorTiersController < ApplicationController end - # GET /sponsor_tiers/new - def new - # @sponsor_tier = SponsorTier.new - # User.current.create - end - - # GET /sponsor_tiers/1/edit - def edit - end - # POST /sponsor_tiers # POST /sponsor_tiers.json def create diff --git a/app/controllers/sponsorships_controller.rb b/app/controllers/sponsorships_controller.rb index 07c56b98..9a59358f 100644 --- a/app/controllers/sponsorships_controller.rb +++ b/app/controllers/sponsorships_controller.rb @@ -1,7 +1,7 @@ class SponsorshipsController < ApplicationController before_action :set_sponsorship, only: [:show, :edit, :update, :destroy] # before_action :require_login, except: [:index, :stopped, :sponsored, :sponsoring, :stopped_sponsored, :stopped_sponsoring] - before_action :require_login, only: [:show, :new, :create, :edit, :update, :destroy] + before_action :require_login, only: [:new, :create, :edit, :update, :destroy] skip_after_action :user_trace_log, only: [:update] # GET /sponsorships @@ -71,15 +71,6 @@ class SponsorshipsController < ApplicationController def show end - # GET /sponsorships/new - def new - @sponsorship = Sponsorship.new - end - - # GET /sponsorships/1/edit - def edit - end - # POST /sponsorships # POST /sponsorships.json def create diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 9368d2d7..461c835f 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -2,33 +2,39 @@ # # Table name: attachments # -# id :integer not null, primary key -# container_id :integer -# container_type :string(30) -# filename :string(255) default(""), not null -# disk_filename :string(255) default(""), not null -# filesize :integer default("0"), not null -# content_type :string(255) default("") -# digest :string(40) default(""), not null -# downloads :integer default("0"), not null -# author_id :integer default("0"), not null -# created_on :datetime -# description :text(65535) -# disk_directory :string(255) -# attachtype :integer default("1") -# is_public :integer default("1") -# copy_from :integer -# quotes :integer -# is_publish :integer default("1") -# publish_time :datetime -# memo_image :boolean default("0") -# extra_type :integer default("0") +# id :integer not null, primary key +# container_id :integer +# container_type :string(30) +# filename :string(255) default(""), not null +# disk_filename :string(255) default(""), not null +# filesize :integer default("0"), not null +# content_type :string(255) default("") +# digest :string(60) default(""), not null +# downloads :integer default("0"), not null +# author_id :integer default("0"), not null +# created_on :datetime +# description :text(65535) +# disk_directory :string(255) +# attachtype :integer default("1") +# is_public :integer default("1") +# copy_from :integer +# quotes :integer default("0") +# is_publish :integer default("1") +# publish_time :datetime +# resource_bank_id :integer +# unified_setting :boolean default("1") +# cloud_url :string(255) default("") +# course_second_category_id :integer default("0") +# delay_publish :boolean default("0") # # Indexes # # index_attachments_on_author_id (author_id) # index_attachments_on_container_id_and_container_type (container_id,container_type) +# index_attachments_on_course_second_category_id (course_second_category_id) # index_attachments_on_created_on (created_on) +# index_attachments_on_is_public (is_public) +# index_attachments_on_quotes (quotes) # class Attachment < ApplicationRecord diff --git a/app/models/ci/user.rb b/app/models/ci/user.rb index fd17adce..f76812c9 100644 --- a/app/models/ci/user.rb +++ b/app/models/ci/user.rb @@ -2,54 +2,54 @@ # # Table name: users # -# id :integer not null -# login :string(255) default(""), not null -# hashed_password :string(40) default(""), not null -# firstname :string(30) default(""), not null -# lastname :string(255) default(""), not null -# mail :string(60) -# admin :boolean default("0"), not null -# status :integer default("1"), not null -# last_login_on :datetime -# language :string(5) default("") -# auth_source_id :integer -# created_on :datetime -# updated_on :datetime -# type :string(255) -# identity_url :string(255) -# mail_notification :string(255) default(""), not null -# salt :string(64) -# gid :integer -# visits :integer default("0") -# excellent_teacher :integer default("0") -# excellent_student :integer default("0") -# phone :string(255) -# authentication :boolean default("0") -# grade :integer default("0") -# experience :integer default("0") -# nickname :string(255) -# show_realname :boolean default("1") -# professional_certification :boolean default("0") -# ID_number :string(255) -# certification :integer default("0") -# homepage_teacher :boolean default("0") -# homepage_engineer :boolean default("0") -# is_test :integer default("0") -# ecoder_user_id :integer default("0") -# business :boolean default("0") -# profile_completed :boolean default("0") -# laboratory_id :integer -# platform :string(255) default("0") -# gitea_token :string(255) -# gitea_uid :integer -# is_shixun_marker :boolean default("0") -# is_sync_pwd :boolean default("1") -# watchers_count :integer default("0") -# visibility :string(255) default("public") -# repo_admin_change_team_access :boolean default("1") -# is_org :boolean default("0") -# website :string(255) -# devops_step :integer default("0") +# id :integer not null +# login :string(255) default(""), not null +# hashed_password :string(40) default(""), not null +# firstname :string(30) default(""), not null +# lastname :string(255) default(""), not null +# mail :string(60) +# admin :boolean default("0"), not null +# status :integer default("1"), not null +# last_login_on :datetime +# language :string(5) default("") +# auth_source_id :integer +# created_on :datetime +# updated_on :datetime +# type :string(255) +# identity_url :string(255) +# mail_notification :string(255) default(""), not null +# salt :string(64) +# gid :integer +# visits :integer default("0") +# excellent_teacher :integer default("0") +# excellent_student :integer default("0") +# phone :string(255) +# authentication :boolean default("0") +# grade :integer default("0") +# experience :integer default("0") +# nickname :string(255) +# show_realname :boolean default("1") +# professional_certification :boolean default("0") +# ID_number :string(255) +# certification :integer default("0") +# homepage_teacher :boolean default("0") +# homepage_engineer :boolean default("0") +# is_test :integer default("0") +# ecoder_user_id :integer default("0") +# business :boolean default("0") +# profile_completed :boolean default("0") +# laboratory_id :integer +# platform :string(255) default("0") +# gitea_token :string(255) +# gitea_uid :integer +# is_shixun_marker :boolean default("0") +# is_sync_pwd :boolean default("1") +# watchers_count :integer default("0") +# sponsor_certification :integer default("0") +# sponsor_num :integer default("0") +# sponsored_num :integer default("0") +# description :text(65535) +# devops_step :integer default("0") # # Indexes # diff --git a/app/models/coin_change.rb b/app/models/coin_change.rb index f5e066fb..b3eb761c 100644 --- a/app/models/coin_change.rb +++ b/app/models/coin_change.rb @@ -1,3 +1,17 @@ +# == Schema Information +# +# Table name: coin_changes +# +# id :integer not null, primary key +# amount :integer +# description :string(255) +# reason :string(255) +# to_wallet_id :integer +# from_wallet_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# + class CoinChange < ApplicationRecord belongs_to :to_wallet, class_name: 'Wallet' belongs_to :from_wallet, class_name: 'Wallet' diff --git a/app/models/passed_waitlist.rb b/app/models/passed_waitlist.rb index a658cb7d..05d88742 100644 --- a/app/models/passed_waitlist.rb +++ b/app/models/passed_waitlist.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: passed_waitlists +# +# id :integer not null, primary key +# applicant_id :string(255) +# integer :string(255) +# reviewer_id :string(255) +# created_at :datetime not null +# updated_at :datetime not null +# + class PassedWaitlist < ApplicationRecord belongs_to :applicant, class_name: 'User' belongs_to :reviewer, class_name: 'User' diff --git a/app/models/praise_tread.rb b/app/models/praise_tread.rb index 123bbbdc..d13c17dd 100644 --- a/app/models/praise_tread.rb +++ b/app/models/praise_tread.rb @@ -6,10 +6,14 @@ # user_id :integer not null # praise_tread_object_id :integer # praise_tread_object_type :string(255) -# praise_or_tread :integer +# praise_or_tread :integer default("1") # created_at :datetime not null # updated_at :datetime not null # +# Indexes +# +# praise_tread (praise_tread_object_id,praise_tread_object_type) +# class PraiseTread < ApplicationRecord belongs_to :user diff --git a/app/models/project.rb b/app/models/project.rb index 887a6952..08946467 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -4,7 +4,7 @@ # # id :integer not null, primary key # name :string(255) default(""), not null -# description :text(4294967295) +# description :text(65535) # homepage :string(255) default("") # is_public :boolean default("1"), not null # parent_id :integer @@ -48,10 +48,6 @@ # issue_tags_count :integer default("0") # closed_issues_count :integer default("0") # open_devops :boolean default("0") -# gitea_webhook_id :integer -# open_devops_count :integer default("0") -# recommend :boolean default("0") -# platform :integer default("0") # # Indexes # diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index 8a5e1927..49ead2c6 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -18,9 +18,6 @@ # issue_id :integer # fork_project_id :integer # is_original :boolean default("0") -# comments_count :integer default("0") -# commits_count :integer default("0") -# files_count :integer default("0") # class PullRequest < ApplicationRecord diff --git a/app/models/sponsor_tier.rb b/app/models/sponsor_tier.rb index d84462bd..d7fac999 100644 --- a/app/models/sponsor_tier.rb +++ b/app/models/sponsor_tier.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: sponsor_tiers +# +# id :integer not null, primary key +# tier :integer +# created_at :datetime not null +# updated_at :datetime not null +# description :string(255) default("") +# user_id :integer +# + class SponsorTier < ApplicationRecord belongs_to :user diff --git a/app/models/sponsorship.rb b/app/models/sponsorship.rb index 9a53f92a..602b31f0 100644 --- a/app/models/sponsorship.rb +++ b/app/models/sponsorship.rb @@ -1,3 +1,17 @@ +# == Schema Information +# +# Table name: sponsorships +# +# id :integer not null, primary key +# amount :integer +# visible :integer +# sponsor_id :integer +# developer_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# accumulate :integer default("0") +# + class Sponsorship < ApplicationRecord belongs_to :sponsor, class_name: 'User' belongs_to :developer, class_name: 'User' diff --git a/app/models/stopped_sponsorship.rb b/app/models/stopped_sponsorship.rb index b73ba273..03024e8c 100644 --- a/app/models/stopped_sponsorship.rb +++ b/app/models/stopped_sponsorship.rb @@ -1,3 +1,18 @@ +# == Schema Information +# +# Table name: stopped_sponsorships +# +# id :integer not null, primary key +# amount :integer +# sponsor_id :integer +# developer_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# start_time :datetime +# visible :integer +# accumulate :integer default("0") +# + class StoppedSponsorship < ApplicationRecord belongs_to :sponsor, class_name: 'User' belongs_to :developer, class_name: 'User' diff --git a/app/models/user.rb b/app/models/user.rb index 0797c78d..30d0c2e7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,54 +2,54 @@ # # Table name: users # -# id :integer not null, primary key -# login :string(255) default(""), not null -# hashed_password :string(40) default(""), not null -# firstname :string(30) default(""), not null -# lastname :string(255) default(""), not null -# mail :string(60) -# admin :boolean default("0"), not null -# status :integer default("1"), not null -# last_login_on :datetime -# language :string(5) default("") -# auth_source_id :integer -# created_on :datetime -# updated_on :datetime -# type :string(255) -# identity_url :string(255) -# mail_notification :string(255) default(""), not null -# salt :string(64) -# gid :integer -# visits :integer default("0") -# excellent_teacher :integer default("0") -# excellent_student :integer default("0") -# phone :string(255) -# authentication :boolean default("0") -# grade :integer default("0") -# experience :integer default("0") -# nickname :string(255) -# show_realname :boolean default("1") -# professional_certification :boolean default("0") -# ID_number :string(255) -# certification :integer default("0") -# homepage_teacher :boolean default("0") -# homepage_engineer :boolean default("0") -# is_test :integer default("0") -# ecoder_user_id :integer default("0") -# business :boolean default("0") -# profile_completed :boolean default("0") -# laboratory_id :integer -# platform :string(255) default("0") -# gitea_token :string(255) -# gitea_uid :integer -# is_shixun_marker :boolean default("0") -# is_sync_pwd :boolean default("1") -# watchers_count :integer default("0") -# visibility :string(255) default("public") -# repo_admin_change_team_access :boolean default("1") -# is_org :boolean default("0") -# website :string(255) -# devops_step :integer default("0") +# id :integer not null, primary key +# login :string(255) default(""), not null +# hashed_password :string(40) default(""), not null +# firstname :string(30) default(""), not null +# lastname :string(255) default(""), not null +# mail :string(60) +# admin :boolean default("0"), not null +# status :integer default("1"), not null +# last_login_on :datetime +# language :string(5) default("") +# auth_source_id :integer +# created_on :datetime +# updated_on :datetime +# type :string(255) +# identity_url :string(255) +# mail_notification :string(255) default(""), not null +# salt :string(64) +# gid :integer +# visits :integer default("0") +# excellent_teacher :integer default("0") +# excellent_student :integer default("0") +# phone :string(255) +# authentication :boolean default("0") +# grade :integer default("0") +# experience :integer default("0") +# nickname :string(255) +# show_realname :boolean default("1") +# professional_certification :boolean default("0") +# ID_number :string(255) +# certification :integer default("0") +# homepage_teacher :boolean default("0") +# homepage_engineer :boolean default("0") +# is_test :integer default("0") +# ecoder_user_id :integer default("0") +# business :boolean default("0") +# profile_completed :boolean default("0") +# laboratory_id :integer +# platform :string(255) default("0") +# gitea_token :string(255) +# gitea_uid :integer +# is_shixun_marker :boolean default("0") +# is_sync_pwd :boolean default("1") +# watchers_count :integer default("0") +# sponsor_certification :integer default("0") +# sponsor_num :integer default("0") +# sponsored_num :integer default("0") +# description :text(65535) +# devops_step :integer default("0") # # Indexes # diff --git a/app/models/waitlist.rb b/app/models/waitlist.rb index 0c058eb7..252b1792 100644 --- a/app/models/waitlist.rb +++ b/app/models/waitlist.rb @@ -1,3 +1,15 @@ +# == Schema Information +# +# Table name: waitlists +# +# id :integer not null, primary key +# applicant_id :string(255) +# integer :string(255) +# reviewer_id :string(255) +# created_at :datetime not null +# updated_at :datetime not null +# + class Waitlist < ApplicationRecord belongs_to :applicant, class_name: 'User' belongs_to :reviewer, class_name: 'User', optional: true diff --git a/app/models/wallet.rb b/app/models/wallet.rb index e7e78671..64bcd942 100644 --- a/app/models/wallet.rb +++ b/app/models/wallet.rb @@ -1,3 +1,14 @@ +# == Schema Information +# +# Table name: wallets +# +# id :integer not null, primary key +# balance :integer +# user_id :integer +# created_at :datetime not null +# updated_at :datetime not null +# + class Wallet < ApplicationRecord belongs_to :user has_many :outcome, class_name: 'CoinChange', foreign_key: 'from_wallet_id', dependent: :destroy diff --git a/config/routes.rb b/config/routes.rb index 0bd2b241..cf4c655b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,8 +31,8 @@ Rails.application.routes.draw do # post 'log/download', to: 'log#download' match 'log/download/:filename' => 'log#download', :constraints => { filename: /[0-z\.]+/ }, via:[:get] - resources :sponsor_tiers - resources :sponsorships do + resources :sponsor_tiers, only: [:index, :show, :create, :update, :destroy] + resources :sponsorships, only: [:index, :show, :create, :update, :destroy] do collection do get :sponsored get :sponsoring diff --git a/spec/controllers/sponsor_tiers_controller_spec.rb b/spec/controllers/sponsor_tiers_controller_spec.rb index cf7bca64..cf233c3c 100644 --- a/spec/controllers/sponsor_tiers_controller_spec.rb +++ b/spec/controllers/sponsor_tiers_controller_spec.rb @@ -44,7 +44,7 @@ RSpec.describe SponsorTiersController, type: :controller do describe "GET #index" do it "returns a success response" do SponsorTier.create! valid_attributes - get :index, params: {}, session: valid_session + get :index, params: {login: qyzh123123}, session: valid_session expect(response).to be_successful end end