souls 0.22.6 → 0.22.7

data/hoy/db/migrate/20200714215521_create_articles.rb

@@ -0,0 +1,22 @@
+class CreateArticles < ActiveRecord::Migration[6.1]
+  def change
+    create_table :articles do |t|
+      t.belongs_to :user
+      t.string :title, null: false, unique: true
+      t.text :body, null: false, default: ""
+      t.string :thumnail_url, null: false, default: ""
+      t.datetime :public_date, null: false, default: Time.now + 30.days
+      t.belongs_to :article_category, null: false
+      t.boolean :is_public, default: false, null: false
+      t.boolean :just_created, default: true, null: false
+      t.string :slag, null: false, unique: true
+      t.text :tags, array: true, default: []
+      t.boolean :is_deleted, null: false, default: false
+      t.timestamps
+    end
+    add_index :articles, :slag, unique: true
+    add_index :articles, :title, unique: true
+    add_index :articles, :is_public
+    add_index :articles, :is_deleted
+  end
+end

data/hoy/db/schema.rb

@@ -0,0 +1,78 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2020_07_14_215521) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "article_categories", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "tags", default: [], array: true
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["is_deleted"], name: "index_article_categories_on_is_deleted"
+    t.index ["name"], name: "index_article_categories_on_name"
+  end
+
+  create_table "articles", force: :cascade do |t|
+    t.bigint "user_id"
+    t.string "title", null: false
+    t.text "body", default: "", null: false
+    t.string "thumnail_url", default: "", null: false
+    t.datetime "public_date", default: "2021-08-06 07:08:30", null: false
+    t.bigint "article_category_id", null: false
+    t.boolean "is_public", default: false, null: false
+    t.boolean "just_created", default: true, null: false
+    t.string "slag", null: false
+    t.text "tags", default: [], array: true
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["article_category_id"], name: "index_articles_on_article_category_id"
+    t.index ["is_deleted"], name: "index_articles_on_is_deleted"
+    t.index ["is_public"], name: "index_articles_on_is_public"
+    t.index ["slag"], name: "index_articles_on_slag", unique: true
+    t.index ["title"], name: "index_articles_on_title", unique: true
+    t.index ["user_id"], name: "index_articles_on_user_id"
+  end
+
+  create_table "users", force: :cascade do |t|
+    t.string "uid", null: false
+    t.string "username", default: "", null: false
+    t.string "screen_name", default: "", null: false
+    t.string "last_name", default: "", null: false
+    t.string "first_name", default: "", null: false
+    t.string "last_name_kanji", default: "", null: false
+    t.string "first_name_kanji", default: "", null: false
+    t.string "last_name_kana", default: "", null: false
+    t.string "first_name_kana", default: "", null: false
+    t.string "email", null: false
+    t.string "tel", default: "", null: false
+    t.string "icon_url", default: "", null: false
+    t.string "birthday", default: "", null: false
+    t.string "gender", default: "", null: false
+    t.string "lang", default: "ja", null: false
+    t.string "category", default: "user", null: false
+    t.integer "roles_mask", default: 1, null: false
+    t.boolean "is_deleted", default: false, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["is_deleted"], name: "index_users_on_is_deleted"
+    t.index ["screen_name"], name: "index_users_on_screen_name"
+    t.index ["uid"], name: "index_users_on_uid"
+    t.index ["username"], name: "index_users_on_username"
+  end
+
+end

data/hoy/db/seeds.rb

@@ -0,0 +1,44 @@
+require "./app"
+
+Dir[File.expand_path("#{Rack::Directory.new('').root}/spec/factories/*.rb")]
+  .each { |file| require file }
+
+def create_user
+  gimei = Gimei.name
+  user =
+    FactoryBot.create(
+      :user,
+      username: gimei.kanji,
+      last_name: gimei.last.hiragana,
+      first_name: gimei.first.hiragana,
+      last_name_kanji: gimei.last.kanji,
+      first_name_kanji: gimei.first.kanji,
+      last_name_kana: gimei.last.katakana,
+      first_name_kana: gimei.first.katakana,
+      gender: gimei.gender
+    )
+  puts(user.to_json)
+  return user.id if user
+end
+
+def create_article_category
+  article_category = FactoryBot.create(:article_category)
+  "Article Category Created!\n #{article_category.to_json}" if article_category
+end
+
+def create_article(user_id, article_category_id)
+  article = FactoryBot.create(:article, user_id: user_id, article_category_id: article_category_id)
+  "Article Created!\n #{article.to_json}" if article
+end
+
+%w[お知らせ 特集 ビーフ ポーク レシピ].each do |name|
+  puts ArticleCategory.create(name: name).to_json
+end
+
+10.times { create_user }
+
+100.times do |_i|
+  user_id = User.find(rand(5).to_i + 1).id
+  article_category_id = ArticleCategory.find(rand(3).to_i + 1).id
+  puts create_article(user_id, article_category_id)
+end

