From cafd55bf225331cac49f253c35ba8e5ce64e3428 Mon Sep 17 00:00:00 2001 From: miteruzo Date: Mon, 15 Sep 2025 05:20:25 +0900 Subject: [PATCH] =?UTF-8?q?#101=20=E3=82=AA=E3=83=AA=E3=82=B8=E3=83=8A?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E4=BD=9C=E6=88=90=E6=97=A5=E6=99=82=EF=BC=8C?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AB=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=89=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/controllers/posts_controller.rb | 9 +++- backend/app/models/post.rb | 18 ++++++++ frontend/src/components/PostEditForm.tsx | 38 +++++++++++++--- .../src/components/common/DateTimeField.tsx | 43 +++++++++++++++++++ frontend/src/pages/posts/PostNewPage.tsx | 36 +++++++++++++--- frontend/src/types.ts | 19 ++++---- 6 files changed, 142 insertions(+), 21 deletions(-) create mode 100644 frontend/src/components/common/DateTimeField.tsx diff --git a/backend/app/controllers/posts_controller.rb b/backend/app/controllers/posts_controller.rb index 831a301..6877c70 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -69,8 +69,11 @@ class PostsController < ApplicationController 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! @@ -103,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 diff --git a/backend/app/models/post.rb b/backend/app/models/post.rb index bdc136a..f32f753 100644 --- a/backend/app/models/post.rb +++ b/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 diff --git a/frontend/src/components/PostEditForm.tsx b/frontend/src/components/PostEditForm.tsx index a254ce1..ad7ba82 100644 --- a/frontend/src/components/PostEditForm.tsx +++ b/frontend/src/components/PostEditForm.tsx @@ -3,6 +3,7 @@ import toCamel from 'camelcase-keys' import { useState } from 'react' import PostFormTagsArea from '@/components/PostFormTagsArea' +import DateTimeField from '@/components/common/DateTimeField' import Label from '@/components/common/Label' import { Button } from '@/components/ui/button' import { API_BASE_URL } from '@/config' @@ -16,6 +17,10 @@ type Props = { post: Post export default (({ post, onSave }: Props) => { + const [originalCreatedBefore, setOriginalCreatedBefore] = + useState (post.originalCreatedBefore) + const [originalCreatedFrom, setOriginalCreatedFrom] = + useState (post.originalCreatedFrom) const [title, setTitle] = useState (post.title) const [tags, setTags] = useState (post.tags .filter (t => t.category !== 'nico') @@ -23,13 +28,19 @@ export default (({ post, onSave }: Props) => { .join (' ')) const handleSubmit = async () => { - const res = await axios.put (`${ API_BASE_URL }/posts/${ post.id }`, { title, tags }, + const res = await axios.put ( + `${ API_BASE_URL }/posts/${ post.id }`, + { title, tags, + original_created_from: originalCreatedFrom, + original_created_before: originalCreatedBefore }, { headers: { 'Content-Type': 'multipart/form-data', - 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } } ) + 'X-Transfer-Code': localStorage.getItem ('user_code') ?? '' } }) const data = toCamel (res.data as any, { deep: true }) as Post onSave ({ ...post, - title: data.title, - tags: data.tags } as Post) + title: data.title, + tags: data.tags, + originalCreatedFrom: data.originalCreatedFrom, + originalCreatedBefore: data.originalCreatedBefore } as Post) } return ( @@ -40,12 +51,29 @@ export default (({ post, onSave }: Props) => { setTitle (e.target.value)}/> + onChange={ev => setTitle (ev.target.value)}/> {/* タグ */} + {/* オリジナルの作成日時 */} +
+ +
+ + 以降 +
+
+ + より前 +
+
+ {/* 送信 */}