Skip to content

Commit 66d4677

Browse files
authored
Merge pull request #1610 from coderdojo-japan/add-note-to-dojo-model-to-leave-a-comment-for-future
Add `note` column to `Dojo` model to leave a comment in YAML for future development
2 parents b13a170 + 6aba71c commit 66d4677

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

db/dojos.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,8 @@
957957
- 映像制作
958958
- id: 158
959959
order: '122303'
960-
is_active: true # Re-active @ 2024/03/16 https://twitter.com/KEITAROinNRT/status/1768837516835352825
960+
note: Re-actived @ 2024/03/16 https://twitter.com/KEITAROinNRT/status/1768837516835352825
961+
is_active: true
961962
created_at: '2018-11-17'
962963
name: 成田
963964
prefecture_id: 12
@@ -1181,7 +1182,8 @@
11811182
- JavaScript
11821183
- id: 19
11831184
order: '131130'
1184-
is_active: true # Re-activated @ 2024/04/01
1185+
is_active: true
1186+
note: Re-activated @ 2024/04/01
11851187
created_at: '2020-01-30'
11861188
name: 渋谷
11871189
prefecture_id: 13
@@ -2387,7 +2389,8 @@
23872389
- Minecraft
23882390
- id: 62
23892391
order: '242039'
2390-
is_active: true # Re-activated @ 2024年5月6日 (月曜)
2392+
is_active: true
2393+
note: Re-activated @ 2024年5月6日 (月曜)
23912394
created_at: '2016-12-22'
23922395
name: 伊勢
23932396
prefecture_id: 24
@@ -3186,7 +3189,8 @@
31863189
- Ruby
31873190
- id: 245
31883191
order: '325015'
3189-
is_active: true # Re-activated @ 2024年6月17日 (月曜)
3192+
is_active: true
3193+
note: Re-activated @ 2024年6月17日 (月曜)
31903194
created_at: '2020-03-10'
31913195
name: 津和野
31923196
prefecture_id: 32
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class AddNoteToDojos < ActiveRecord::Migration[6.1]
2+
def change
3+
add_column :dojos, :note, :string, null: false, default: ""
4+
end
5+
end

db/schema.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 2023_07_14_141908) do
13+
ActiveRecord::Schema.define(version: 2024_06_18_025325) do
1414

1515
# These are extensions that must be enabled in order to support this database
1616
enable_extension "pg_stat_statements"
@@ -40,6 +40,7 @@
4040
t.boolean "is_active", default: true, null: false
4141
t.boolean "is_private", default: false, null: false
4242
t.integer "counter", default: 1, null: false
43+
t.string "note", default: "", null: false
4344
end
4445

4546
create_table "event_histories", id: :serial, force: :cascade do |t|

lib/tasks/dojos.rake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ namespace :dojos do
3232
d.name = dojo['name']
3333
d.counter = dojo['counter'] || 1
3434
d.email = ''
35-
d.order = dojo['order'] || search_order_number(dojo['name'])
3635
d.description = dojo['description']
3736
d.logo = dojo['logo']
3837
d.tags = dojo['tags']
38+
d.note = dojo['note'] || '' # For internal comments for developers
3939
d.url = dojo['url']
4040
d.created_at = d.new_record? ? Time.zone.now : dojo['created_at'] || d.created_at
4141
d.updated_at = Time.zone.now
4242
d.prefecture_id = dojo['prefecture_id']
43+
d.order = dojo['order'] || search_order_number(dojo['name'])
4344
d.is_active = dojo['is_active'].nil? ? true : dojo['is_active']
4445
d.is_private = dojo['is_private'].nil? ? false : dojo['is_private']
4546

0 commit comments

Comments
 (0)