data/hoy/github/workflows/delivery.yml

@@ -0,0 +1,81 @@
+name: Delivery
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-20.04
+
+    services:
+      db:
+        image: postgres:13
+        ports: ["5433:5432"]
+        env:
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 3.0
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+    - name: Build and test with Rake
+      env:
+        PGHOST: 127.0.0.1
+        PGUSER: postgres
+        RACK_ENV: test
+      run: |
+        sudo apt-get -yqq install libpq-dev
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake db:create RACK_ENV=test
+        bundle exec rake db:migrate RACK_ENV=test
+        bundle exec rspec
+
+    - name: Checkout the repository
+      uses: actions/checkout@v2
+
+    - name: GCP Authenticate
+      uses: google-github-actions/setup-gcloud@master
+      with:
+        version: "323.0.0"
+        project_id: ${{ secrets.GCP_PROJECT_ID }}
+        service_account_key: ${{ secrets.GCP_SA_KEY }}
+        export_default_credentials: true
+    
+    - name: Configure Docker
+      run: gcloud auth configure-docker --quiet
+    
+    - name: Build Docker container
+      run: docker build . -t gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}
+
+    - name: Push to Container Resistory
+      run: docker push gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}
+
+    - name: Deploy to Cloud Run
+      run: |
+          gcloud run deploy ${{ secrets.APP_NAME }} \
+            --image=gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}} \
+            --memory=4Gi \
+            --region=asia-northeast1 \
+            --allow-unauthenticated \
+            --platform=managed \
+            --quiet \
+            --concurrency=80 \
+            --port=8080 \
+            --set-cloudsql-instances=${{ secrets.GCLOUDSQL_INSTANCE }} \
+            --set-env-vars="DB_USER=${{ secrets.DB_USER }}" \
+            --set-env-vars="DB_PW=${{ secrets.DB_PW }}" \
+            --set-env-vars="DB_HOST=${{ secrets.DB_HOST }}" \
+            --set-env-vars="TZ=${{ secrets.TZ }}" \
+            --set-env-vars="SLACK=${{ secrets.SLACK }}" \
+            --set-env-vars="SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}" \

data/hoy/spec/factories/article_categories.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :article_category do
+    name { Faker::Books::CultureSeries.culture_ship_class }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/hoy/spec/factories/articles.rb

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :article do
+    association :user, factory: :user
+    title { Faker::Book.unique.title }
+    body { Faker::Quote.matz }
+    thumnail_url { Faker::Internet.url }
+    public_date { Time.now }
+    association :article_category, factory: :article_category
+    is_public { false }
+    just_created { false }
+    slag { Faker::Internet.password(min_length: 16) }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/hoy/spec/factories/users.rb

@@ -0,0 +1,23 @@
+require "gimei"
+FactoryBot.define do
+  factory :user do
+    uid { Faker::Internet.password }
+    username { Gimei.kanji }
+    screen_name { Faker::Internet.unique.username }
+    last_name { Gimei.last.hiragana }
+    first_name { Gimei.first.hiragana }
+    last_name_kanji { Gimei.last.kanji }
+    first_name_kanji { Gimei.first.kanji }
+    last_name_kana { Gimei.last.katakana }
+    first_name_kana { Gimei.last.katakana }
+    email { Faker::Internet.unique.email }
+    tel { Faker::PhoneNumber.subscriber_number(length: 10) }
+    icon_url { "https://picsum.photos/200" }
+    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
+    gender { Gimei.male }
+    lang { "ja" }
+    category { "user" }
+    roles_mask { :normal }
+    is_deleted { false }
+  end
+end

data/hoy/spec/models/article_category_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("ArticleCategory Model テスト", type: :model) do
+  describe "ArticleCategory データを書き込む" do
+    it "valid ArticleCategory Model" do
+      expect(FactoryBot.build(:article_category)).to(be_valid)
+    end
+  end
+end

data/hoy/spec/models/article_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("Article Model テスト", type: :model) do
+  describe "Article データを書き込む" do
+    it "valid Article Model" do
+      expect(FactoryBot.build(:article)).to(be_valid)
+    end
+  end
+end

data/hoy/spec/models/user_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("User Model テスト", type: :model) do
+  describe "User データを書き込む" do
+    it "valid User Model" do
+      expect(FactoryBot.build(:user)).to(be_valid)
+    end
+  end
+end

data/hoy/spec/mutations/base/article_category_spec.rb

