From 456c163a1b6bc4448fe602b4dca92bb1b82364f1 Mon Sep 17 00:00:00 2001 From: Trim21 Date: Fri, 18 Oct 2024 21:50:22 +0800 Subject: [PATCH] chore: remove too many logging --- internal/auth/mysql_repository.go | 3 --- internal/character/mysql_repository.go | 5 ----- internal/collections/infra/mysql_repo.go | 2 -- internal/person/mysql_repository.go | 5 ----- internal/revision/mysql_repo_episode.go | 2 +- internal/revision/mysql_repository.go | 6 ++---- internal/subject/mysql_repository.go | 8 -------- internal/user/mysql_repository.go | 1 - 8 files changed, 3 insertions(+), 29 deletions(-) diff --git a/internal/auth/mysql_repository.go b/internal/auth/mysql_repository.go index 6ce8cae56..14e17b090 100644 --- a/internal/auth/mysql_repository.go +++ b/internal/auth/mysql_repository.go @@ -58,7 +58,6 @@ func (m mysqlRepo) GetByEmail(ctx context.Context, email string) (UserInfo, []by return UserInfo{}, nil, gerr.ErrNotFound } - m.log.Error("unexpected error happened", zap.Error(err)) return UserInfo{}, nil, errgo.Wrap(err, "gorm") } @@ -169,7 +168,6 @@ func (m mysqlRepo) CreateAccessToken( Info: infoByte, }) if err != nil { - m.log.Error("unexpected error happened", zap.Error(err)) return "", errgo.Wrap(err, "dal") } @@ -186,7 +184,6 @@ func (m mysqlRepo) ListAccessToken(ctx context.Context, userID model.UserID) ([] Where(m.q.AccessToken.UserID.Eq(strconv.FormatUint(uint64(userID), 10)), m.q.AccessToken.ExpiredAt.Gte(time.Now())).Find() if err != nil { - m.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } diff --git a/internal/character/mysql_repository.go b/internal/character/mysql_repository.go index 47bc3640c..543615ac1 100644 --- a/internal/character/mysql_repository.go +++ b/internal/character/mysql_repository.go @@ -47,7 +47,6 @@ func (r mysqlRepo) Get(ctx context.Context, id model.CharacterID) (model.Charact return model.Character{}, gerr.ErrCharacterNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) return model.Character{}, errgo.Wrap(err, "dal") } @@ -60,7 +59,6 @@ func (r mysqlRepo) GetByIDs( records, err := r.q.Character.WithContext(ctx).Preload(r.q.Character.Fields). Where(r.q.Character.ID.In(slice.ToUint32(ids)...)).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -80,7 +78,6 @@ func (r mysqlRepo) GetPersonRelated( Order(r.q.Cast.SubjectID). Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -103,7 +100,6 @@ func (r mysqlRepo) GetSubjectRelated( Where(r.q.CharacterSubjects.SubjectID.Eq(subjectID)). Order(r.q.CharacterSubjects.CharacterID).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -137,7 +133,6 @@ func (r mysqlRepo) GetSubjectRelationByIDs( Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } diff --git a/internal/collections/infra/mysql_repo.go b/internal/collections/infra/mysql_repo.go index e069801b1..e0375d152 100644 --- a/internal/collections/infra/mysql_repo.go +++ b/internal/collections/infra/mysql_repo.go @@ -467,7 +467,6 @@ func (r mysqlRepo) ListSubjectCollection( collections, err := q.Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -799,7 +798,6 @@ func (r mysqlRepo) ListPersonCollection( collections, err := q.Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } diff --git a/internal/person/mysql_repository.go b/internal/person/mysql_repository.go index 67d62be4d..95eccc14d 100644 --- a/internal/person/mysql_repository.go +++ b/internal/person/mysql_repository.go @@ -45,8 +45,6 @@ func (r mysqlRepo) Get(ctx context.Context, id model.PersonID) (model.Person, er return model.Person{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) - return model.Person{}, errgo.Wrap(err, "dal") } @@ -59,7 +57,6 @@ func (r mysqlRepo) GetSubjectRelated( relations, err := r.q.PersonSubjects.WithContext(ctx). Where(r.q.PersonSubjects.SubjectID.Eq(subjectID)).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -84,7 +81,6 @@ func (r mysqlRepo) GetCharacterRelated( Order(r.q.Cast.PersonID). Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -104,7 +100,6 @@ func (r mysqlRepo) GetByIDs(ctx context.Context, ids []model.PersonID) (map[mode u, err := r.q.Person.WithContext(ctx).Joins(r.q.Person.Fields). Where(r.q.Person.ID.In(ids...)).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } diff --git a/internal/revision/mysql_repo_episode.go b/internal/revision/mysql_repo_episode.go index 291098469..a47827f67 100644 --- a/internal/revision/mysql_repo_episode.go +++ b/internal/revision/mysql_repo_episode.go @@ -76,7 +76,7 @@ func (r mysqlRepo) GetEpisodeRelated(ctx context.Context, id model.RevisionID) ( r.log.Error("can't find revision text", zap.Uint32("id", revision.TextID)) return model.EpisodeRevision{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) + return model.EpisodeRevision{}, errgo.Wrap(err, "dal") } diff --git a/internal/revision/mysql_repository.go b/internal/revision/mysql_repository.go index 37b975c3d..99b7b337d 100644 --- a/internal/revision/mysql_repository.go +++ b/internal/revision/mysql_repository.go @@ -84,7 +84,7 @@ func (r mysqlRepo) GetPersonRelated(ctx context.Context, id model.RevisionID) (m if errors.Is(err, gorm.ErrRecordNotFound) { return model.PersonRevision{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) + return model.PersonRevision{}, errgo.Wrap(err, "dal") } data, err := r.q.RevisionText.WithContext(ctx). @@ -95,7 +95,6 @@ func (r mysqlRepo) GetPersonRelated(ctx context.Context, id model.RevisionID) (m return model.PersonRevision{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) return model.PersonRevision{}, errgo.Wrap(err, "dal") } return convertPersonRevisionDao(revision, data), nil @@ -148,7 +147,7 @@ func (r mysqlRepo) GetCharacterRelated(ctx context.Context, id model.RevisionID) r.log.Error("can't find revision text", zap.Uint32("id", revision.TextID)) return model.CharacterRevision{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) + return model.CharacterRevision{}, errgo.Wrap(err, "dal") } return convertCharacterRevisionDao(revision, data), nil @@ -199,7 +198,6 @@ func (r mysqlRepo) GetSubjectRelated(ctx context.Context, id model.RevisionID) ( return model.SubjectRevision{}, gerr.ErrNotFound } - r.log.Error("unexpected error happened", zap.Error(err)) return model.SubjectRevision{}, errgo.Wrap(err, "dal") } return convertSubjectRevisionDao(revision, true), nil diff --git a/internal/subject/mysql_repository.go b/internal/subject/mysql_repository.go index 395979ebc..3e2a44179 100644 --- a/internal/subject/mysql_repository.go +++ b/internal/subject/mysql_repository.go @@ -54,7 +54,6 @@ func (r mysqlRepo) Get(ctx context.Context, id model.SubjectID, filter Filter) ( return model.Subject{}, fmt.Errorf("%w: %d", gerr.ErrNotFound, id) } - r.log.Error("unexpected error happened", zap.Error(err)) return model.Subject{}, errgo.Wrap(err, "dal") } @@ -138,8 +137,6 @@ func (r mysqlRepo) GetPersonRelated( Joins(r.q.PersonSubjects.Person). Where(r.q.PersonSubjects.PersonID.Eq(personID)).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) - return nil, errgo.Wrap(err, "dal") } @@ -163,7 +160,6 @@ func (r mysqlRepo) GetCharacterRelated( Joins(r.q.CharacterSubjects.Subject). Where(r.q.CharacterSubjects.CharacterID.Eq(characterID)).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -187,7 +183,6 @@ func (r mysqlRepo) GetSubjectRelated( Joins(r.q.SubjectRelation.Subject).Where(r.q.SubjectRelation.SubjectID.Eq(subjectID)). Order(r.q.SubjectRelation.Order).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -217,7 +212,6 @@ func (r mysqlRepo) GetByIDs( records, err := q.Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -306,7 +300,6 @@ func (r mysqlRepo) Browse( subjects, err := q.Limit(limit).Offset(offset).Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } @@ -331,7 +324,6 @@ func (r mysqlRepo) GetActors( Order(r.q.Cast.PersonID). Find() if err != nil { - r.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") } diff --git a/internal/user/mysql_repository.go b/internal/user/mysql_repository.go index 3cd7b960d..6f241d185 100644 --- a/internal/user/mysql_repository.go +++ b/internal/user/mysql_repository.go @@ -112,7 +112,6 @@ func (m mysqlRepo) GetByName(ctx context.Context, username string) (User, error) func (m mysqlRepo) GetByIDs(ctx context.Context, ids []model.UserID) (map[model.UserID]User, error) { u, err := m.q.Member.WithContext(ctx).Where(m.q.Member.ID.In(ids...)).Find() if err != nil { - m.log.Error("unexpected error happened", zap.Error(err)) return nil, errgo.Wrap(err, "dal") }