From f8d006fe8bce2b73de49fc26702b7e9d84e3b58a Mon Sep 17 00:00:00 2001 From: Braeden57 Date: Mon, 4 Oct 2021 23:13:21 -0700 Subject: [PATCH] enroll controller + db connection --- .env | 3 +- controllers/authController.go | 42 ++++++++++++++++++++++++++++ database/databaseConnection.go | 46 +++++++++++++++++++++++++++++++ go.mod | 2 ++ go.sum | 32 ++++++++++++++++++--- main.go | 49 +++++++-------------------------- models/contactModel.go | 8 +++++- models/courseModel.go | 8 +++++- models/studentModel.go | 20 +++++++++++++- models/teacherModel.go | 8 +++++- routes/routes.go | 16 +++++++++++ {templates => views}/index.html | 0 12 files changed, 186 insertions(+), 48 deletions(-) create mode 100644 controllers/authController.go create mode 100644 database/databaseConnection.go create mode 100644 routes/routes.go rename {templates => views}/index.html (100%) diff --git a/.env b/.env index c2c60cc..0d2ca54 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ mongoURI="mongodb://localhost:27017" -dbo="school" \ No newline at end of file +dbo="school" +PORT=8080 \ No newline at end of file diff --git a/controllers/authController.go b/controllers/authController.go new file mode 100644 index 0000000..644249c --- /dev/null +++ b/controllers/authController.go @@ -0,0 +1,42 @@ +package controllers + +import ( + "school-management/models" + + "strconv" + + "github.com/gofiber/fiber/v2" +) + +type Test struct { + a string + b int +} + +func (t *Test) getA() string { + return t.a +} + +func Enroll(c *fiber.Ctx) error { + var data map[string]string + + if err := c.BodyParser(&data); err != nil { + return err + } + + // Get age and grade level and convert to int + intAge, _ := strconv.Atoi(data["age"]) + intGradeLevel, _ := strconv.Atoi(data["gradelevel"]) + + student := models.Student{ + FirstName: data["firstname"], + LastName: data["lastname"], + Age: intAge, + GradeLevel: intGradeLevel, + DOB: data["dob"], + } + student.Password = student.HashPassword(data["password"]) + student.Email = student.GenerateSchoolEmail() + + return c.JSON(student) +} diff --git a/database/databaseConnection.go b/database/databaseConnection.go new file mode 100644 index 0000000..cf66225 --- /dev/null +++ b/database/databaseConnection.go @@ -0,0 +1,46 @@ +package database + +import ( + "context" + "fmt" + "log" + "os" + "time" + + "github.com/joho/godotenv" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" +) + +func DBinstance() *mongo.Client { + godotenv.Load(".env") + mongoURI := os.Getenv("mongoURI") + + fmt.Printf("Connecting to mongodb: %v\n", mongoURI) + + client, err := mongo.NewClient(options.Client().ApplyURI(mongoURI)) + if err != nil { + log.Fatal(err) + } + + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + + defer cancel() + + err = client.Connect(ctx) + if err != nil { + log.Fatal(err) + } + fmt.Println("connected to mongodb") + return client +} + +var Client *mongo.Client = DBinstance() + +func OpenCollection(client *mongo.Client, collectionName string) *mongo.Collection { + godotenv.Load(".env") + dbo := os.Getenv("dbo") + var collection *mongo.Collection = client.Database(dbo).Collection(collectionName) + + return collection +} diff --git a/go.mod b/go.mod index e8aca76..d6ebd55 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,8 @@ module school-management go 1.16 require ( + github.com/gofiber/fiber/v2 v2.19.0 github.com/joho/godotenv v1.3.0 go.mongodb.org/mongo-driver v1.7.2 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 ) diff --git a/go.sum b/go.sum index d79b8c9..044ac7e 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E= +github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -28,8 +30,11 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/gofiber/fiber/v2 v2.19.0 h1:wBN88VUHT1RSC2ptwsRUl38DVWYkwnwUQY24s0keZVE= +github.com/gofiber/fiber/v2 v2.19.0/go.mod h1:/LdZHMUXZvTTo7gU4+b1hclqCAdoQphNQ9bi9gutPyI= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -37,8 +42,9 @@ github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= -github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s= +github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -70,6 +76,12 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.29.0 h1:F5GKpytwFk5OhCuRh6H+d4vZAcEeNAwPTdwQnm6IERY= +github.com/valyala/fasthttp v1.29.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w= @@ -83,10 +95,14 @@ go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8N golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -99,9 +115,17 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/main.go b/main.go index 384277f..7a0bbfb 100644 --- a/main.go +++ b/main.go @@ -1,50 +1,21 @@ package main import ( - "context" - "fmt" - "log" - "os" - "school-management/models" - "time" + "school-management/database" - "github.com/joho/godotenv" - "go.mongodb.org/mongo-driver/bson" + "school-management/routes" + + "github.com/gofiber/fiber/v2" "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/mongo/options" ) +var client *mongo.Client = database.DBinstance() +var studentCollection *mongo.Collection = database.OpenCollection(client, "students") + func main() { - godotenv.Load(".env") - mongoURI := os.Getenv("mongoURI") - dbo := os.Getenv("dbo") + app := fiber.New() - // Connect to mongo - client, err := mongo.NewClient(options.Client().ApplyURI(mongoURI)) - if err != nil { - log.Fatal(err) - } + routes.Setup(app) - ctx, _ := context.WithTimeout(context.Background(), 10*time.Second) - err = client.Connect(ctx) - - // Get collection - collection := client.Database(dbo).Collection("students") - // res, insertErr := collection.InsertOne(ctx, student) - // if insertErr != nil { - // log.Fatal(insertErr) - // } - // fmt.Println(res) - - cur, currErr := collection.Find(ctx, bson.D{}) - if currErr != nil { - panic(currErr) - } - defer cur.Close(ctx) - - var students []models.Student - if err = cur.All(ctx, &students); err != nil { - panic(err) - } - fmt.Println(students) + app.Listen(":8000") } diff --git a/models/contactModel.go b/models/contactModel.go index 33636a2..55136fe 100644 --- a/models/contactModel.go +++ b/models/contactModel.go @@ -1,6 +1,10 @@ package models -import "go.mongodb.org/mongo-driver/bson/primitive" +import ( + "time" + + "go.mongodb.org/mongo-driver/bson/primitive" +) type Contact struct { ID primitive.ObjectID `bson:"_id"` @@ -13,4 +17,6 @@ type Contact struct { Email string `json:"email" validate:"required"` Relation string `json:"relation" validate:"required"` PrimaryContact bool `json:"primaraycontact" validate:"required"` + Created_at time.Time `json:"created_at"` + Updated_at time.Time `json:"updated_at"` } diff --git a/models/courseModel.go b/models/courseModel.go index 95aadc8..0b2c795 100644 --- a/models/courseModel.go +++ b/models/courseModel.go @@ -1,6 +1,10 @@ package models -import "go.mongodb.org/mongo-driver/bson/primitive" +import ( + "time" + + "go.mongodb.org/mongo-driver/bson/primitive" +) type Course struct { ID primitive.ObjectID `bson:"_id"` @@ -8,4 +12,6 @@ type Course struct { Description string `json:"description"` Grade_level int `json:"grade_level" validate:"required"` Credits int `json:"credits" validate:"required"` + Created_at time.Time `json:"created_at"` + Updated_at time.Time `json:"updated_at"` } diff --git a/models/studentModel.go b/models/studentModel.go index ffbb30f..dc184ae 100644 --- a/models/studentModel.go +++ b/models/studentModel.go @@ -1,6 +1,11 @@ package models import ( + "strings" + "time" + + "golang.org/x/crypto/bcrypt" + "go.mongodb.org/mongo-driver/bson/primitive" ) @@ -12,7 +17,7 @@ type Student struct { Age int `json:"age" validate:"required"` GradeLevel int `json:"gradelevel" validate:"required"` Email string `json:"email" validate:"required"` - Password string `json:"password" validate:"required,min=8,max=32"` + Password []byte `json:"password" validate:"required,min=8,max=32"` SID string `json:"sid"` // Student ID PED string `json:"ped"` // Personal Education Number Homeroom string `json:"homeroom"` @@ -25,4 +30,17 @@ type Student struct { DOB string `json:"dob" validate:"required"` Photo string `json:"photo"` Contacts []Contact `json:"contacts"` + Created_at time.Time `json:"created_at"` + Updated_at time.Time `json:"updated_at"` +} + +func (s *Student) HashPassword(password string) []byte { + hashPass, _ := bcrypt.GenerateFromPassword([]byte(password), 14) + return hashPass +} + +func (s *Student) GenerateSchoolEmail() string { + var email string = strings.ToLower(string(s.FirstName[0])) + "." + strings.ToLower(s.LastName) + "@surreyschools.ca" + // Add check to see if email already exists + return email } diff --git a/models/teacherModel.go b/models/teacherModel.go index 579b3e3..c82228c 100644 --- a/models/teacherModel.go +++ b/models/teacherModel.go @@ -1,6 +1,10 @@ package models -import "go.mongodb.org/mongo-driver/bson/primitive" +import ( + "time" + + "go.mongodb.org/mongo-driver/bson/primitive" +) type Teacher struct { ID primitive.ObjectID `bson:"_id"` @@ -17,4 +21,6 @@ type Teacher struct { PC string `json:"pc"` // Postal Code DOB string `json:"dob" validate:"required"` Photo string `json:"string"` + Created_at time.Time `json:"created_at"` + Updated_at time.Time `json:"updated_at"` } diff --git a/routes/routes.go b/routes/routes.go new file mode 100644 index 0000000..651d5f2 --- /dev/null +++ b/routes/routes.go @@ -0,0 +1,16 @@ +package routes + +import ( + "school-management/controllers" + + "github.com/gofiber/fiber/v2" +) + +type Person struct { + Name string `json:"name" form:"name"` + Email string `json:"email" form:"email"` +} + +func Setup(app *fiber.App) { + app.Post("/api/enroll", controllers.Enroll) +} diff --git a/templates/index.html b/views/index.html similarity index 100% rename from templates/index.html rename to views/index.html