Update services.go, add MSSQL database connection to services.go by ronydahdal · Pull Request #20 · elonsoc/ods

ronydahdal · 2023-04-10T18:46:24Z

No description provided.

jumarmartin · 2023-04-11T14:28:37Z

I'm getting a couple errors in my VSCode, could you check this out?:

	"resource": "/Users/jumar/src/elonsoc/ods/backend/main.go",
	"owner": "_generated_diagnostic_collection_name_#1",
	"code": {
		"value": "WrongArgCount",
		"target": {
			"$mid": 1,
			"external": "https://pkg.go.dev/golang.org/x/tools/internal/typesinternal#WrongArgCount",
			"path": "/golang.org/x/tools/internal/typesinternal",
			"scheme": "https",
			"authority": "pkg.go.dev",
			"fragment": "WrongArgCount"
		}
	},
	"severity": 8,
	"message": "not enough arguments in call to service.NewService\n\thave (string, string, string)\n\twant (string, string, string, string)",
	"source": "compiler",
	"startLineNumber": 128,
	"startColumn": 67,
	"endLineNumber": 128,
	"endColumn": 67
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/main.go",
	"owner": "_generated_diagnostic_collection_name_#1",
	"code": {
		"value": "MissingFieldOrMethod",
		"target": {
			"$mid": 1,
			"path": "/golang.org/x/tools/internal/typesinternal",
			"scheme": "https",
			"authority": "pkg.go.dev",
			"fragment": "MissingFieldOrMethod"
		}
	},
	"severity": 8,
	"message": "Services.Db undefined (type *service.Service has no field or method Db)",
	"source": "compiler",
	"startLineNumber": 258,
	"startColumn": 13,
	"endLineNumber": 258,
	"endColumn": 15
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/service/services.go",
	"owner": "_generated_diagnostic_collection_name_#1",
	"code": {
		"value": "UndeclaredImportedName",
		"target": {
			"$mid": 1,
			"external": "https://pkg.go.dev/golang.org/x/tools/internal/typesinternal#UndeclaredImportedName",
			"path": "/golang.org/x/tools/internal/typesinternal",
			"scheme": "https",
			"authority": "pkg.go.dev",
			"fragment": "UndeclaredImportedName"
		}
	},
	"severity": 8,
	"message": "DB not declared by package mssql",
	"source": "compiler",
	"startLineNumber": 31,
	"startColumn": 16,
	"endLineNumber": 31,
	"endColumn": 18
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/service/services.go",
	"owner": "_generated_diagnostic_collection_name_#1",
	"code": {
		"value": "UndeclaredImportedName",
		"target": {
			"$mid": 1,
			"path": "/golang.org/x/tools/internal/typesinternal",
			"scheme": "https",
			"authority": "pkg.go.dev",
			"fragment": "UndeclaredImportedName"
		}
	},
	"severity": 8,
	"message": "DB not declared by package mssql",
	"source": "compiler",
	"startLineNumber": 80,
	"startColumn": 58,
	"endLineNumber": 80,
	"endColumn": 60
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/service/services.go",
	"owner": "_generated_diagnostic_collection_name_#1",
	"code": {
		"value": "UndeclaredImportedName",
		"target": {
			"$mid": 1,
			"path": "/golang.org/x/tools/internal/typesinternal",
			"scheme": "https",
			"authority": "pkg.go.dev",
			"fragment": "UndeclaredImportedName"
		}
	},
	"severity": 8,
	"message": "Connect not declared by package mssql",
	"source": "compiler",
	"startLineNumber": 83,
	"startColumn": 27,
	"endLineNumber": 83,
	"endColumn": 34
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/go.mod",
	"owner": "_generated_diagnostic_collection_name_#1",
	"severity": 4,
	"message": "github.com/jackc/pgx is not used in this module",
	"source": "go mod tidy",
	"startLineNumber": 24,
	"startColumn": 2,
	"endLineNumber": 24,
	"endColumn": 42
},{
	"resource": "/Users/jumar/src/elonsoc/ods/backend/go.mod",
	"owner": "_generated_diagnostic_collection_name_#1",
	"severity": 4,
	"message": "github.com/pkg/errors is not used in this module",
	"source": "go mod tidy",
	"startLineNumber": 25,
	"startColumn": 2,
	"endLineNumber": 25,
	"endColumn": 30
}]```

jumarmartin

please look at the comment previous to this!

ronydahdal · 2023-04-20T13:47:06Z

Seems like Main.go's paramaters haven't been updated to account for the new mssql connection, will push a commit to update main.go

Backbones of ODS's migration from Elon's MSSQL Database into the ODS PostgreSQL Database

jumarmartin

Great second look! I added some comments that should help steer you in the right direction.

Some logistical notes: try to also update the docker-compse.yaml which should help with testing!

I do have another branch that has the changes included if you'd like me to commit that.

jumarmartin · 2023-04-20T15:12:23Z

backend/locations/v1/buildings/sqlmigration.go

+	// empty _ because Exec returns both a sql result obj & err value
+	// we're evaluating err value, hence the _
+	_, err = pgConn.Exec(`
+    CREATE TABLE elonbuildingspg (


We probably shouldn't concern our code with the creation of tables, just the connection itself and possibly pulling from it?

jumarmartin · 2023-04-20T21:17:29Z

backend/locations/v1/buildings/sqlmigration.go

+
+	for mssqlRows.Next() {
+		// declaration of variables to hold values of each column in row
+		var buildings_id string


Could we make this into a struct? It looks like we reuse this in the future.

you're right, makes most sense to have it as a struct rather than keep redefining it, we can also use this struct in the json encoder file.

jumarmartin · 2023-04-21T22:39:58Z

backend/service/services.go

 	"context"
-
+
+	"github.com/denisenkom/go-mssqldb"


Suggested change

"github.com/denisenkom/go-mssqldb"

mssql "github.com/denisenkom/go-mssqldb"

jumarmartin · 2023-04-21T22:40:18Z

backend/service/services.go

 	Logger *logrus.Logger
-	Db     *pgx.Conn
+	PgDb   *pgx.Conn
+	MsDb   *mssql.DB


Suggested change

MsDb *mssql.DB

PgDb *pgx.Conn

jumarmartin · 2023-04-21T22:58:08Z

backend/service/services.go

@@ -15,7 +15,8 @@ package service

 import (
 	"context"


Suggested change

"context"

"database/sql/driver"

jumarmartin · 2023-04-21T23:02:40Z

backend/service/services.go

+	return connection
+}
+
+func InitMsDB(msdbURL string, log *logrus.Logger) *mssql.DB {


Suggested change

func InitMsDB(msdbURL string, log *logrus.Logger) *mssql.DB {

func InitMsDB(msdbURL string, log *logrus.Logger) *driver.Conn {

jumarmartin · 2023-04-21T23:08:39Z

backend/main.go

 	// get our pertinent information from the environment variables or the command line
 	servicePort := flag.String("port", os.Getenv("PORT"), "port to run server on")
-	databaseURL := flag.String("database_url", os.Getenv("DATABASE_URL"), "database url")
+	postgresURL := flag.String("postgres_url", os.Getenv("POSTGRES_URL"), "postgres url")


Our database, in the future, could be anything! In future PRs we will abstract away from using pgx in initializing the database and instead just require whatever database someone uses to conform an interface.

Suggested change

postgresURL := flag.String("postgres_url", os.Getenv("POSTGRES_URL"), "postgres url")

databaseURL := flag.String("database_url", os.Getenv("DATABASE_URL"), "database url")

jumarmartin · 2023-04-21T23:08:57Z

backend/main.go

+	if *postgresURL == "" {
+		log.Fatal("postgres url not set")


Suggested change

if *postgresURL == "" {

log.Fatal("postgres url not set")

if *databaseURL == "" {

log.Fatal("database url not set")

jumarmartin · 2023-04-21T23:13:32Z

backend/locations/v1/buildings/sqlmigration.go

+
+func migrate() {


Lets add a todo here.

Suggested change

func migrate() {

//TODO(@ronydahdal) finish :)

func migrate() {

jumarmartin · 2023-04-21T23:14:53Z

backend/locations/v1/buildings/sqlmigration.go

I recommend moving this to a folder that might be more suited for a one-off run.

jumarmartin · 2023-04-22T19:34:21Z

It looks like Microsoft has forked the currently used mssql integration: https://github.com/microsoft/go-mssqldb.

Update services.go

5bcf91d

ronydahdal requested a review from jumarmartin April 11, 2023 00:34

jumarmartin reviewed Apr 13, 2023

View reviewed changes

ronydahdal added 5 commits April 20, 2023 09:51

Update main.go

04108d3

Create sqlmigration.go

2463df2

Backbones of ODS's migration from Elon's MSSQL Database into the ODS PostgreSQL Database

Update sqlmigration.go

f9b346e

Update ods.yml

2e33886

Update main.go

a0b11b1

jumarmartin reviewed Apr 21, 2023

View reviewed changes

ronydahdal added 7 commits May 1, 2023 10:56

Update services.go

5307f10

Update main.go

d6bab6e

Update sqlmigration.go

595c47f

Create jsonencoder.go

f00aa52

Update jsonencoder.go

8cfe30c

Update sqlmigration.go

9d0739b

Delete jsonencoder.go

137ce69

	"github.com/denisenkom/go-mssqldb"
	mssql "github.com/denisenkom/go-mssqldb"

	func InitMsDB(msdbURL string, log logrus.Logger) mssql.DB {
	func InitMsDB(msdbURL string, log logrus.Logger) driver.Conn {

	postgresURL := flag.String("postgres_url", os.Getenv("POSTGRES_URL"), "postgres url")
	databaseURL := flag.String("database_url", os.Getenv("DATABASE_URL"), "database url")

Conversation

ronydahdal commented Apr 10, 2023

Uh oh!

jumarmartin commented Apr 11, 2023

Uh oh!

jumarmartin left a comment

Choose a reason for hiding this comment

Uh oh!

ronydahdal commented Apr 20, 2023

Uh oh!

jumarmartin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jumarmartin commented Apr 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants