From 6a386ed4650049d4f962c6d81761115483db8ef3 Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Wed, 23 Feb 2022 09:51:01 +0100
Subject: [PATCH] Final resolve of duplication

that is why PR reviews are nice
---
 app/src/api/config/dataFields.ts                       |  6 +-----
 .../frontend/building/data-containers/community.tsx    |  8 ++++----
 app/src/frontend/config/data-fields-config.ts          | 10 ++--------
 migrations/026.community_use.down.sql                  |  3 ---
 migrations/026.community_use.up.sql                    |  3 ---
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index f213e11d..e51cf8bf 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -280,15 +280,11 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         derivedEdit: true,
         verify: false
     },
-    community_activities: {
-        edit: true,
-        verify: false
-    },
     community_activities_current: {
         edit: true,
         verify: false
     },
-    community_activities_past: {
+    community_activities: {
         edit: true,
         verify: false
     },
diff --git a/app/src/frontend/building/data-containers/community.tsx b/app/src/frontend/building/data-containers/community.tsx
index c14a670d..6669476c 100644
--- a/app/src/frontend/building/data-containers/community.tsx
+++ b/app/src/frontend/building/data-containers/community.tsx
@@ -92,10 +92,10 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
             mode={props.mode}
         />
         <LogicalDataEntry
-            slug='community_activities_past'
-            title={dataFields.community_activities_past.title}
-            tooltip={dataFields.community_activities_past.tooltip}
-            value={props.building.community_activities_past}
+            slug='community_activities'
+            title={dataFields.community_activities.title}
+            tooltip={dataFields.community_activities.tooltip}
+            value={props.building.community_activities}
 
             onChange={props.onChange}
             mode={props.mode}
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 35aaf1a0..fcde1459 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -515,21 +515,15 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: 100,
     },
 
-    community_activities: {
-        category: Category.Community,
-        title: "Has this ever been used for community activities in the past?",
-        tooltip: "E.g. youth club, place of worship, GP surgery, pub",
-        example: true
-    },
     community_activities_current: {
         category: Category.Community,
         title: "Are activities open to the community currently taking place in the building?",
         tooltip: "E.g. youth club, place of worship, GP surgery, pub",
         example: true
     },
-    community_activities_past: {
+    community_activities: {
         category: Category.Community,
-        title: "Has the building been used in the past for community activities?",
+        title: "Has this ever been used for community activities in the past?",
         tooltip: "E.g. youth club, place of worship, GP surgery, pub",
         example: true
     },
diff --git a/migrations/026.community_use.down.sql b/migrations/026.community_use.down.sql
index 79497c3f..95b6845a 100644
--- a/migrations/026.community_use.down.sql
+++ b/migrations/026.community_use.down.sql
@@ -1,8 +1,5 @@
 ALTER TABLE buildings
 DROP COLUMN IF EXISTS community_activities_current;
 
-ALTER TABLE buildings
-DROP COLUMN IF EXISTS community_activities_past;
-
 ALTER TABLE buildings
 DROP COLUMN IF EXISTS community_activities_always;
diff --git a/migrations/026.community_use.up.sql b/migrations/026.community_use.up.sql
index 1243eefa..4f67212a 100644
--- a/migrations/026.community_use.up.sql
+++ b/migrations/026.community_use.up.sql
@@ -1,8 +1,5 @@
 ALTER TABLE buildings
 ADD COLUMN community_activities_current BOOLEAN NULL;
 
-ALTER TABLE buildings
-ADD COLUMN community_activities_past BOOLEAN NULL;
-
 ALTER TABLE buildings
 ADD COLUMN community_activities_always BOOLEAN NULL;