Merge pull request #30 from ecatch-kyst/develop

🔖 release/1.0.0.beta5

Author: balazsorban44

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta5] - 2019-04-08
+### Added
+ - possible to save favorite choices in dropdown
+ 
+### Removed
+ - GS validation [#29](https://github.com/ecatch-kyst/backend/issues/29)
+
 ## [1.0.0-beta4] - 2019-03-25
 ### Added
 - POR message created and being sent to Dualog mock
@@ -35,4 +42,4 @@ All notable changes to this project will be documented in this file.
 - moved backend logic from [balazsorban44/ecatch-it2901](https://github.com/balazsorban44/ecatch-it2901)
 
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecatch-backend",
-  "version": "1.0.0-beta4",
+  "version": "1.0.0-beta5",
   "license": "GPL",
   "private": true,
   "scripts": {

rules/firestore.indexes.json

@@ -1,4 +1,47 @@
 {
-  "indexes": [],
+  "indexes": [
+    {
+      "collectionGroup": "messages",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "TM",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "messages",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "TM",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "timestamp.seconds",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "messages",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "TM",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "departure",
+          "order": "DESCENDING"
+        }
+      ]
+    }
+  ],
   "fieldOverrides": []
 }

rules/firestore.rules

@@ -9,7 +9,27 @@ service cloud.firestore {
       match /fishingSpots/{fishingSpot}{
     		allow read,create,update, delete: if isRightUser(userId)
         allow create, update: if isValidSpot(request.resource.data)
-    }
+      }
+      match /ports/{ports}{
+    		allow read,create,update, delete: if isRightUser(userId)
+        allow create, update: if isValidPort(request.resource.data)
+    	}
+      match /fishingGear/{fishingGear}{
+    		allow read,create,update, delete: if isRightUser(userId)
+        allow create, update: if isFishingTool(request.resource.data)
+    	}
+      match /activity/{activity}{
+    		allow read,create,update, delete: if isRightUser(userId)
+    	}
+      match /species/{species}{
+    		allow read,create,update, delete: if isRightUser(userId)
+    	}
+      match /fishingPermit/{fishingPermit}{
+    		allow read,create,update, delete: if isRightUser(userId)
+    	}
+      match /ZO/{ZO}{
+    		allow read,create,update, delete: if isRightUser(userId)
+    	}
     }
     match /boats/{boatId}{
     	// can only read boat if boat.userId == logged in user
@@ -30,6 +50,14 @@ function isValidSpot(m){
     (m.name != "")
 }
 
+function isValidPort(m){
+	return
+  	isLatLng(m.latitude) &&
+    isLatLng(m.longitude) &&
+    isPort(m.value) &&
+    (m.label != "")
+}
+
 function isValidMessage(m) {
   return 
   	(m.TM == "DEP" && isValidDEP(m)) ||
@@ -212,11 +240,11 @@ function isFishingTool(t){
     "FPO",// Teiner    Traps - pots
     "GEN",// Garn    Gillnets and entangling nets
     "DRB",// Skrape, mekanisert    Harvesting machines (not specified)
-    "LL ",// Liner    Longlines (not specified)
+    "LLS",// Liner    Longlines (not specified)
     "OTB",// Bunntrål, otter    Bottom trawls - otter trawls
     "TBS",// Bunntrål, reker    Bottom trawls - prawns
     "PS1",// Snurpenot/ringnot    Surrounding nets-purse seines
     "SSC",// Snurrevad    Scottish seines - scottish
     "OTM"// Flytetrål    Midwater otter trawl
   ]
-}
+}

src/lib/constants.js

@@ -2,8 +2,8 @@ export const fields = {
   common: ["TM", "RN", "RC", "MA", "DA", "TI"],
   DEP: ["PO", "ZD", "ZT", "OB", "PD", "PT", "LA", "LO", "AC", "DS"],
   // NOTE: what is TS?
-  DCA: [/*"MV",*/ "AD", "NA", "XR", "QI", "AC", /*"TS",*/ "BD","BT", "ZO", "LT", "LG", "GE", "GP", "XT", "XG", "DU", "CA", /*"ME" This is dependent on GE,*/ "GS"],
+  DCA: [/*"MV",*/ "AD", "NA", "XR", "QI", "AC", /*"TS",*/ "BD","BT", "ZO", "LT", "LG", "GE", "GP", "XT", "XG", "DU", "CA", /*"ME", "GS" These are dependent on GE,*/],
   POR: ["AD", "NA", "XR", "PO", "PD", "PT", "OB", "LS", "KG"]
 }
 
-export const VALIDTM = ["DEP", "DCA", "POR"]
+export const VALIDTM = ["DEP", "DCA", "POR"]