@@ -0,0 +1,46 @@
+RSpec.describe("ArticleCategory Mutation テスト") do
+  describe "ArticleCategory データを登録する" do
+    let(:article_category) { FactoryBot.attributes_for(:article_category) }
+
+    let(:mutation) do
+      %(mutation {
+        createArticleCategory(input: {
+          name: "#{article_category[:name]}"
+          tags: #{article_category[:tags]}
+          isDeleted: #{article_category[:is_deleted]}
+        }) {
+            articleCategoryEdge {
+          node {
+              id
+              name
+              tags
+              isDeleted
+              }
+            }
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      SoulsApiSchema.execute(mutation).as_json
+    end
+
+    it "return ArticleCategory Data" do
+      begin
+        a1 = result.dig("data", "createArticleCategory", "articleCategoryEdge", "node")
+        raise unless a1.present?
+      rescue StandardError
+        raise(StandardError, result)
+      end
+      expect(a1).to(
+        include(
+          "id" => be_a(String),
+          "name" => be_a(String),
+          "tags" => be_all(String),
+          "isDeleted" => be_in([true, false])
+        )
+      )
+    end
+  end
+end

data/hoy/spec/mutations/base/article_spec.rb

@@ -0,0 +1,70 @@
+RSpec.describe("Article Mutation テスト") do
+  describe "Article データを登録する" do
+    let(:user) { FactoryBot.create(:user) }
+    let(:article_category) { FactoryBot.create(:article_category) }
+    let(:article) do
+      FactoryBot.attributes_for(:article, article_category_id: get_global_key("ArticleCategory", article_category.id))
+    end
+
+    let(:mutation) do
+      %(mutation {
+        createArticle(input: {
+          title: "#{article[:title]}"
+          body: "#{article[:body]}"
+          thumnailUrl: "#{article[:thumnail_url]}"
+          publicDate: "#{article[:public_date]}"
+          articleCategoryId: "#{article[:article_category_id]}"
+          isPublic: #{article[:is_public]}
+          justCreated: #{article[:just_created]}
+          slag: "#{article[:slag]}"
+          tags: #{article[:tags]}
+          isDeleted: #{article[:is_deleted]}
+        }) {
+            articleEdge {
+          node {
+              id
+              title
+              body
+              thumnailUrl
+              publicDate
+              isPublic
+              justCreated
+              slag
+              tags
+              isDeleted
+              }
+            }
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      context = { user: user }
+      SoulsApiSchema.execute(mutation, context: context).as_json
+    end
+
+    it "return Article Data" do
+      begin
+        a1 = result.dig("data", "createArticle", "articleEdge", "node")
+        raise unless a1.present?
+      rescue StandardError
+        raise(StandardError, result)
+      end
+      expect(a1).to(
+        include(
+          "id" => be_a(String),
+          "title" => be_a(String),
+          "body" => be_a(String),
+          "thumnailUrl" => be_a(String),
+          "publicDate" => be_a(String),
+          "isPublic" => be_in([true, false]),
+          "justCreated" => be_in([true, false]),
+          "slag" => be_a(String),
+          "tags" => be_all(String),
+          "isDeleted" => be_in([true, false])
+        )
+      )
+    end
+  end
+end

data/hoy/spec/mutations/base/user_spec.rb

@@ -0,0 +1,76 @@
+RSpec.describe("User Mutation テスト") do
+  describe "User データを登録する" do
+    let(:user) { FactoryBot.attributes_for(:user) }
+
+    let(:mutation) do
+      %(mutation {
+        createUser(input: {
+          uid: "#{user[:uid]}"
+          username: "#{user[:username]}"
+          screenName: "#{user[:screen_name]}"
+          lastName: "#{user[:last_name]}"
+          firstName: "#{user[:first_name]}"
+          lastNameKanji: "#{user[:last_name_kanji]}"
+          firstNameKanji: "#{user[:first_name_kanji]}"
+          lastNameKana: "#{user[:last_name_kana]}"
+          firstNameKana: "#{user[:first_name_kana]}"
+          email: "#{user[:email]}"
+          tel: "#{user[:tel]}"
+          iconUrl: "#{user[:icon_url]}"
+          birthday: "#{user[:birthday]}"
+        }) {
+            userEdge {
+          node {
+              id
+              uid
+              username
+              screenName
+              lastName
+              firstName
+              lastNameKanji
+              firstNameKanji
+              lastNameKana
+              firstNameKana
+              email
+              tel
+              iconUrl
+              birthday
+              }
+            }
+          }
+        }
+      )
+    end
+
+    subject(:result) do
+      SoulsApiSchema.execute(mutation).as_json
+    end
+
+    it "return User Data" do
+      begin
+        a1 = result.dig("data", "createUser", "userEdge", "node")
+        raise unless a1.present?
+      rescue StandardError
+        raise(StandardError, result)
+      end
+      expect(a1).to(
+        include(
+          "id" => be_a(String),
+          "uid" => be_a(String),
+          "username" => be_a(String),
+          "screenName" => be_a(String),
+          "lastName" => be_a(String),
+          "firstName" => be_a(String),
+          "lastNameKanji" => be_a(String),
+          "firstNameKanji" => be_a(String),
+          "lastNameKana" => be_a(String),
+          "firstNameKana" => be_a(String),
+          "email" => be_a(String),
+          "tel" => be_a(String),
+          "iconUrl" => be_a(String),
+          "birthday" => be_a(String)
+        )
+      )
+    end
+  end
+end