From 9137a011587e85f3422630b192d3c455552334d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Sverre=20Lien=20Sell=C3=A6g?=
 <jorgen@guut.org>
Date: Sun, 8 Nov 2020 01:36:23 +0100
Subject: [PATCH] give a better name to merge function

---
 src/logic.js  | 11 +++++++----
 src/scrape.js | 11 ++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/logic.js b/src/logic.js
index 6cd4793..b4734c6 100644
--- a/src/logic.js
+++ b/src/logic.js
@@ -1,4 +1,4 @@
-const { hasPath, pathOr, props } = require('ramda');
+const { hasPath, pathOr, props, uniqBy, eqBy, prop, union } = require('ramda');
 const parseArgs = require('minimist');
 const process = require('process');
 
@@ -139,14 +139,17 @@ const has_upcoming_events = (body) =>
 const has_past_events = (body) =>
   body.includes('past events') && !body.includes('not have any past events');
 
+const merge_events = (a, b) => uniqBy(eqBy(prop('event_id')))(union(a, b));
+
 module.exports = {
-  has_past_events,
   get_body_inner_text,
-  has_upcoming_events,
-  get_upcoming_events_from_page,
   get_past_events_from_page,
+  get_upcoming_events_from_page,
+  has_past_events,
+  has_upcoming_events,
   map_event,
   merge_edges,
+  merge_events,
   parse_args,
   read_previous_events,
 };
diff --git a/src/scrape.js b/src/scrape.js
index f483d65..4e93958 100644
--- a/src/scrape.js
+++ b/src/scrape.js
@@ -1,5 +1,10 @@
-const { pathOr, uniqBy, eqBy, prop, union } = require('ramda');
-const { merge_edges, parse_args, read_previous_events } = require('./logic');
+const { pathOr } = require('ramda');
+const {
+  merge_edges,
+  parse_args,
+  read_previous_events,
+  merge_events,
+} = require('./logic');
 const { open_browser, get_page_events } = require('./browser');
 
 const {
@@ -23,7 +28,7 @@ const {
         get_upcoming_events,
         get_past_events,
       );
-      events = uniqBy(eqBy(prop('event_id')))(union(events, page_events));
+      events = merge_events(events, page_events);
     }
   } catch (e) {
     console.error(e);