Added call room endpoint + deploy updates

.gcloudignore

@@ -0,0 +1,16 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+node_modules

cloud.functions.go

@@ -45,3 +45,8 @@ func ScheduleCall(w http.ResponseWriter, r *http.Request) {
 	s.ScheduleCall(w, r)
 }
 
+
+// CallRoom
+func CallRoom(w http.ResponseWriter, r *http.Request) {
+	s.CallRoom(w, r)
+}

cmd/deploy.all.sh

@@ -1,13 +1,3 @@
 #!/bin/bash
-source ./env.cloud.sh
-cd ..
-gcloud functions deploy ScheduleCall \
---runtime go113 \
---allow-unauthenticated \
---trigger-http \
---project $GC_PROJECT \
---set-env-vars PG_PROTO=$PG_PROTO,PG_ADDR=$PG_ADDR,PG_DB=$PG_DB,PG_USER=$PG_USER,PG_PASSWORD=$PG_PASSWORD,GC_PROJECT=$GC_PROJECT,GC_PROJECT_LOCATION=$GC_PROJECT_LOCATION \
---region $GC_PROJECT_LOCATION \
---memory 128MB \
---max-instances 10
-cd cmd
+source ./deploy.call.room.sh
+source ./deploy.schedule.call.sh

cmd/deploy.call.room.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+source ./env.cloud.sh
+cd ..
+gcloud functions deploy CallRoom \
+--runtime go113 \
+--allow-unauthenticated \
+--trigger-http \
+--project $GC_PROJECT \
+--set-env-vars PG_PROTO=$PG_PROTO,PG_ADDR=$PG_ADDR,PG_DB=$PG_DB,PG_USER=$PG_USER,PG_PASSWORD=$PG_PASSWORD,GC_PROJECT=$GC_PROJECT,GC_PROJECT_LOCATION=$GC_PROJECT_LOCATION,CALL_ROOM_ENDPOINT=$CALL_ROOM_ENDPOINT,SCHEDULER_LOCATION=$SCHEDULER_LOCATION,SCHEDULER_TIMEZONE=$SCHEDULER_TIMEZONE,CALL_ENDPOINT=$CALL_ENDPOINT,SCHEDULER_MAX_RETRY_COUNT=$SCHEDULER_MAX_RETRY_COUNT,SCHEDULER_RETRY_PERIOD=$SCHEDULER_RETRY_PERIOD \
+--region $GC_PROJECT_LOCATION \
+--memory 128MB \
+--max-instances 10
+cd cmd

cmd/deploy.schedule.call.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+source ./env.cloud.sh
+cd ..
+gcloud functions deploy ScheduleCall \
+--runtime go113 \
+--allow-unauthenticated \
+--trigger-http \
+--project $GC_PROJECT \
+--set-env-vars PG_PROTO=$PG_PROTO,PG_ADDR=$PG_ADDR,PG_DB=$PG_DB,PG_USER=$PG_USER,PG_PASSWORD=$PG_PASSWORD,GC_PROJECT=$GC_PROJECT,GC_PROJECT_LOCATION=$GC_PROJECT_LOCATION,CALL_ROOM_ENDPOINT=$CALL_ROOM_ENDPOINT,SCHEDULER_LOCATION=$SCHEDULER_LOCATION,SCHEDULER_TIMEZONE=$SCHEDULER_TIMEZONE,CALL_ENDPOINT=$CALL_ENDPOINT,SCHEDULER_MAX_RETRY_COUNT=$SCHEDULER_MAX_RETRY_COUNT,SCHEDULER_RETRY_PERIOD=$SCHEDULER_RETRY_PERIOD \
+--region $GC_PROJECT_LOCATION \
+--memory 128MB \
+--max-instances 10
+cd cmd

cmd/env.cloud.sh

@@ -3,12 +3,12 @@ export GOOGLE_APPLICATION_CREDENTIALS=./serviceaccount.json
 
 # Google Cloud Postgres
 export PG_PROTO=unix
