Skip to content

Commit 6de6fb1

Browse files
added script for deploying an rc (release candidate).
Updated README's
1 parent 5cdff00 commit 6de6fb1

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ explaining what it fixes/improves so it can be reviewed.
1010

1111
---
1212

13+
# CODING STYLE
14+
Please respect the [.editorconf](./editorconf) rules.
15+
16+
---
17+
1318
# Links
1419

1520
## [Team](https://anyplace.cs.ucy.ac.cy/#about)

server/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ Docker is not supported for 4.2+.
1818

1919
# 2. [Deploy Server](./deploy/README.md)
2020

21-
# 3. [Setup IDE (IntelliJ)](./SETUP.md)
21+
# 3. [Setup IDE (IntelliJ)](./SETUP_IDE.md)
2222

23-
# 4. Connect Android client
23+
# 4. [Compile Web apps](./public/README.md)
2424

25+
# 5. Connect Android app
2526
<details>
2627
<summary>
2728
Android Client Details
2829
</summary>
2930

30-
##### Connecting the Anyplace Android Client
31+
###### Connecting the Anyplace Android Client
3132
4.1. Download the Android Client from the Play Store: [com.dmsl.anyplace (old)](https://play.google.com/store/apps/details?id=com.dmsl.anyplace&hl=en)
3233

3334
4.2. Under settings in the Android App, change the DNS of the Anyplace server to your own server IP/DNS.

server/database/MONGO.GUIDE.md

+20-10
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ Scala queries
1515

1616

1717

18-
### MongoDB Compass
18+
### MongoDB Compass Queries
1919

2020
<details>
2121
<summary>
22-
MongoDB Compass Queries
22+
Compass Queries
2323
</summary>
2424

2525
[MongoDB Compass](https://www.mongodb.com/products/compass) is the primary interface of mongoDB where users can interact with their data.
2626

27+
#### Filters
2728
<details>
2829
<summary>
2930
Documents: filters
@@ -33,41 +34,50 @@ Documents: filters
3334

3435
Provide the filters on the first section in order to use them. Make sure you are in the correct collection.
3536

36-
Sort a collection based on insertion time:
37+
##### Sort a collection based on insertion time:
3738
```bash
3839
filter:
3940
{ _id: -1}
4041
```
41-
42-
Find objects with-in a bounding box:
42+
43+
##### Regex: [link](https://docs.mongodb.com/manual/reference/operator/query/regex/)
44+
```bash
45+
{ 'name': /George/ }
46+
```
47+
48+
##### Find objects within a bounding box:
4349
```bash
4450
{geometry: { $geoWithin: { $box: [ [ 33.0, 33.0 ], [ 35.0, 35.0 ] ] } }}
4551
```
4652
47-
Find fingerprints with-in a time-span:
53+
##### Find fingerprints within a time-span:
4854
```
4955
{ timestamp : { $gt : "0000000000000", $lt : "1532759230143"}}
5056
```
5157
52-
Find objects with-in a bounding box on a time-span:
58+
##### Find objects within a bounding box on a time-span:
5359
```
5460
{geometry: { $geoWithin: { $box: [ [ 33.0, 33.0 ], [ 35.0, 35.0 ] ] } }, timestamp : { $gt : "0000000000000", $lt : "1617117985695"}, buid: "building_8d9753f0-9dae-4772-81a6-942940ade718_1616948897991"}
5561
```
5662
57-
Find objects where floor are not -1, 0, 1, 2.
63+
##### Find objects where floor are not -1, 0, 1, 2.
5864
(Used in fingerprints collection)
5965
```
6066
{$and:[ {buid: "username_1373876832005"}, {floor: {$ne: "1"}}, {floor: {$ne: "2"}}, {floor: {$ne: "0"}},{floor: {$ne: "-1"}} ]}
6167
```
6268
6369
</details>
6470
71+
#### Validation
6572
<details>
6673
<summary>
67-
Validation
74+
Documents: Validation
6875
</summary>
6976
70-
Prevent collection fingerprints to add JSON objects without the field geometry.
77+
##### Prevent object addition to `fingerprints` collection
78+
The object must have geometry with valid coordinates:
79+
- ranges: -90 to 90, and -180 to 180
80+
7181
```
7282
{
7383
$jsonSchema: {

server/deploy/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ sync.*.sh
22
push_code.*.sh
33
watchdog.*.sh
44

5-
config.sh
5+
config*.sh
6+
!config.example.sh

server/deploy/push_private.conf.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
__dir="$(dirname "$0")"
33
source $__dir/config.sh
44

5-
remoteConf=$__dir"/../conf/app.private.remote.conf"
5+
6+
if [[ $DOMAIN == "ap-dev.cs"* ]]; then
7+
remoteConf=$__dir"/../conf/app.private.remote-dev.conf"
8+
else
9+
remoteConf=$__dir"/../conf/app.private.remote-rc.conf"
10+
echo "Pushing release-candidate conf."
11+
fi
612

713
if [ ! -f $remoteConf ]; then
814
echo "ERROR: Create the remote configuration file first:"

0 commit comments

Comments
 (0)