feat: オリジナルの作成日時追加（ #101 ） (#117)

#101 オリジナルの作成日時（より前）の自動設定

#101 余白追加

#101 余白追加

#101 オリジナルの作成日時，フォームにフィールド追加

#101 マイグレとコントローラ

Co-authored-by: miteruzo <miteruzo@naver.com>
Reviewed-on: #117

backend/app/controllers/posts_controller.rb

@@ -8,8 +8,11 @@ class PostsController < ApplicationController
     limit = params[:limit].presence&.to_i
     cursor = params[:cursor].presence
 
-    q = filtered_posts.order(created_at: :desc)
-    q = q.where('posts.created_at < ?', Time.iso8601(cursor)) if cursor
+    created_at = ('COALESCE(posts.original_created_before - INTERVAL 1 SECOND,' +
+                  'posts.original_created_from,' +
+                  'posts.created_at)')
+    q = filtered_posts.order(Arel.sql("#{ created_at } DESC"))
+    q = q.where("#{ created_at } < ?", Time.iso8601(cursor)) if cursor
 
     posts = limit ? q.limit(limit + 1) : q
 
@@ -20,14 +23,14 @@ class PostsController < ApplicationController
     end
 
     render json: { posts: posts.map { |post|
-      post.as_json(include: { tags: { only: [:id, :name, :category, :post_count] } }).tap { |json|
+      post.as_json(include: { tags: { only: [:id, :name, :category, :post_count] } }).tap do |json|
         json['thumbnail'] =
             if post.thumbnail.attached?
               rails_storage_proxy_url(post.thumbnail, only_path: false)
             else
               nil
             end
-      }
+      end
     }, next_cursor: }
   end
 
@@ -39,7 +42,7 @@ class PostsController < ApplicationController
 
     render json: (post
                   .as_json(include: { tags: { only: [:id, :name, :category, :post_count] } })
-                  .merge(viewed: viewed))
+                  .merge(viewed:))
   end
 
   # GET /posts/1
@@ -60,14 +63,17 @@ class PostsController < ApplicationController
     return head :forbidden unless current_user.member?
 
     # TODO: URL が正規のものがチェック，不正ならエラー
-    # TODO: title、URL は必須にする．
+    # TODO: URL は必須にする（タイトルは省略可）．
     # TODO: サイトに応じて thumbnail_base 設定
     title = params[:title]
     url = params[:url]
     thumbnail = params[:thumbnail]
     tag_names = params[:tags].to_s.split(' ')
+    original_created_from = params[:original_created_from]
+    original_created_before = params[:original_created_before]
 
-    post = Post.new(title:, url:, thumbnail_base: '', uploaded_user: current_user)
+    post = Post.new(title:, url:, thumbnail_base: '', uploaded_user: current_user,
+                    original_created_from:, original_created_before:)
     post.thumbnail.attach(thumbnail)
     if post.save
       post.resized_thumbnail!
@@ -100,10 +106,12 @@ class PostsController < ApplicationController
 
     title = params[:title]
     tag_names = params[:tags].to_s.split(' ')
+    original_created_from = params[:original_created_from]
+    original_created_before = params[:original_created_before]
 
     post = Post.find(params[:id].to_i)
     tags = post.tags.where(category: 'nico').to_a + Tag.normalise_tags(tag_names)
-    if post.update(title:, tags:)
+    if post.update(title:, tags:, original_created_from:, original_created_before:)
       render json: post.as_json(include: { tags: { only: [:id, :name, :category, :post_count] } }),
              status: :ok
     else

backend/app/models/post.rb

@@ -15,6 +15,8 @@ class Post < ApplicationRecord
            foreign_key: :target_post_id
   has_one_attached :thumbnail
 
+  validate :validate_original_created_range
+
   def as_json options = { }
     super(options).merge({ thumbnail: thumbnail.attached? ?
                                       Rails.application.routes.url_helpers.rails_blob_url(
@@ -49,4 +51,20 @@ class Post < ApplicationRecord
                      filename:      'resized_thumbnail.jpg',
                      content_type:  'image/jpeg')
   end
+
+  private
+
+  def validate_original_created_range
+    f = original_created_from
+    b = original_created_before
+    return if f.blank? || b.blank?
+
+    f = Time.zone.parse(f) if String === f
+    b = Time.zone.parse(b) if String === b
+    return if !(f) || !(b)
+
+    if f >= b
+      errors.add :original_created_before, 'オリジナルの作成日時の順番がをかしぃです．'
+    end
+  end
 end