Finished: tag

pkg/database/method_tag.go

@@ -15,24 +15,29 @@ func (database *Database) InsertTag(tag *Tag) (*Tag, error) {
 }
 
 func (database *Database) GetTag(id int64) (*Tag, error) {
-	tag := &Tag{}
-	err := database.stmt.getTag.QueryRow(id).Scan(&tag.ID, &tag.Name, &tag.Description)
+	tag := &Tag{CreatedByUser: &User{}}
+	err := database.stmt.getTag.QueryRow(id).Scan(
+		&tag.ID, &tag.Name, &tag.Description,
+		&tag.CreatedByUser.ID, &tag.CreatedByUser.Username, &tag.CreatedByUser.Role, &tag.CreatedByUser.AvatarId)
 	if err != nil {
 		return nil, err
 	}
 	return tag, nil
 }
 
-func (database *Database) GetTags() ([]Tag, error) {
-	tags := []Tag{}
+func (database *Database) GetTags() ([]*Tag, error) {
+	tags := []*Tag{}
 	rows, err := database.stmt.getTags.Query()
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	for rows.Next() {
-		tag := Tag{}
-		err := rows.Scan(&tag.ID, &tag.Name, &tag.Description)
+		tag := &Tag{CreatedByUser: &User{}}
+		err := rows.Scan(
+			&tag.ID, &tag.Name, &tag.Description,
+			&tag.CreatedByUser.ID, &tag.CreatedByUser.Username, &tag.CreatedByUser.Role, &tag.CreatedByUser.AvatarId)
+
 		if err != nil {
 			return nil, err
 		}

pkg/database/sql_stmt.go

@@ -174,9 +174,19 @@ var getAnonymousUserQuery = `SELECT id, username, role, avatar_id FROM users WHE
 
 var insertTagQuery = `INSERT INTO tags (name, description, created_by_user_id) VALUES (?, ?, ?);`
 
-var getTagQuery = `SELECT id, name, description FROM tags WHERE id = ? LIMIT 1;`
+var getTagQuery = `SELECT
+tags.id, tags.name, tags.description,
+users.id, users.username, users.role, users.avatar_id
+FROM tags
+JOIN users ON tags.created_by_user_id = users.id
+WHERE tags.id = ? LIMIT 1;`
 
-var getTagsQuery = `SELECT id, name, description FROM tags;`
+var getTagsQuery = `SELECT
+tags.id, tags.name, tags.description,
+users.id, users.username, users.role, users.avatar_id
+FROM tags
+JOIN users ON tags.created_by_user_id = users.id
+;`
 
 var updateTagQuery = `UPDATE tags SET name = ?, description = ? WHERE id = ?;`
 

pkg/database/struct.go

@@ -33,6 +33,7 @@ type Tag struct {
 	Name            string `json:"name"`
 	Description     string `json:"description"`
 	CreatedByUserId int64  `json:"created_by_user_id"`
+	CreatedByUser   *User   `json:"created_by_user"`
 }
 
 var (