drop hard code mongo collections constants

This commit is contained in:
Pasha 2024-12-02 12:01:30 +03:00 committed by skeris
parent 92367c34d4
commit 10001152e4
4 changed files with 15 additions and 15 deletions

2
go.mod

@ -56,7 +56,7 @@ require (
)
require (
gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1
gitea.pena/PenaSide/common v0.0.0-20241202085823-f2893fbf9772
github.com/stretchr/testify v1.8.4
github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33
)

2
go.sum

@ -56,6 +56,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9NAa/0TYsc6sqWWF9yAzQaLL/KxwrM=
gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw=
gitea.pena/PenaSide/common v0.0.0-20241202085823-f2893fbf9772 h1:RklzzwGnw+TsPQZH/Bzb6UXGRmv22iQHf6PqbTKNCyM=
gitea.pena/PenaSide/common v0.0.0-20241202085823-f2893fbf9772/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw=
gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 h1:tBkXWNIt8icmkMMnq8MA421RWkUy4OZh5P7C3q8uCu4=
gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9/go.mod h1:sanhSL8aEsfcq21P+eItYiAnKAre+B67nGJmDfk2cf0=
gitea.pena/PenaSide/linters-golang v0.0.0-20241127222405-b4bda04c14b4 h1:PxhHDNYggJjvZ7FmDsLmaadE9g2Ld+vjTn7clrGrnB4=

@ -31,8 +31,11 @@ func NewRepositories(ctx context.Context, deps DepsRepositories) (*Repositories,
}
mongoRepo, err := mongo.New(ctx, mongo.DepsDAL{
MongoDatabase: deps.MongoDatabase,
HLogger: deps.HLogger,
Client: deps.MongoDatabase.Client(),
ColMsg: deps.MongoDatabase.Collection("messages"),
ColAcc: deps.MongoDatabase.Collection("account"),
ColTck: deps.MongoDatabase.Collection("tickets"),
HLogger: deps.HLogger,
})
if err != nil {
return nil, err

@ -15,15 +15,10 @@ import (
"go.mongodb.org/mongo-driver/mongo/options"
)
const (
collMessages = "messages"
collTickets = "tickets"
collAccount = "account"
)
type DepsDAL struct {
MongoDatabase *mongo.Database
HLogger hlog.Logger
ColMsg, ColTck, ColAcc *mongo.Collection
HLogger hlog.Logger
Client *mongo.Client
}
type DAL struct {
@ -49,10 +44,10 @@ type InfoPing struct {
func New(ctx context.Context, deps DepsDAL) (*DAL, error) {
dal := &DAL{
client: deps.MongoDatabase.Client(),
colMsg: deps.MongoDatabase.Collection(collMessages),
colTck: deps.MongoDatabase.Collection(collTickets),
colAcc: deps.MongoDatabase.Collection(collAccount),
client: deps.Client,
colMsg: deps.ColMsg,
colTck: deps.ColTck,
colAcc: deps.ColAcc,
logger: deps.HLogger.Module("DAL"),
}