From d6301ebbf3b4462d2639e2c1e823dd312e8cbcaa Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Fri, 18 May 2018 21:38:17 +0200
Subject: [PATCH] add datamodel ; check if zipcode is participating

---
 data/datamysql/datamysql.go            | 3 +++
 data/datamysql/zipcode.go              | 2 +-
 server/router/usersroute/controller.go | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/datamysql/datamysql.go b/data/datamysql/datamysql.go
index d57838d..9c5d30d 100644
--- a/data/datamysql/datamysql.go
+++ b/data/datamysql/datamysql.go
@@ -122,7 +122,10 @@ func Instance(cfg *config.Config) (contract.DataManager, error) {
 		instance.profile = newProfileRepo(db)
 		instance.organization = newOrganizationRepo(db)
 		instance.zipcodes = newZipcodeRepo(db)
+<<<<<<< HEAD
 		instance.plan = newPlanRepo(db)
+=======
+>>>>>>> add datamodel ; check if zipcode is participating
 	})
 
 	return instance, connErr
diff --git a/data/datamysql/zipcode.go b/data/datamysql/zipcode.go
index 872e2e2..1b34d9f 100644
--- a/data/datamysql/zipcode.go
+++ b/data/datamysql/zipcode.go
@@ -62,4 +62,4 @@ func (c *zipcodeRepo) GetAll() ([]entity.Zipcode, error) {
 
 func (c *zipcodeRepo) GetByParticipatingZipcode(zipcode string) (entity.Zipcode, error) {
 	return c.parseEntity(c.conn.QueryRow(c.getQuery()+"WHERE a.participating = 1 AND a.zipcode = ?", zipcode))
-}
\ No newline at end of file
+}
diff --git a/server/router/usersroute/controller.go b/server/router/usersroute/controller.go
index 28925da..ee97e91 100644
--- a/server/router/usersroute/controller.go
+++ b/server/router/usersroute/controller.go
@@ -340,7 +340,6 @@ func (c *controller) handleGetPortal(ctx echo.Context) error {
 }
 
 func (c *controller) handleMember(ctx echo.Context) error {
-	fmt.Println("\n\nHandle member\n\n")
 	var user viewmodel.User
 	if err := ctx.Bind(&user); err != nil {
 		return routeutils.HandleAPIError(ctx, err)
@@ -502,8 +501,6 @@ func (c *controller) handleMember(ctx echo.Context) error {
 		}
 	}
 
-	//Get ZIP code and check if it is participating
-
 	user, err = c.svc.Users.Create(user, authUser)
 	if err != nil {
 		return routeutils.HandleAPIError(ctx, err)