From 64ad60a8e2c7b44c0738bd2226fc8479e463b348 Mon Sep 17 00:00:00 2001
From: gidsi <gidsi@chaospott.de>
Date: Sun, 31 Mar 2019 11:52:40 +0200
Subject: [PATCH] chores

---
 backend/database.go    | 28 ++++++++++++++--------------
 backend/eva-backend.go |  4 ++--
 backend/spaceurl.go    |  9 +++++----
 docker-compose.yml     |  7 +++++--
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/backend/database.go b/backend/database.go
index 68c1bad..d23f53f 100644
--- a/backend/database.go
+++ b/backend/database.go
@@ -1,13 +1,13 @@
 package main
 
 import (
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 	"log"
-        "gopkg.in/mgo.v2"
-        "gopkg.in/mgo.v2/bson"
 )
 
 func writeSpaceData(data SpaceData) {
-	if(data.Space != "") {
+	if data.Space != "" {
 		session, err := mgo.Dial(config.MongoDbServer)
 		if err != nil {
 			panic(err)
@@ -17,7 +17,7 @@ func writeSpaceData(data SpaceData) {
 		session.SetMode(mgo.Monotonic, true)
 
 		c := session.DB(config.MongoDbDatabase).C("spacedata")
-		_, err = c.Upsert(bson.M{ "space": data.Space }, data)
+		_, err = c.Upsert(bson.M{"space": data.Space}, data)
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -34,9 +34,9 @@ func writeSpaceurl(spaceUrl SpaceUrl) {
 	session.SetMode(mgo.Monotonic, true)
 
 	c := session.DB(config.MongoDbDatabase).C("spaceurl")
-	count, _ := c.Find(bson.M{ "url": spaceUrl.Url }).Count()
-	if(count == 0) {
-		c.Insert(spaceUrl);
+	count, _ := c.Find(bson.M{"url": spaceUrl.Url}).Count()
+	if count == 0 {
+		c.Insert(spaceUrl)
 	}
 }
 
@@ -50,7 +50,7 @@ func writeCalendar(calendar Calendar) {
 	session.SetMode(mgo.Monotonic, true)
 
 	c := session.DB(config.MongoDbDatabase).C("calendar")
-	c.Upsert(bson.M{ "space": calendar.Space }, calendar)
+	c.Upsert(bson.M{"space": calendar.Space}, calendar)
 }
 
 func updateSpaceurl(spaceUrl SpaceUrl) {
@@ -63,11 +63,11 @@ func updateSpaceurl(spaceUrl SpaceUrl) {
 	session.SetMode(mgo.Monotonic, true)
 
 	c := session.DB(config.MongoDbDatabase).C("spaceurl")
-	c.Update(bson.M{ "url": spaceUrl.Url }, spaceUrl);
+	c.Update(bson.M{"url": spaceUrl.Url}, spaceUrl)
 }
 
 func readSpacedata() []SpaceData {
-        session, err := mgo.Dial(config.MongoDbServer)
+	session, err := mgo.Dial(config.MongoDbServer)
 	if err != nil {
 		panic(err)
 	}
@@ -76,8 +76,8 @@ func readSpacedata() []SpaceData {
 	session.SetMode(mgo.Monotonic, true)
 
 	c := session.DB(config.MongoDbDatabase).C("spacedata")
-        result := []SpaceData{}
-        c.Find(bson.M{}).Iter().All(&result)
+	result := []SpaceData{}
+	c.Find(bson.M{}).Iter().All(&result)
 
 	return result
 }
@@ -98,7 +98,7 @@ func readSpaceurl() []SpaceUrl {
 	return result
 }
 
-func deleteSpaceurl(String id) {
+func deleteSpaceurl(id string) {
 	session, err := mgo.Dial(config.MongoDbServer)
 	if err != nil {
 		panic(err)
@@ -125,4 +125,4 @@ func readCalendar() []Calendar {
 	c.Find(bson.M{}).Iter().All(&result)
 
 	return result
-}
\ No newline at end of file
+}
diff --git a/backend/eva-backend.go b/backend/eva-backend.go
index e4c40ea..d095864 100644
--- a/backend/eva-backend.go
+++ b/backend/eva-backend.go
@@ -80,7 +80,7 @@ func loadSpaceData() {
                 if(spaceUrl.Validated && int64(spaceUrl.LastUpdated + 60) < timestamp) {
                         spaceData := SpaceData{}
                         err := getJson(spaceUrl.Url, &spaceData)
-                        if err != nil
+                        if(err != nil)
                         {
                                 log.Println(spaceUrl.Url)
                                 log.Println(err)
@@ -99,4 +99,4 @@ func refreshData(w http.ResponseWriter, r *http.Request) {
         getCalendars()
 
         w.WriteHeader(204)
-}
\ No newline at end of file
+}
diff --git a/backend/spaceurl.go b/backend/spaceurl.go
index 37e160f..deb725c 100644
--- a/backend/spaceurl.go
+++ b/backend/spaceurl.go
@@ -1,7 +1,8 @@
 package main
 
 type SpaceUrl struct {
-	Url string `json:"url"`
-	Validated bool `json:"validated"`
-	LastUpdated int64 `json:"lastUpdated"`
-}
\ No newline at end of file
+	Id          string `json:"id"`
+	Url         string `json:"url"`
+	Validated   bool   `json:"validated"`
+	LastUpdated int64  `json:"lastUpdated"`
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index a0b788a..ca53cc8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,20 @@
 version: "3"
 services:
     frontend:
-        build: ./frontend
         image: gidsi/spaceapi-ccc-frontend:latest
+        restart: always
         depends_on:
             - backend
     backend:
         build: ./backend
         image: gidsi/spaceapi-ccc-backend:latest
-        env_file: .env
+        restart: always
+        environment:
+            - SHARED_SECRET=${SHARED_SECRET:-secret}
         depends_on:
             - database
     database:
         image: mongo:latest
+        restart: always
         volumes:
             - /opt/eva:/data/db