-export PG_ADDR=/cloudsql/wakeup-286404:europe-west1:wakeup/.s.PGSQL.5432
+export PG_ADDR=/cloudsql/wakeup-290812:europe-west1:wakeup-postgres/.s.PGSQL.5432
 export PG_DB=wakeup
 export PG_USER=wakeup
 export PG_PASSWORD=wakeup
 
-export GC_PROJECT=wakeup-286404
+export GC_PROJECT=wakeup-290812
 export GC_PROJECT_LOCATION=europe-west1
 
 export CALL_ROOM_ENDPOINT=https://$GC_PROJECT_LOCATION-$GC_PROJECT.cloudfunctions.net/CallRoom

cmd/env.local.sh

@@ -8,7 +8,7 @@ export PG_DB=wakeup
 export PG_USER=postgres
 export PG_PASSWORD=postgres
 
-export GC_PROJECT=wakeup-286404
+export GC_PROJECT=wakeup-290812
 export GC_PROJECT_LOCATION=europe-west1
 
 export CALL_ROOM_ENDPOINT=https://$GC_PROJECT_LOCATION-$GC_PROJECT.cloudfunctions.net/CallRoom

db/calls.go

@@ -0,0 +1,11 @@
+package db
+
+import (
+	"github.com/evt/video8/model"
+)
+
+// SaveCall saves a call in Postgres
+func (db *PgDB) SaveCall(call *model.Call) error {
+	_, err := db.Model(call).Returning("*").Insert()
+	return err
+}

db/migrations/2_calls.go

@@ -0,0 +1,24 @@
+package migrations
+
+import (
+	"fmt"
+
+	"github.com/go-pg/migrations/v7"
+)
+
+func init() {
+	migrations.MustRegisterTx(func(db migrations.DB) error {
+		fmt.Println("creating table calls...")
+		_, err := db.Exec(`CREATE TABLE calls(
+				call_id serial not null primary key,
+				room_number integer not null,
+				call_status integer not null,
+				created timestamp default current_timestamp
+		)`)
+		return err
+	}, func(db migrations.DB) error {
+		fmt.Println("dropping table calls...")
+		_, err := db.Exec(`DROP TABLE calls`)
+		return err
+	})
+}

db/rooms.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"github.com/evt/video8/model"
+	"github.com/go-pg/pg/v9"
 )
 
 // AddRooms saves a list of rooms in Postgres
@@ -12,3 +13,26 @@ func (db *PgDB) AddRooms(rooms []*model.Room) error {
 	return err
 }
 
+
+// FindRooms returns room list by call time
+func (db *PgDB) FindRooms(callTime string, maxRetryCount int) ([]*model.Room, error) {
+	var rooms []*model.Room
+	err := db.Model(&rooms).
+		Where("call_time = ?", callTime).
+		Where("retry_count < ?", maxRetryCount).
+		Select()
+	if err != nil {
+		if err == pg.ErrNoRows {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return rooms, nil
+}
+
+// IncRoomRetryCount increases call try count by 1
+func (db *PgDB) IncRoomRetryCount(room *model.Room) error {
+	room.RetryCount++
+	_, err := db.Model(room).Set("retry_count = ?retry_count").Where("room_number = ?room_number").Update()
+	return err
+}

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
 	golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
 	google.golang.org/api v0.31.0 // indirect
 	google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d

go.sum

@@ -275,6 +275,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

model/call.go

@@ -0,0 +1,17 @@
+package model
+
+import "time"
+
+// CallRoomRequest is a request coming from google cloud scheduler to call rooms
+type CallRoomRequest struct {
+	callTime string `json:"call_time"`
+}
+
+// Call is a room call that we save in Postgres at the moment room is called to know when it happened and what call status was
+type Call struct {
+	tableName  struct{}  `pg:"calls"`
+	CallID     int       `json:"call_id" pg:"call_id,notnull,pk"`
+	RoomNumber int       `json:"room_number" pg:"room_number,notnull"`
+	CallStatus int       `json:"call_status" pg:"call_status,notnull"`
+	Created    time.Time `json:"created" pg:"created"`
+}