Merge pull request #4 from fujikawahiroaki/develop

feat: collection_settingsのCRUD完成

dc-lucky.sh

@@ -1 +1 @@
-docker-compose exec lucky lucky $1
+docker-compose exec lucky lucky ${@}

shard.yml

@@ -5,8 +5,6 @@ targets:
   specbox_api:
     main: src/specbox_api.cr
 crystal: '>= 1.10.1'
-crystalline:
-  main: src/specbox_api.cr
 dependencies:
   lucky:
     github: luckyframework/lucky

src/actions/api/collection_settings/create.cr

@@ -0,0 +1,6 @@
+class Api::CollectionSettings::Create < ApiAction
+  post "/api/collection-settings/own-collection-settings" do
+    collection_setting = SaveCollectionSetting.create!(params, id: UUID.random, user_id: current_user.id)
+    head HTTP::Status::CREATED
+  end
+end

src/actions/api/collection_settings/delete.cr

@@ -0,0 +1,11 @@
+class Api::CollectionSettings::Delete < ApiAction
+  delete "/api/collection-settings/own-collection-settings/:collection_setting_id" do
+    collection_setting = CollectionSettingQuery.new.find(collection_setting_id)
+    if collection_setting.user_id == current_user.id
+      DeleteCollectionSetting.delete!(collection_setting)
+      head 204
+    else
+      head 403
+    end
+  end
+end

src/actions/api/collection_settings/index.cr

@@ -1,6 +1,38 @@
 class Api::CollectionSettings::Index < ApiAction
   get "/api/collection-settings/own-collection-settings" do
-    collection_settings = CollectionSettingQuery.new.user_id(current_user.id)
-    json CollectionSettingSerializer.for_collection(collection_settings)
+    query = CollectionSettingQuery.new.user_id(current_user.id)
+    if params.get?(:collection_name)
+      query = query.collection_name.ilike("%#{params.get(:collection_name)}%")
+    end
+    if params.get?(:institution_code)
+      query = query.institution_code.ilike("%#{params.get(:institution_code)}%")
+    end
+    if params.get?(:latest_collection_code_min)
+      query = query.latest_collection_code.gte(params.get(:latest_collection_code_min))
+    end
+    if params.get?(:latest_collection_code_max)
+      query = query.latest_collection_code.lte(params.get(:latest_collection_code_max))
+    end
+    if params.get?(:note)
+      query = query.note.ilike("%#{params.get(:note)}%")
+    end
+    if params.get?(:created_at)
+      query = query.created_at.as_date.eq(params.get(:created_at))
+    end
+    if params.get?(:sort)
+      sort_column = params.get(:sort)
+      if sort_column == "collection_name"
+        query = switch_order(query.collection_name, params)
+      elsif sort_column == "institution_code"
+        query = switch_order(query.institution_code, params)
+      elsif sort_column == "latest_collection_code"
+        query = switch_order(query.latest_collection_code, params)
+      else
+        query = switch_order(query.created_at, params)
+      end
+    else
+      query = switch_order(query.created_at, params)
+    end
+    json CollectionSettingSerializer.for_collection(query)
   end
 end

src/actions/api/collection_settings/update.cr

@@ -0,0 +1,11 @@
+class Api::CollectionSettings::Update < ApiAction
+  put "/api/collection-settings/own-collection-settings/:collection_setting_id" do
+    collection_setting = CollectionSettingQuery.new.find(collection_setting_id)
+    if collection_setting.user_id == current_user.id
+      SaveCollectionSetting.update!(collection_setting, params)
+      head 204
+    else
+      head 403
+    end
+  end
+end

src/actions/api_action.cr

@@ -12,4 +12,5 @@ abstract class ApiAction < Lucky::Action
   # Add 'include Lucky::SkipRouteStyleCheck' to your actions if you wish to ignore this check for specific routes.
   # include Lucky::EnforceUnderscoredRoute
   include Lucky::SkipRouteStyleCheck
+  include Api::Custom::SwitchOrder
 end

src/actions/mixins/api/auth/auth0_helpers.cr

@@ -80,7 +80,6 @@ module Api::Auth::Auth0Helpers
       decoded_token = self.validate_token(token)
       return nil if decoded_token.nil?
       username = decoded_token[0]["sub"].as_s.sub("|", ".")
-      Log.info { "login_user: #{username}" }
       user = AuthUserQuery.new.username(username).first?
       if user.nil?
         SaveAuthUser.create!(username: username, date_joined: Time.local)

src/actions/mixins/api/custom/switch_order_by.cr

@@ -0,0 +1,8 @@
+module Api::Custom::SwitchOrder
+  def switch_order(query, params)
+    if params.get?(:order)
+      return query.desc_order if params.get(:order) == "DESC"
+    end
+    query.asc_order
+  end
+end

src/models/base_model.cr

@@ -4,7 +4,7 @@ abstract class BaseModel < Avram::Model
   end
 
   macro default_columns
-    primary_key custom_key : UUID
+    primary_key id : UUID
     timestamps
   end
 end

src/models/collection_setting.cr

@@ -9,7 +9,7 @@ class CollectionSetting < BaseModel
     # 機関コード(コレクション名の略号)
     column institution_code : String = "", allow_blank: true
     # 標本IDの最終番号
-    column latest_collection_code : Int64 = 0i64
+    column latest_collection_code : Int32 = 0
     # 備考
     column note : String = "", allow_blank: true
   end

src/operations/delete_collection_setting.cr

@@ -1,4 +1,2 @@
 class DeleteCollectionSetting < CollectionSetting::DeleteOperation
-  # Read more on deleting records
-  # https://luckyframework.org/guides/database/deleting-records
 end

src/operations/save_collection_setting.cr

@@ -1,18 +1,16 @@
 class SaveCollectionSetting < CollectionSetting::SaveOperation
-  # To save user provided params to the database, you must permit them
-  # https://luckyframework.org/guides/database/saving-records#perma-permitting-columns
-  #
-  # permit_columns column_1, column_2
   permit_columns(
+    id,
     collection_name,
     institution_code,
     latest_collection_code,
-    note
+    note,
+    user_id
   )
 
   before_save do
     validate_size_of collection_name, max: 174
     validate_size_of institution_code, max: 10
-    validate_numeric latest_collection_code, less_than: 999999999999999999i64
+    validate_numeric latest_collection_code, no_more_than: 999999999999999999i64
   end
 end