Skip to content

[データベース]詳細閲覧時にデータの更新日が更新される不具合を修正しました #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/Models/User/Databases/DatabasesInputCols.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,15 @@ class DatabasesInputCols extends Model

// 更新する項目の定義
protected $fillable = ['databases_inputs_id', 'databases_columns_id', 'value'];

// リレーション
/**
* データベース入力
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
* @phpcsSuppress
*/
public function databases_input() // phpcs:ignore
{
return $this->belongsTo(DatabasesInputs::class, 'databases_inputs_id');
}
}
1 change: 1 addition & 0 deletions app/Models/User/Databases/DatabasesInputs.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class DatabasesInputs extends Model
'first_committed_at',
'categories_id',
'views',
'last_col_updated_at',
'created_at',
'updated_at'
];
Expand Down
70 changes: 70 additions & 0 deletions app/Observers/User/Databases/DatabasesInputColsObserver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?php

namespace App\Observers\User\Databases;

use App\Models\User\Databases\DatabasesInputCols;
use Carbon\Carbon;

class DatabasesInputColsObserver
{
/**
* Handle the DatabasesInputCols "created" event.
*
* @param App\Models\User\Databases\DatabasesInputCols $databases_input_cols
* @return void
*/
public function created(DatabasesInputCols $databases_input_cols)
{
$databases_input_cols->databases_input->update([
'last_col_updated_at' => Carbon::now(),
]);
}

/**
* Handle the DatabasesInputCols "updated" event.
*
* @param App\Models\User\Databases\DatabasesInputCols $databases_input_cols
* @return void
*/
public function updated(DatabasesInputCols $databases_input_cols)
{
$databases_input_cols->databases_input->update([
'last_col_updated_at' => Carbon::now(),
]);
}

/**
* Handle the DatabasesInputCols "deleted" event.
*
* @param App\Models\User\Databases\DatabasesInputCols $databases_input_cols
* @return void
*/
public function deleted(DatabasesInputCols $databases_input_cols)
{
$databases_input_cols->databases_input->update([
'last_col_updated_at' => Carbon::now(),
]);
}

/**
* Handle the DatabasesInputCols "restored" event.
*
* @param App\Models\User\Databases\DatabasesInputCols $databases_input_cols
* @return void
*/
public function restored(DatabasesInputCols $databases_input_cols)
{
//
}

/**
* Handle the DatabasesInputCols "force deleted" event.
*
* @param App\Models\User\Databases\DatabasesInputCols $databases_input_cols
* @return void
*/
public function forceDeleted(DatabasesInputCols $databases_input_cols)
{
//
}
}
4 changes: 2 additions & 2 deletions app/Plugins/User/Databases/DatabasesPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -1912,7 +1912,7 @@ private function getColumnValue(?DatabasesInputs $input, string $db_col_name = '
$value = $input->created_at;
} elseif ($column->column_type == DatabaseColumnType::updated) {
// 更新日型
$value = $input->updated_at;
$value = $input->last_col_updated_at;
} elseif ($column->column_type == DatabaseColumnType::posted) {
// 公開日型
$value = $input->posted_at;
Expand Down Expand Up @@ -3139,7 +3139,7 @@ public function downloadCsv($request, $page_id, $frame_id, $id, $data_output_fla
select(
'databases_input_cols.*',
'databases_inputs.created_at as inputs_created_at',
'databases_inputs.updated_at as inputs_updated_at',
'databases_inputs.last_col_updated_at as inputs_updated_at',
'databases_inputs.posted_at as inputs_posted_at',
'databases_inputs.expires_at as inputs_expires_at',
'databases_inputs.display_sequence as inputs_display_sequence',
Expand Down
5 changes: 4 additions & 1 deletion app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace App\Providers;

use App\Models\User\Databases\DatabasesInputCols;
use App\Observers\User\Databases\DatabasesInputColsObserver;
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
Expand Down Expand Up @@ -33,6 +35,7 @@ public function boot()
{
parent::boot();

//
// オブザーバーの登録
DatabasesInputCols::observe(DatabasesInputColsObserver::class);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class AddLastColUpdatedAtToDatabasesInputsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('databases_inputs', function (Blueprint $table) {
$table->timestamp('last_col_updated_at')->nullable()->after('full_text');
});

// 既存データの更新
\DB::statement('
UPDATE databases_inputs di
SET di.last_col_updated_at = (
SELECT updated_at
FROM databases_input_cols dic
WHERE dic.databases_inputs_id = di.id
ORDER BY updated_at DESC
LIMIT 1
)
');
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('databases_inputs', function (Blueprint $table) {
$table->dropColumn('last_col_updated_at');
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
}
// 更新日型
elseif ($column->column_type == DatabaseColumnType::updated) {
$value = $inputs->updated_at;
$value = $inputs->last_col_updated_at;
}
// 表示件数型
elseif ($column->column_type == DatabaseColumnType::views) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}
// 更新日型
elseif ($column->column_type == DatabaseColumnType::updated) {
$value = $input->updated_at;
$value = $input->last_col_updated_at;
}
// 表示件数型
elseif ($column->column_type == DatabaseColumnType::views) {
Expand Down