From b77a27ee406ba486547094fd3bcb32e5a14ecc7e Mon Sep 17 00:00:00 2001 From: nacchan Date: Wed, 30 Jul 2025 09:30:06 +0900 Subject: [PATCH 1/6] =?UTF-8?q?:new:=20Add=20CoderDojo=20=E6=92=AD?= =?UTF-8?q?=E7=A3=A8=E7=A7=91=E5=AD=A6=E5=85=AC=E5=9C=92=E9=83=BD=E5=B8=82?= =?UTF-8?q?=20in=20=E5=85=B5=E5=BA=AB=E7=9C=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/db/dojos.yaml b/db/dojos.yaml index 829030969..176ac9c58 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -3235,6 +3235,20 @@ description: 猪名川町で毎月開催 tags: - Scratch +- id: 342 + order: '284815' + created_at: '2025-07-28' + name: 播磨科学公園都市 + prefecture_id: 28 + logo: "/img/dojos/default.webp" + url: https://codeclub.org/ja/clubs/1700a138-2909-4e4e-9e75-88ebcbbbc55a + description: 上郡町で毎月開催 + tags: + - Python + - Unity + - ラズベリーパイ + - HTML + - CSS - id: 35 order: '292010' created_at: '2014-10-26' From e9045f1700928e96123b48b4ae4690cf3d16f819 Mon Sep 17 00:00:00 2001 From: nacchan Date: Wed, 30 Jul 2025 09:39:11 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E7=B5=B1=E8=A8=88=E3=82=B7=E3=82=B9?= =?UTF-8?q?=E3=83=86=E3=83=A0=E3=81=B8=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojo_event_services.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/dojo_event_services.yaml b/db/dojo_event_services.yaml index df55bee17..069abe1c2 100644 --- a/db/dojo_event_services.yaml +++ b/db/dojo_event_services.yaml @@ -27,6 +27,12 @@ ### 以下、Dojo 情報まとめ ### ### (dojos.yaml の追加順) ### +# 播磨科学公園都市（兵庫県上郡町） +#- dojo_id: 342 +# name: ??? +# group_id: ??? +# url: https://codeclub.org/ja/clubs/1700a138-2909-4e4e-9e75-88ebcbbbc55a + # 赤坂国際（東京都港区）- 独自のイベント管理システム? #- dojo_id: 341 # name: From d3f59788ae01a6947d1b91c507b038418f235440 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Sun, 10 Aug 2025 14:09:04 +0900 Subject: [PATCH 3/6] =?UTF-8?q?Update=20URL=20for=20CoderDojo=20=E6=92=AD?= =?UTF-8?q?=E7=A3=A8=E7=A7=91=E5=AD=A6=E5=85=AC=E5=9C=92=E9=83=BD=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/dojos.yaml b/db/dojos.yaml index 176ac9c58..6cba921c0 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -3241,7 +3241,7 @@ name: 播磨科学公園都市 prefecture_id: 28 logo: "/img/dojos/default.webp" - url: https://codeclub.org/ja/clubs/1700a138-2909-4e4e-9e75-88ebcbbbc55a + url: https://koto-ictclub.net/dojo/ description: 上郡町で毎月開催 tags: - Python From 61f5a8d18c79aa1b11435b7f88463db525a82703 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 13 Aug 2025 20:29:18 +0900 Subject: [PATCH 4/6] =?UTF-8?q?test:=20YAML=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=AE=E9=87=8D=E8=A4=87ID=E6=A4=9C=E5=87=BA=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 並行して複数のPRがDojoを追加する際に、同じIDを使用してしまう 問題を事前に検出するためのテストを追加。 これにより、マージ前にCI/CDで重複IDを自動検出できるようになる。 --- spec/models/dojo_spec.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/spec/models/dojo_spec.rb b/spec/models/dojo_spec.rb index 996cf240e..c0eab7791 100644 --- a/spec/models/dojo_spec.rb +++ b/spec/models/dojo_spec.rb @@ -195,4 +195,15 @@ end end end + + describe 'YAML data integrity' do + it 'has no duplicate IDs' do + yaml_data = Dojo.load_attributes_from_yaml + ids = yaml_data.map { |dojo| dojo['id'] } + duplicate_ids = ids.select { |id| ids.count(id) > 1 }.uniq + + expect(duplicate_ids).to be_empty, + "重複しているID: #{duplicate_ids.join(', ')}" + end + end end From 9508e9fa51c82481b3bd37035112ef4bf3853d2b Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 13 Aug 2025 20:35:12 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=92=AD=E7=A3=A8=E7=A7=91=E5=AD=A6?= =?UTF-8?q?=E5=85=AC=E5=9C=92=E9=83=BD=E5=B8=82=E3=81=AEID=E3=82=92343?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #1738で砧（ID: 342）が先にマージされたため、 播磨科学公園都市のIDを342から343に変更。 並行作業による重複ID問題を解決。 --- db/dojos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/dojos.yaml b/db/dojos.yaml index 6b40b430e..c60a0f7a2 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -3345,7 +3345,7 @@ description: 猪名川町で毎月開催 tags: - Scratch -- id: 342 +- id: 343 order: '284815' created_at: '2025-07-28' name: 播磨科学公園都市 From c28403cca109fe26bb11d250144de0aff2c53eaa Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 13 Aug 2025 20:39:43 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Fix=20missing=20addr=20info:=20=E4=B8=8A?= =?UTF-8?q?=E9=83=A1=E7=94=BA=20->=20=E8=B5=A4=E7=A9=82=E9=83=A1=E4=B8=8A?= =?UTF-8?q?=E9=83=A1=E7=94=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/dojos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/dojos.yaml b/db/dojos.yaml index c60a0f7a2..a2f2ed011 100644 --- a/db/dojos.yaml +++ b/db/dojos.yaml @@ -3352,7 +3352,7 @@ prefecture_id: 28 logo: "/img/dojos/default.webp" url: https://koto-ictclub.net/dojo/ - description: 上郡町で毎月開催 + description: 赤穂郡上郡町で毎月開催 tags: - Python - Unity