From 923c9b63e3c46e127642fce1a9948cb48fd45af6 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Fri, 20 Mar 2015 21:19:01 +0700
Subject: [PATCH] Update team model

---
 db/team.go | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/db/team.go b/db/team.go
index 53b7c47..97ffd3e 100644
--- a/db/team.go
+++ b/db/team.go
@@ -5,29 +5,35 @@ import (
 )
 
 type Team struct {
-	ID         uint64 `json:"id"`
-	Slug       string `json:"slug"`
-	Name       string `json:"name"`
-	Permission string `json:"permission"`
-	OrgID      uint64 `json:"org_id" db:"org_id"`
+	ID         uint64    `json:"id"`
+	OrgID      uint64    `json:"org_id" db:"org_id"`
+	Slug       string    `json:"slug"`
+	Name       string    `json:"name"`
+	Permission string    `json:"permission"`
+	CreatedAt  time.Time `json:"created_at" db:"created_at"`
+	UpdatedAt  time.Time `json:"updated_at" db:"updated_at"`
 }
 
-const orgTeamsQuery = `select * from teams where owner = ?`
-const saveTeamQuery = `
-insert into teams (id, slug, name, permission, org_id, created_at, updated_at)
-values (:id, :slug, :name, :permission, :org_id, now(), now())
-on duplicate key update
-slug = values(slug),
-permission = values(permission),
-updated_at=now()`
-
 func (t *Team) Save() {
 	defer measure("SaveTeam", time.Now())
-	mustExecN(saveTeamQuery, t)
+	mustExecN(`
+		insert into teams (id, org_id, slug, name, permission, created_at, updated_at)
+		values (:id, :org_id, :slug, :name, :permission, now(), now())
+		on duplicate key update
+			slug = values(slug),
+			name = values(name),
+			permission = values(permission),
+			updated_at = now()
+	`, t)
 }
 
 func OrgTeams(login string) (teams []*Team) {
 	defer measure("OrgTeams", time.Now())
-	mustSelect(&teams, orgTeamsQuery, login)
+	mustSelect(&teams, `
+		select t.*
+		from teams t
+		join orgs o on o.id = t.org_id
+		where o.login = ?
+	`, login)
 	return
 }