Skip to content
This repository was archived by the owner on Oct 17, 2020. It is now read-only.

Commit e506d99

Browse files
arberiiicoderworld10
arberiii
and
coderworld10
authored
Rename tables in backend (#802)
* rename tables in backend * table names Co-authored-by: Harry Liu <[email protected]>
1 parent 97ecd08 commit e506d99

File tree

6 files changed

+74
-74
lines changed

6 files changed

+74
-74
lines changed

‎backend/app/adapter/sqldb/short_link.go

+34-34
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@ import (
1212

1313
var _ repository.URL = (*URLSql)(nil)
1414

15-
// URLSql accesses URL information in url table through SQL.
15+
// URLSql accesses ShortLink information in short_link table through SQL.
1616
type URLSql struct {
1717
db *sql.DB
1818
}
1919

20-
// IsAliasExist checks whether a given alias exist in url table.
20+
// IsAliasExist checks whether a given alias exist in short_link table.
2121
func (u URLSql) IsAliasExist(alias string) (bool, error) {
2222
query := fmt.Sprintf(`
2323
SELECT "%s"
2424
FROM "%s"
2525
WHERE "%s"=$1;`,
26-
table.URL.ColumnAlias,
27-
table.URL.TableName,
28-
table.URL.ColumnAlias,
26+
table.ShortLink.ColumnAlias,
27+
table.ShortLink.TableName,
28+
table.ShortLink.ColumnAlias,
2929
)
3030

3131
err := u.db.QueryRow(query, alias).Scan(&alias)
@@ -38,18 +38,18 @@ WHERE "%s"=$1;`,
3838
return true, nil
3939
}
4040

41-
// Create inserts a new URL into url table.
41+
// Create inserts a new ShortLink into short_link table.
4242
// TODO(issue#698): change to CreateURL
4343
func (u *URLSql) Create(url entity.URL) error {
4444
statement := fmt.Sprintf(`
4545
INSERT INTO "%s" ("%s","%s","%s","%s","%s")
4646
VALUES ($1, $2, $3, $4, $5);`,
47-
table.URL.TableName,
48-
table.URL.ColumnAlias,
49-
table.URL.ColumnOriginalURL,
50-
table.URL.ColumnExpireAt,
51-
table.URL.ColumnCreatedAt,
52-
table.URL.ColumnUpdatedAt,
47+
table.ShortLink.TableName,
48+
table.ShortLink.ColumnAlias,
49+
table.ShortLink.ColumnLongLink,
50+
table.ShortLink.ColumnExpireAt,
51+
table.ShortLink.ColumnCreatedAt,
52+
table.ShortLink.ColumnUpdatedAt,
5353
)
5454
_, err := u.db.Exec(
5555
statement,
@@ -62,17 +62,17 @@ VALUES ($1, $2, $3, $4, $5);`,
6262
return err
6363
}
6464

65-
// UpdateURL updates a URL that exists within the url table.
65+
// UpdateURL updates a ShortLink that exists within the short_link table.
6666
func (u *URLSql) UpdateURL(oldAlias string, newURL entity.URL) (entity.URL, error) {
6767
statement := fmt.Sprintf(`
6868
UPDATE "%s"
6969
SET "%s"=$1, "%s"=$2, "%s"=$3, "%s"=$4
7070
WHERE "%s"=$5;`,
71-
table.URL.TableName,
72-
table.URL.ColumnAlias,
73-
table.URL.ColumnOriginalURL,
74-
table.URL.ColumnExpireAt,
75-
table.URL.ColumnUpdatedAt,
71+
table.ShortLink.TableName,
72+
table.ShortLink.ColumnAlias,
73+
table.ShortLink.ColumnLongLink,
74+
table.ShortLink.ColumnExpireAt,
75+
table.ShortLink.ColumnUpdatedAt,
7676
oldAlias,
7777
)
7878

@@ -92,19 +92,19 @@ WHERE "%s"=$5;`,
9292
return newURL, nil
9393
}
9494

95-
// GetByAlias finds an URL in url table given alias.
95+
// GetByAlias finds an ShortLink in short_link table given alias.
9696
func (u URLSql) GetByAlias(alias string) (entity.URL, error) {
9797
statement := fmt.Sprintf(`
9898
SELECT "%s","%s","%s","%s","%s"
9999
FROM "%s"
100100
WHERE "%s"=$1;`,
101-
table.URL.ColumnAlias,
102-
table.URL.ColumnOriginalURL,
103-
table.URL.ColumnExpireAt,
104-
table.URL.ColumnCreatedAt,
105-
table.URL.ColumnUpdatedAt,
106-
table.URL.TableName,
107-
table.URL.ColumnAlias,
101+
table.ShortLink.ColumnAlias,
102+
table.ShortLink.ColumnLongLink,
103+
table.ShortLink.ColumnExpireAt,
104+
table.ShortLink.ColumnCreatedAt,
105+
table.ShortLink.ColumnUpdatedAt,
106+
table.ShortLink.TableName,
107+
table.ShortLink.ColumnAlias,
108108
)
109109

110110
row := u.db.QueryRow(statement, alias)
@@ -128,7 +128,7 @@ WHERE "%s"=$1;`,
128128
return url, nil
129129
}
130130

131-
// GetByAliases finds URLs for a list of aliases
131+
// GetByAliases finds ShortLinks for a list of aliases
132132
func (u URLSql) GetByAliases(aliases []string) ([]entity.URL, error) {
133133
if len(aliases) == 0 {
134134
return []entity.URL{}, nil
@@ -149,13 +149,13 @@ func (u URLSql) GetByAliases(aliases []string) ([]entity.URL, error) {
149149
SELECT "%s","%s","%s","%s","%s"
150150
FROM "%s"
151151
WHERE "%s" IN (%s);`,
152-
table.URL.ColumnAlias,
153-
table.URL.ColumnOriginalURL,
154-
table.URL.ColumnExpireAt,
155-
table.URL.ColumnCreatedAt,
156-
table.URL.ColumnUpdatedAt,
157-
table.URL.TableName,
158-
table.URL.ColumnAlias,
152+
table.ShortLink.ColumnAlias,
153+
table.ShortLink.ColumnLongLink,
154+
table.ShortLink.ColumnExpireAt,
155+
table.ShortLink.ColumnCreatedAt,
156+
table.ShortLink.ColumnUpdatedAt,
157+
table.ShortLink.TableName,
158+
table.ShortLink.ColumnAlias,
159159
parameterStr,
160160
)
161161

‎backend/app/adapter/sqldb/short_link_integration_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
var insertURLRowSQL = fmt.Sprintf(`
1919
INSERT INTO %s (%s, %s, %s, %s, %s)
2020
VALUES ($1, $2, $3, $4, $5)`,
21-
table.URL.TableName,
22-
table.URL.ColumnAlias,
23-
table.URL.ColumnOriginalURL,
24-
table.URL.ColumnCreatedAt,
25-
table.URL.ColumnExpireAt,
26-
table.URL.ColumnUpdatedAt,
21+
table.ShortLink.TableName,
22+
table.ShortLink.ColumnAlias,
23+
table.ShortLink.ColumnLongLink,
24+
table.ShortLink.ColumnCreatedAt,
25+
table.ShortLink.ColumnExpireAt,
26+
table.ShortLink.ColumnUpdatedAt,
2727
)
2828

2929
type urlTableRow struct {

‎backend/app/adapter/sqldb/table/short_link.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package table
22

3-
// URL represents database table columns for 'url' table
4-
var URL = struct {
5-
TableName string
6-
ColumnAlias string
7-
ColumnOriginalURL string
8-
ColumnCreatedAt string
9-
ColumnExpireAt string
10-
ColumnUpdatedAt string
3+
// ShortLink represents database table columns for 'short_link' table
4+
var ShortLink = struct {
5+
TableName string
6+
ColumnAlias string
7+
ColumnLongLink string
8+
ColumnCreatedAt string
9+
ColumnExpireAt string
10+
ColumnUpdatedAt string
1111
}{
12-
TableName: "short_link",
13-
ColumnAlias: "alias",
14-
ColumnOriginalURL: "long_link",
15-
ColumnCreatedAt: "created_at",
16-
ColumnExpireAt: "expire_at",
17-
ColumnUpdatedAt: "updated_at",
12+
TableName: "short_link",
13+
ColumnAlias: "alias",
14+
ColumnLongLink: "long_link",
15+
ColumnCreatedAt: "created_at",
16+
ColumnExpireAt: "expire_at",
17+
ColumnUpdatedAt: "updated_at",
1818
}

‎backend/app/adapter/sqldb/table/user_short_link.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package table
22

3-
// UserURLRelation represents database table columns for 'user_url_relation' table
4-
var UserURLRelation = struct {
5-
TableName string
6-
ColumnUserID string
7-
ColumnURLAlias string
3+
// UserShortLink represents database table columns for 'user_short_link' table
4+
var UserShortLink = struct {
5+
TableName string
6+
ColumnUserID string
7+
ColumnShortLinkAlias string
88
}{
9-
TableName: "user_short_link",
10-
ColumnUserID: "user_id",
11-
ColumnURLAlias: "short_link_alias",
9+
TableName: "user_short_link",
10+
ColumnUserID: "user_id",
11+
ColumnShortLinkAlias: "short_link_alias",
1212
}

‎backend/app/adapter/sqldb/user_short_link.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ import (
1111

1212
var _ repository.UserURLRelation = (*UserURLRelationSQL)(nil)
1313

14-
// UserURLRelationSQL accesses UserURLRelation information in user_url_relation
14+
// UserURLRelationSQL accesses UserShortLink information in user_short_link
1515
// table.
1616
type UserURLRelationSQL struct {
1717
db *sql.DB
1818
}
1919

2020
// CreateRelation establishes bi-directional relationship between a user and a
21-
// url in user_url_relation table.
21+
// short link in user_short_link table.
2222
func (u UserURLRelationSQL) CreateRelation(user entity.User, url entity.URL) error {
2323
statement := fmt.Sprintf(`
2424
INSERT INTO "%s" ("%s","%s")
2525
VALUES ($1,$2)
2626
`,
27-
table.UserURLRelation.TableName,
28-
table.UserURLRelation.ColumnUserID,
29-
table.UserURLRelation.ColumnURLAlias,
27+
table.UserShortLink.TableName,
28+
table.UserShortLink.ColumnUserID,
29+
table.UserShortLink.ColumnShortLinkAlias,
3030
)
3131

3232
_, err := u.db.Exec(statement, user.ID, url.Alias)
3333
return err
3434
}
3535

36-
// FindAliasesByUser fetches the aliases of all the URLs created by the given user.
36+
// FindAliasesByUser fetches the aliases of all the ShortLinks created by the given user.
3737
// TODO(issue#260): allow API client to filter urls based on visibility.
3838
func (u UserURLRelationSQL) FindAliasesByUser(user entity.User) ([]string, error) {
3939
statement := fmt.Sprintf(`SELECT "%s" FROM "%s" WHERE "%s"=$1;`,
40-
table.UserURLRelation.ColumnURLAlias,
41-
table.UserURLRelation.TableName,
42-
table.UserURLRelation.ColumnUserID,
40+
table.UserShortLink.ColumnShortLinkAlias,
41+
table.UserShortLink.TableName,
42+
table.UserShortLink.ColumnUserID,
4343
)
4444

4545
var aliases []string

‎backend/app/adapter/sqldb/user_short_link_integration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
var insertUserURLRelationRowSQL = fmt.Sprintf(`
1818
INSERT INTO %s (%s, %s)
1919
VALUES ($1, $2)`,
20-
table.UserURLRelation.TableName,
21-
table.UserURLRelation.ColumnURLAlias,
22-
table.UserURLRelation.ColumnUserID,
20+
table.UserShortLink.TableName,
21+
table.UserShortLink.ColumnShortLinkAlias,
22+
table.UserShortLink.ColumnUserID,
2323
)
2424

2525
type userURLRelationTableRow struct {

0 commit comments

Comments
 (0)