Merge pull request #55 from Coderockr/feature/38

Issue #38 - Get Organization Endpoint

.gitignore

@@ -14,5 +14,8 @@ bin/*
 
 # ignored until version 1.0
 vendor
+vendor.orig
 
 coverage.txt
+server-cmd
+.data/

Makefile

@@ -3,23 +3,36 @@ all: build
 
 # set default as dev if not set
 export VITRINESOCIAL_ENV ?= dev
-export DATABASE_HOST ?= 127.0.0.1
+export DATABASE_HOST ?= 0.0.0.0
+export m ?= default
 
 .PHONY: build
 
-install-db:
-	docker-compose up -d postgres
-	docker-compose exec postgres psql -h $$DATABASE_HOST -U postgres -c "create database vitrine"
-	docker-compose exec postgres psql -h $$DATABASE_HOST -U postgres vitrine -f /vitrine/devops/database.sql
-
-install:
+install: ## install project dependences
 	go get github.com/rubenv/sql-migrate/...
 	go get -u github.com/golang/dep/cmd/dep
 	cd server; dep ensure
 
-migrations:
+new-migration: ## create a new migration, use make new-migration m=message to set the message
+	sql-migrate new -config=./devops/dbconfig.yml -env=production "$(m)"
+
+migrations: ## run pending migrations
+	docker-compose up -d
 	go get github.com/rubenv/sql-migrate/...
 	sql-migrate up -config=devops/dbconfig.yml -env=production
 
-serve:
+serve: ## start server
+	docker-compose up -d
 	cd server && go run main.go
+
+serve-watch: ## start server with hot reload
+	docker-compose up -d
+	go get github.com/codegangsta/gin
+	gin --port 8081 --appPort 8000 --path ${PWD}/server --bin server-cmd run server/main.go
+
+postgres-cmd: ## open the postgresql command line
+	docker-compose exec postgres psql -h $$DATABASE_HOST -U postgres vitrine
+
+# Absolutely awesome: http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
+help: ## show this help
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

devops/database.sql → devops/migrations/20170826155747-create-database.sql

@@ -1,3 +1,5 @@
+
+-- +migrate Up
 CREATE TABLE categories (
     id      SERIAL PRIMARY KEY,
     name    VARCHAR(255) NOT NULL UNIQUE,
@@ -42,3 +44,4 @@ CREATE TABLE needs_images (
     name            VARCHAR(255) NOT NULL,
     url             VARCHAR(255) NOT NULL
 );
+-- +migrate Down

devops/migrations/20170829204833-fix-field-name.sql

@@ -0,0 +1,4 @@
+-- +migrate Up
+ALTER TABLE needs RENAME categoty_id TO category_id;
+-- +migrate Down
+ALTER TABLE needs RENAME category_id TO categoty_id;

devops/migrations/20170829213041-fixture-images.sql

@@ -0,0 +1,6 @@
+-- +migrate Up
+insert into needs_images (need_id, name, url) values(1, 'campanha alimentos', 'http://pibjc.org/novosite/wp-content/uploads/2016/11/campanha-alimentos.jpg');
+insert into needs_images (need_id, name, url) values(1, 'outra campanha alimentos', 'http://pibjc.org/novosite/wp-content/uploads/2016/11/campanha-alimentos.jpg');
+insert into organizations_images (organization_id, name, url) values(1, 'banner', 'http://info.geekie.com.br/wp-content/uploads/2015/04/Unesco.jpg');
+insert into organizations_images (organization_id, name, url) values(1, 'SDG', 'http://en.unesco.org/sites/default/files/sdgs_poster_new1.png');
+-- +migrate Down

devops/migrations/20170830192848-fix-sequences.sql

@@ -0,0 +1,6 @@
+
+-- +migrate Up
+select setval('organizations_id_seq', 2);
+select setval('needs_id_seq', 3);
+select setval('categories_id_seq', 9);
+-- +migrate Down

devops/migrations/20170830194507-fixture-other-category.sql

@@ -0,0 +1,5 @@
+
+-- +migrate Up
+insert into needs (category_id, organization_id, title, description, required_qtd, reached_qtd, due_date, status, unity) 
+    values (5, 1, 'Voluntário', 'Ajudar a levar comida as áreas de risco', 100, 0, '2018-01-01', 'ACTIVE', 'semanas');
+-- +migrate Down

docker-compose.yml

@@ -6,5 +6,8 @@ services:
     network_mode: "bridge"
     volumes:
       - ./:/vitrine
+      - ./.data/postgres:/var/lib/postgresql
     ports:
       - "5432:5432"
+    environment:
+      - POSTGRES_DB=vitrine

server/Gopkg.toml

@@ -44,3 +44,7 @@
 [[constraint]]
   branch = "master"
   name = "github.com/lib/pq"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/golang/sync"

server/auth/store.go

@@ -1,13 +1,5 @@
 package auth
 
-import "errors"
-
-var (
-	ErrEmailDuplication = errors.New("The email is already in the store")
-	ErrUserNotFound     = errors.New("User not found")
-	ErrWrongPassword    = errors.New("email or password is incorrent")
-)
-
 type UserRepository interface {
 	Login(email, pass string) (int64, error)
 }

server/config/dev.env

@@ -5,4 +5,4 @@ DATABASE_HOST=127.0.0.1
 DATABASE_PORT=5432
 STORAGE=local
 STORAGE_PATH=/tmp
-API_PORT=8080
+API_PORT=8000

server/db/repo/category.go

@@ -0,0 +1,38 @@
+package repo
+
+import (
+	"github.com/golang/sync/syncmap"
+
+	"github.com/Coderockr/vitrine-social/server/model"
+	"github.com/jmoiron/sqlx"
+)
+
+// CategoryRepository to access database
+type CategoryRepository struct {
+	db *sqlx.DB
+}
+
+var categoryCache = syncmap.Map{}
+
+// NewCategoryRepository create a new repository
+func NewCategoryRepository(db *sqlx.DB) *CategoryRepository {
+	return &CategoryRepository{
+		db: db,
+	}
+}
+
+// Get a category from database using its id
+func (r *CategoryRepository) Get(id int64) (model.Category, error) {
+	if c, ok := categoryCache.Load(id); ok {
+		return c.(model.Category), nil
+	}
+
+	c := model.Category{}
+	err := r.db.Get(&c, "SELECT * FROM categories WHERE id = $1", id)
+	if err != nil {
+		return model.Category{}, err
+	}
+
+	categoryCache.Store(id, c)
+	return c, nil
+}

server/db/repo/need.go

@@ -0,0 +1,43 @@
+package repo
+
+import (
+	"github.com/Coderockr/vitrine-social/server/model"
+	"github.com/jmoiron/sqlx"
+)
+
+// NeedRepository is a implementation for Postgres
+type NeedRepository struct {
+	db      *sqlx.DB
+	catRepo *CategoryRepository
+}
+
+// NewNeedRepository creates a new repository
+func NewNeedRepository(db *sqlx.DB) *NeedRepository {
+	return &NeedRepository{
+		db:      db,
+		catRepo: NewCategoryRepository(db),
+	}
+}
+
+// Get one Need from database
+func (r *NeedRepository) Get(id int64) (*model.Need, error) {
+	var n *model.Need
+	err := r.db.Get(n, "SELECT * FROM needs WHERE id = $1", id)
+	if err != nil {
+		return nil, err
+	}
+
+	n.Category, err = r.catRepo.Get(n.CategoryID)
+	return n, nil
+}
+
+// GetNeedImages without the need data
+func (r *NeedRepository) getNeedImages(n *model.Need) ([]model.NeedImage, error) {
+	images := []model.NeedImage{}
+	err := r.db.Select(&images, "SELECT * FROM needs_images WHERE need_id = $1", n.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return images, nil
+}

server/db/repo/organization.go

@@ -0,0 +1,58 @@
+package repo
+
+import (
+	"fmt"
+
+	"github.com/Coderockr/vitrine-social/server/model"
+	"github.com/jmoiron/sqlx"
+)
+
+// OrganizationRepository is a implementation for Postgres
+type OrganizationRepository struct {
+	db       *sqlx.DB
+	catRepo  *CategoryRepository
+	needRepo *NeedRepository
+}
+
+// NewOrganizationRepository creates a new repository
+func NewOrganizationRepository(db *sqlx.DB) *OrganizationRepository {
+	return &OrganizationRepository{
+		db:       db,
+		catRepo:  NewCategoryRepository(db),
+		needRepo: NewNeedRepository(db),
+	}
+}
+
+// Get one Organization from database
+func (r *OrganizationRepository) Get(id int64) (*model.Organization, error) {
+	o := &model.Organization{}
+	err := r.db.Get(o, "SELECT * FROM organizations WHERE id = $1", id)
+	if err != nil {
+		return nil, err
+	}
+
+	err = r.db.Select(&o.Images, "SELECT * FROM organizations_images WHERE organization_id = $1", id)
+	if err != nil {
+		return nil, err
+	}
+
+	err = r.db.Select(&o.Needs, "SELECT * FROM needs WHERE organization_id = $1", id)
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range o.Needs {
+		o.Needs[i].Category, err = r.catRepo.Get(o.Needs[i].CategoryID)
+		if err != nil {
+			fmt.Println("test?")
+			return nil, err
+		}
+
+		o.Needs[i].Images, err = r.needRepo.getNeedImages(&o.Needs[i])
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return o, nil
+}

server/handlers/error.go

@@ -0,0 +1,21 @@
+package handlers
+
+import (
+	"encoding/json"
+	"net/http"
+)
+
+// ErrorMessage is a JSON formatter
+type ErrorMessage struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+// HandleHttpError formats and returns errors
+func HandleHttpError(w http.ResponseWriter, errno int, err error) {
+	w.WriteHeader(errno)
+	json.NewEncoder(w).Encode(&ErrorMessage{
+		Code:    errno,
+		Message: err.Error(),
+	})
+}