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

Commit 7dfb933

Browse files
gotokatsuyagotokatsuya
committed
Fix create item automatically
1 parent fcd23fc commit 7dfb933

File tree

6 files changed

+16
-31
lines changed

6 files changed

+16
-31
lines changed

‎core/log/log.go

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@ package log
22

33
import (
44
"fmt"
5-
"reflect"
6-
7-
"github.com/Sirupsen/logrus"
8-
9-
"github.com/doloopwhile/logrusltsv"
5+
"log"
106
)
117

12-
func init() {
13-
logrus.SetFormatter(&logrusltsv.Formatter{})
14-
logrus.SetLevel(logrus.DebugLevel)
15-
}
16-
178
type Entity struct {
189
message string
1910
Data interface{}
@@ -42,25 +33,14 @@ func (e *Entity) WithError(v interface{}) *Entity {
4233
return e
4334
}
4435

45-
func (e *Entity) Fields() logrus.Fields {
46-
f := logrus.Fields{}
47-
if e.Data != nil && !reflect.ValueOf(e.Data).IsNil() {
48-
f["data"] = e.Data
49-
}
50-
if e.Err != nil && !reflect.ValueOf(e.Err).IsNil() {
51-
f["error"] = e.Err
52-
}
53-
return f
54-
}
55-
5636
func (e *Entity) Error() {
57-
logrus.WithFields(e.Fields()).Error(e.message)
37+
log.Println(e.message)
5838
}
5939

6040
func (e *Entity) Info() {
61-
logrus.WithFields(e.Fields()).Info(e.message)
41+
log.Println(e.message)
6242
}
6343

6444
func (e *Entity) Debug() {
65-
logrus.WithFields(e.Fields()).Debug(e.message)
45+
log.Println(e.message)
6646
}

‎core/models/tag_entity_repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (r *TagRepository) GetByID(id uint64) (*Tag, error) {
2424

2525
func (r *TagRepository) FindByNames(names []string) ([]Tag, error) {
2626
var ents []Tag
27-
if err := r.Orm.Where("name IN (?)", names).Find(ents).Error; err != nil {
27+
if err := r.Orm.Where("name IN (?)", names).Find(&ents).Error; err != nil {
2828
return ents, err
2929
}
3030
return ents, nil

‎internal/controllers/api/api_controllers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ func (c *APIItemController) CreateItem() {
256256
c.API().InternalServerError(map[string]interface{}{
257257
"status": "NG",
258258
"func": "GetMe::MeFacade",
259-
"message": err,
259+
"message": err.Error(),
260260
})
261261
return
262262
}
@@ -268,7 +268,7 @@ func (c *APIItemController) CreateItem() {
268268
c.API().InternalServerError(map[string]interface{}{
269269
"status": "NG",
270270
"func": "CreateItem::ItemFacade",
271-
"message": err,
271+
"message": err.Error(),
272272
})
273273
return
274274
}

‎internal/facades/item_facade.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package facades
22

33
import (
44
"github.com/gophergala2016/source/core/foundation"
5+
"github.com/gophergala2016/source/core/log"
56
"github.com/gophergala2016/source/core/models"
67
"github.com/gophergala2016/source/internal/services"
78
)
@@ -39,6 +40,7 @@ func (f ItemFacade) CreateItem(userID uint64, githubURL string) (item *models.It
3940
item.Name = github.Name
4041
item.Description = github.Description
4142
if item, err = itemService.CreateItem(item); err != nil {
43+
log.New("CreateItem::ItemService").Error()
4244
return nil, err
4345
}
4446
}
@@ -47,6 +49,7 @@ func (f ItemFacade) CreateItem(userID uint64, githubURL string) (item *models.It
4749
// Star
4850
itemImpressionService := services.NewItemImpressionService(f.ctx)
4951
if _, err = itemImpressionService.CreateItemImpression(item.ID, uint(github.Star)); err != nil {
52+
log.New("CreateItemImpression::ItemImpressionService").Error()
5053
return nil, err
5154
}
5255
}
@@ -56,12 +59,14 @@ func (f ItemFacade) CreateItem(userID uint64, githubURL string) (item *models.It
5659
var tags []models.Tag
5760
tagService := services.NewTagService(f.ctx)
5861
if tags, err = tagService.FindTagByNames(github.Languages); err != nil {
62+
log.New("FindTagByNames::TagService").Error()
5963
return nil, err
6064
}
6165

6266
itemTagService := services.NewItemTagService(f.ctx)
6367
for _, tag := range tags {
6468
if _, err = itemTagService.CreateItemTag(item.ID, tag.ID); err != nil {
69+
log.New("CreateItemTag::ItemTagService").Error()
6570
return nil, err
6671
}
6772
}

‎internal/services/github_service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (s GithubService) GetGithub(githubURL string) (*models.Github, error) {
2828
case strings.HasPrefix(githubURL, prefixSecureGithubURL) || strings.HasPrefix(githubURL, prefixGithubURL):
2929
// Correct url
3030
default:
31-
return nil, errors.New("This is not githubURL")
31+
return nil, errors.New("This is not github url.")
3232
}
3333

3434
// Get author & repo name

‎misc/master/tag/insert_tags.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('NewLisp','#87AE
88
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Jupyter Notebook','#DA5B0B', 0, now(), now());
99
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Rebol','#358a5b', 0, now(), now());
1010
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Frege','#00cafe', 0, now(), now());
11-
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Dart','#00B4AB', 1, now(), now());
11+
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Dart','#00B4AB', 0, now(), now());
1212
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('AspectJ','#a957b0', 0, now(), now());
1313
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Shell','#89e051', 1, now(), now());
1414
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Web Ontology Language','#9cc9dd', 0, now(), now());
@@ -18,7 +18,7 @@ INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Nix','#7e7eff',
1818
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('RAML','#77d9fb', 0, now(), now());
1919
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('MTML','#b7e1f4', 0, now(), now());
2020
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Racket','#22228f', 0, now(), now());
21-
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Elixir','#6e4a7e', 2, now(), now());
21+
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Elixir','#6e4a7e', 1, now(), now());
2222
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('SAS','#B34936', 0, now(), now());
2323
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Agda','#315665', 0, now(), now());
2424
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('wisp','#7582D1', 0, now(), now());
@@ -192,7 +192,7 @@ INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Haskell','#29b5
192192
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('NCL','#28431f', 0, now(), now());
193193
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Io','#a9188d', 0, now(), now());
194194
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Rouge','#cc0088', 0, now(), now());
195-
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('cpp','#f34b7d', 2, now(), now());
195+
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('C++','#f34b7d', 2, now(), now());
196196
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('AGS Script','#B9D9FF', 0, now(), now());
197197
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('Dogescript','#cca760', 0, now(), now());
198198
INSERT INTO tag (name,color,score,created_at,updated_at) VALUES('nesC','#94B0C7', 0, now(), now());

0 commit comments

Comments
 (0)