From f01da561472693ff8b731b3e8950b8851c6df9ae Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Fri, 20 Mar 2015 18:43:58 +0700
Subject: [PATCH] Update repo model

---
 db/repo.go   | 35 ++++++++++++++++++++---------------
 task/sync.go | 11 +++++++++--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/db/repo.go b/db/repo.go
index 185dad2..1d30872 100644
--- a/db/repo.go
+++ b/db/repo.go
@@ -5,28 +5,33 @@ import (
 )
 
 type Repo struct {
-	ID        uint64    `json:"id"`
-	Owner     string    `json:"owner"`
-	Name      string    `json:"name"`
-	UpdatedAt time.Time `json:"updated_at"`
-	IsPrivate bool      `json:"is_private"`
-	IsForm    bool      `json:"is_fork"`
+	ID          uint64    `json:"id"`
+	OrgID       uint64    `json:"org_id"`
+	Name        string    `json:"name"`
+	Description string    `json:"description"`
+	IsPrivate   bool      `json:"is_private"`
+	IsFork      bool      `json:"is_fork"`
+	CreatedAt   time.Time `json:"created_at"`
+	UpdatedAt   time.Time `json:"updated_at"`
 }
 
-const orgReposQuery = `select * from repos where owner = ?`
-const saveRepoQuery = `
-insert into repos (owner, name, updated_at)
-values (:owner, :name, now())
-on duplicate key update
-updated_at=now()`
-
 func (r *Repo) Save() {
 	defer measure("SaveRepo", time.Now())
-	mustExecN(saveRepoQuery, r)
+	mustExecN(`
+		insert into repos (owner, name, updated_at)
+		values (:owner, :name, now())
+		on duplicate key update
+		updated_at=now()
+	`, r)
 }
 
 func OrgRepos(login string) (repos []*Repo) {
 	defer measure("OrgRepos", time.Now())
-	mustSelect(&repos, orgReposQuery, login)
+	mustSelect(&repos, `
+		select *
+		from repos r
+		left join orgs o on r.org_id = o.id
+		where o.login = ?
+	`, login)
 	return
 }
diff --git a/task/sync.go b/task/sync.go
index b33eea1..40824e7 100644
--- a/task/sync.go
+++ b/task/sync.go
@@ -20,9 +20,16 @@ func SyncRepos(token, owner string) {
 			panic(err)
 		}
 		for _, repo := range repos {
+			var descr string
+			if repo.Description != nil {
+				descr = *repo.Description
+			}
 			r := &db.Repo{
-				Owner: owner,
-				Name:  *repo.Name,
+				OrgID:       uint64(*repo.Organization.ID),
+				Name:        *repo.Name,
+				Description: descr,
+				IsPrivate:   *repo.Private,
+				IsFork:      *repo.Fork,
 			}
 			r.Save()
 		}