.env

@@ -4,7 +4,8 @@ MONGO_DB_NAME = "admin"
 
 # Kafka settings
 KAFKA_BROKERS="localhost:9092"
-KAFKA_TOPIC_TARIFF="test-topic"
+KAFKA_TOPIC="test-topic"
+KAFKA_GROUP="mailnotifier"
 
 # SMTP settings
 SMTP_API_URL="https://api.smtp.bz/v1/smtp/send"

Dockerfile

@@ -0,0 +1,27 @@
+# BUILD
+FROM golang:1.22.0-alpine AS build
+
+# Update packages and clear cache
+RUN apk add --no-cache curl
+# Set work directory
+WORKDIR /app
+RUN apk add git
+# Add main files to app
+ADD . .
+RUN git config --global url."https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/"
+# Download go depences
+RUN go mod download
+# Build app
+RUN GOOS=linux go build -o bin ./cmd/main.go
+
+# PRODUCTION
+FROM alpine:3.18.3 AS production
+
+# Install packages
+RUN apk --no-cache add ca-certificates
+# Create home directory
+WORKDIR /app
+# Copy build file
+COPY --from=build /app/bin ./app
+# CMD
+CMD ["./app"]

deployments/main/docker-compose.yaml

@@ -0,0 +1,26 @@
+version: "3.3"
+
+services:
+  mailnotifier:
+    hostname: mailnotifier
+    container_name: mailnotifier
+    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    tty: true
+    environment:
+      - MONGO_HOST=10.8.0.8
+      - MONGO_PORT=27017
+      - MONGO_USER=mailnotifier
+      - MONGO_PASSWORD=vWwbCSg4bf0p
+      - MONGO_DB=mailnotifier
+      - MONGO_AUTH=mailnotifier
+      - KAFKA_BROKERS=10.8.0.8:9092
+      - KAFKA_TOPIC=mailnotifier
+      - SMTP_API_URL=https://api.smtp.bz/v1/smtp/send
+      - SMTP_HOST=connect.mailclient.bz
+      - SMTP_PORT=587
+      - SMTP_UNAME=team@pena.digital
+      - SMTP_PASS=AyMfwqA9LkQH
+      - SMTP_API_KEY=8tv2xcsfCMBX3TCQxzgeeEwAEYyQrPUp0ggw
+      - SMTP_SENDER=recovery@noreply.pena.digital
+      - CUSTOMER_URL=10.8.0.8:8086
+      - QUIZ_RPC_URL=10.8.0.9:9000

deployments/staging/docker-compose.yaml

@@ -0,0 +1,26 @@
+version: "3.3"
+
+services:
+  mailnotifier:
+    hostname: mailnotifier
+    container_name: mailnotifier
+    image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    tty: true
+    environment:
+      - MONGO_HOST=10.8.0.6
+      - MONGO_PORT=27017
+      - MONGO_USER=mailnotifier
+      - MONGO_PASSWORD=vWwbCSg4bf0p
+      - MONGO_DB=mailnotifier
+      - MONGO_AUTH=mailnotifier
+      - KAFKA_BROKERS=10.8.0.6:9092
+      - KAFKA_TOPIC=mailnotifier
+      - SMTP_API_URL=https://api.smtp.bz/v1/smtp/send
+      - SMTP_HOST=connect.mailclient.bz
+      - SMTP_PORT=587
+      - SMTP_UNAME=kotilion.95@gmail.com
+      - SMTP_PASS=vWwbCSg4bf0p
+      - SMTP_API_KEY=P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev
+      - SMTP_SENDER=noreply@mailing.pena.digital
+      - CUSTOMER_URL=10.8.0.6:8086
+      - QUIZ_RPC_URL=10.8.0.5:9000

go.mod

@@ -1,15 +1,16 @@
 module gitea.pena/PenaSide/notifier
 
-go 1.22.0
+go 1.23.2
 
-toolchain go1.23.2
+toolchain go1.23.4
 
 require (
-	gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1
+	gitea.pena/PenaSide/common v0.0.0-20241231090536-2454377ad2a0
+	gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735
 	github.com/caarlos0/env/v8 v8.0.0
 	github.com/gofiber/fiber/v2 v2.51.0
 	github.com/joho/godotenv v1.5.1
-	github.com/twmb/franz-go v1.16.1
+	github.com/twmb/franz-go v1.18.0
 	go.mongodb.org/mongo-driver v1.14.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.63.0
@@ -17,18 +18,17 @@ require (
 )
 
 require (
-	gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/pierrec/lz4/v4 v4.1.19 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.9.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.50.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
@@ -37,10 +37,10 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 )

go.sum

@@ -1,5 +1,5 @@
-gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1 h1:w1AAxrlZGmxUI9NAa/0TYsc6sqWWF9yAzQaLL/KxwrM=
+gitea.pena/PenaSide/common v0.0.0-20241231090536-2454377ad2a0 h1:B4+DAND6gJnCsc9DZY6XyMVLzD23nI8whk8xI7XKGrM=
-gitea.pena/PenaSide/common v0.0.0-20241128160655-fe730a08b5f1/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw=
+gitea.pena/PenaSide/common v0.0.0-20241231090536-2454377ad2a0/go.mod h1:U7QFuvkrIWyb/m/SOyrsroS7DJntjcr9k7kNy3vtPdU=
 gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735 h1:jDVeUhGBTXBibmW5dmtJg2m2+z5z2Rf6J4G0LpjVoJ0=
 gitea.pena/PenaSide/linters-golang v0.0.0-20241207122018-933207374735/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
@@ -18,8 +18,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -29,18 +29,18 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
-github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/twmb/franz-go v1.16.1 h1:rpWc7fB9jd7TgmCyfxzenBI+QbgS8ZfJOUQE+tzPtbE=
+github.com/twmb/franz-go v1.18.0 h1:25FjMZfdozBywVX+5xrWC2W+W76i0xykKjTdEeD2ejw=
-github.com/twmb/franz-go v1.16.1/go.mod h1:/pER254UPPGp/4WfGqRi+SIRGE50RSQzVubQp6+N4FA=
+github.com/twmb/franz-go v1.18.0/go.mod h1:zXCGy74M0p5FbXsLeASdyvfLFsBvTubVqctIaa5wQ+I=
-github.com/twmb/franz-go/pkg/kmsg v1.7.0 h1:a457IbvezYfA5UkiBvyV3zj0Is3y1i8EJgqjJYoij2E=
+github.com/twmb/franz-go/pkg/kmsg v1.9.0 h1:JojYUph2TKAau6SBtErXpXGC7E3gg4vGZMv9xFU/B6M=
-github.com/twmb/franz-go/pkg/kmsg v1.7.0/go.mod h1:se9Mjdt0Nwzc9lnjJ0HyDtLyBnaBDAd7pCje47OhSyw=
+github.com/twmb/franz-go/pkg/kmsg v1.9.0/go.mod h1:CMbfazviCyY6HM0SXuG5t9vOwYDHRCSrJJyBAe5paqg=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M=
@@ -66,18 +66,18 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -85,16 +85,16 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/clients/quiz_rpc.go

@@ -24,7 +24,7 @@ var coreRpcHost = "core rpc host"
 var request = "request"
 
 func (q *QuizClient) GetQuizzes(ctx context.Context, req *notifyer.GetQuizzesRequest) (*notifyer.GetQuizzesResponse, error) {
-	connection, err := grpc.Dial(q.address, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	connection, err := grpc.NewClient(q.address, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		q.logger.Error("failed to connect on GetQuizzes of core rpc", zap.Error(err), zap.String(coreRpcHost, q.address))
 		return nil, err
@@ -47,7 +47,7 @@ func (q *QuizClient) GetQuizzes(ctx context.Context, req *notifyer.GetQuizzesReq
 }
 
 func (q *QuizClient) GetStartedQuizzes(ctx context.Context, req *notifyer.GetStartedQuizzesRequest) (*notifyer.GetStartedQuizzesResponse, error) {
-	connection, err := grpc.Dial(q.address, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	connection, err := grpc.NewClient(q.address, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		q.logger.Error("failed to connect on GetStartedQuizzes of core rpc", zap.Error(err), zap.String(coreRpcHost, q.address))
 		return nil, err

internal/repository/repository.go

@@ -2,12 +2,9 @@ package repository
 
 import (
 	"context"
-	"errors"
 	"gitea.pena/PenaSide/notifier/internal/models"
 	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
-	"time"
 )
 
 type Repository struct {
@@ -23,7 +20,6 @@ func NewRepository(mdb *mongo.Collection) *Repository {
 
 // записываем каждый месседж по одному
 func (r *Repository) Insert(ctx context.Context, mes models.Message) error {
-	mes.ID = primitive.NewObjectID()
 	_, err := r.mdb.InsertOne(ctx, mes)
 	if err != nil {
 		return err
@@ -36,9 +32,9 @@ func (r *Repository) Insert(ctx context.Context, mes models.Message) error {
 
 // получаем сразу все в tools метод распределения
 func (r *Repository) GetMany(ctx context.Context) ([]models.Message, error) {
-	to := time.Now().AddDate(0, 0, -15)
+	// to := time.Now().AddDate(0, 0, -15)
-	from := time.Now().AddDate(0, 0, -7)
+	// from := time.Now().AddDate(0, 0, -7)
-
+	//
 	filter := bson.D{
 		{Key: "$and", Value: bson.A{
 			bson.D{
@@ -46,20 +42,21 @@ func (r *Repository) GetMany(ctx context.Context) ([]models.Message, error) {
 					bson.D{{Key: "sendRegistration", Value: false}},
 					bson.D{{Key: "sendNoneCreated", Value: false}},
 					bson.D{{Key: "sendUnpublished", Value: false}},
+					bson.D{{Key: "sendPaid", Value: false}},
 				}},
 			},
-			bson.D{
+			// bson.D{
-				{Key: "sendAt", Value: bson.D{
+			// 	{"sendAt", bson.D{
-					{Key: "$gte", Value: to},
+			// 		{"$gte", to},
-					{Key: "$lte", Value: from},
+			// 		{"$lte", from},
-				}},
+			// 	}},
-			},
+			// },
 		}},
 	}
 
 	cursor, err := r.mdb.Find(ctx, filter)
 	if err != nil {
-		if errors.Is(err, mongo.ErrNoDocuments) {
+		if err == mongo.ErrNoDocuments {
 			return []models.Message{}, nil
 		}
 		return nil, err

internal/workers/consumer.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/twmb/franz-go/pkg/kgo"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.uber.org/zap"
 	"gitea.pena/PenaSide/notifier/internal/clients"
 	"gitea.pena/PenaSide/notifier/internal/models"
@@ -79,6 +80,7 @@ func (c *Consumer) consumeMessages(ctx context.Context) {
 }
 
 func (c *Consumer) processMsg(ctx context.Context, message models.Message) error {
+	message.ID = primitive.NewObjectID()
 	err := c.repo.Insert(ctx, message)
 	if err != nil {
 		return fmt.Errorf("error insert kafka data to mongo: %w", err)

internal/workers/mail/nopaid.tmpl

@@ -1,12 +1,74 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <title>Paid</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
+    <title>Document</title>
-<body>
+    <style>
-    <h1>Hello dude!</h1>
+      /* Сброс стилей */
-    <p>Get money.</p>
+      body,
-    <p>Pena Co Ltd</p>
+      h1,
-</body>
+      h2,
+      h3,
+      p,
+      div,
+      img,
+      button,
+      table,
+      th,
+      td {
+        margin: 0;
+        padding: 0;
+        border: 0;
+
+        font: inherit;
+        vertical-align: baseline;
+      }
+
+      body {
+        background-color: #f2f2f7;
+        font-family: Arial, sans-serif;
+      }
+
+      @media (max-width: 600px) {
+        h1 {
+          font-size: 25px !important;
+        }
+
+        h4 {
+          font-size: 20px !important;
+        }
+      }
+    </style>
+  </head>
+  <body style="background-color: #f2f2f7; font-family: Arial, sans-serif">
+    <table style="width: 100%; padding: 16px">
+      <tr>
+              <td>
+                <img class="image" style="width: 103px; height: 40px" src="https://storage.yandexcloud.net/squizimages/logo-email-squiz.png" />
+              </td>
+              <td>
+                <p style="text-align: end; color: #9a9aaf; font-size: 14px">Квиз для вашего бизнеса</p>
+              </td>
+            </tr>
+
+      <tr>
+        <td colspan="2" style="height: 100%">
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+Здравствуйте, мы заметили что вы не стали пользоваться нашим продуктом PenaQuiz. Напишите пожалуйста нам в техническую поддержку что вам не понравилось, может не хватает какого то функционала или же возникли затруднения. </p>
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+					Информация обязательно будет доведена до лиц принимающих решения, так как мы хотим и готовы развиваться совместно с нашими клиентами.
+</p> 
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: center; padding: 0">
+          <a style="color: #7e2aea; font-size: 20px; font-style: normal; font-weight: 400; line-height: normal">
+            quiz.pena.digital
+          </a>
+        </td>
+      </tr>
+    </table>
+  </body>
 </html>

internal/workers/mail/noquiz.tmpl

@@ -1,12 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <title>Create Quiz</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
+    <title>Document</title>
-<body>
+    <style>
-    <h1>Hello dude!</h1>
+      /* Сброс стилей */
-    <p>Create QUIZ.</p>
+      body,
-    <p>Pena Co Ltd</p>
+      h1,
-</body>
+      h2,
-</html>
+      h3,
+      p,
+      div,
+      img,
+      button,
+      table,
+      th,
+      td {
+        margin: 0;
+        padding: 0;
+        border: 0;
+
+        font: inherit;
+        vertical-align: baseline;
+      }
+
+      body {
+        background-color: #f2f2f7;
+        font-family: Arial, sans-serif;
+      }
+
+      @media (max-width: 600px) {
+        h1 {
+          font-size: 25px !important;
+        }
+
+        h4 {
+          font-size: 20px !important;
+        }
+      }
+    </style>
+  </head>
+  <body style="background-color: #f2f2f7; font-family: Arial, sans-serif">
+    <table style="width: 100%; padding: 16px">
+      <tr>
+              <td>
+                <img class="image" style="width: 103px; height: 40px" src="https://storage.yandexcloud.net/squizimages/logo-email-squiz.png" />
+              </td>
+              <td>
+                <p style="text-align: end; color: #9a9aaf; font-size: 14px">Квиз для вашего бизнеса</p>
+              </td>
+            </tr>
+
+      <tr>
+        <td colspan="2" style="height: 100%">
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+Здравствуйте, мы заметили что у вас возникли сложности в использовании продукта PenaQuiz, расскажите пожалуйста нашей технической поддержке,о сложностях которые у вас возникли и мы обязательно разберемся и в течении рабочего дня вместе составим необходимый  опрос для запуска рекламы или исследования.</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: center; padding: 0">
+          <a style="color: #7e2aea; font-size: 20px; font-style: normal; font-weight: 400; line-height: normal">
+            quiz.pena.digital
+          </a>
+        </td>
+      </tr>
+    </table>
+  </body>
+<

internal/workers/mail/noquizstart.tmpl

@@ -1,12 +1,72 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <title>Start Quiz</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
+    <title>Document</title>
-<body>
+    <style>
-    <h1>Hello dude!</h1>
+      /* Сброс стилей */
-    <p>Publish QUIZ.</p>
+      body,
-    <p>Pena Co Ltd</p>
+      h1,
-</body>
+      h2,
+      h3,
+      p,
+      div,
+      img,
+      button,
+      table,
+      th,
+      td {
+        margin: 0;
+        padding: 0;
+        border: 0;
+
+        font: inherit;
+        vertical-align: baseline;
+      }
+
+      body {
+        background-color: #f2f2f7;
+        font-family: Arial, sans-serif;
+      }
+
+      @media (max-width: 600px) {
+        h1 {
+          font-size: 25px !important;
+        }
+
+        h4 {
+          font-size: 20px !important;
+        }
+      }
+    </style>
+  </head>
+  <body style="background-color: #f2f2f7; font-family: Arial, sans-serif">
+    <table style="width: 100%; padding: 16px">
+      <tr>
+              <td>
+                <img class="image" style="width: 103px; height: 40px" src="https://storage.yandexcloud.net/squizimages/logo-email-squiz.png" />
+              </td>
+              <td>
+                <p style="text-align: end; color: #9a9aaf; font-size: 14px">Квиз для вашего бизнеса</p>
+              </td>
+            </tr>
+
+      <tr>
+        <td colspan="2" style="height: 100%">
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+					Здравствуйте, мы заметили что у вас возникли сложности в использовании продукта PenaQuiz, расскажите пожалуйста нашей технической поддержке,о сложностях которые у вас возникли и мы обязательно разберемся и в течении рабочего дня вместе составим необходимый  опрос для запуска рекламы или исследования.
+</p>
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: center; padding: 0">
+          <a style="color: #7e2aea; font-size: 20px; font-style: normal; font-weight: 400; line-height: normal">
+            quiz.pena.digital
+          </a>
+        </td>
+      </tr>
+    </table>
+  </body>
 </html>

internal/workers/mail/register.tmpl

@@ -1,12 +1,74 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <title>Start Quiz</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-</head>
+    <title>Document</title>
-<body>
+    <style>
-    <h1>Hello dude!</h1>
+      /* Сброс стилей */
-    <p>❤️</p>
+      body,
-    <p>Pena Co Ltd</p>
+      h1,
-</body>
+      h2,
+      h3,
+      p,
+      div,
+      img,
+      button,
+      table,
+      th,
+      td {
+        margin: 0;
+        padding: 0;
+        border: 0;
+
+        font: inherit;
+        vertical-align: baseline;
+      }
+
+      body {
+        background-color: #f2f2f7;
+        font-family: Arial, sans-serif;
+      }
+
+      @media (max-width: 600px) {
+        h1 {
+          font-size: 25px !important;
+        }
+
+        h4 {
+          font-size: 20px !important;
+        }
+      }
+    </style>
+  </head>
+  <body style="background-color: #f2f2f7; font-family: Arial, sans-serif">
+    <table style="width: 100%; padding: 16px">
+      <tr>
+              <td>
+                <img class="image" style="width: 103px; height: 40px" src="https://storage.yandexcloud.net/squizimages/logo-email-squiz.png" />
+              </td>
+              <td>
+                <p style="text-align: end; color: #9a9aaf; font-size: 14px">Квиз для вашего бизнеса</p>
+              </td>
+            </tr>
+
+      <tr>
+        <td colspan="2" style="height: 100%">
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+					Здравствуйте вы зарегистрировались на продукте PenaQuiz и в течении 14 дней вы можете создавать квизы, и получать данные от любого количества заявок абсолютно бесплатно.          </p>
+          <p style="color: #9a9aaf; font-size: 20px; margin-bottom: 50px">
+					При возникновении любых вопросов или проблем пишите онлайн консультанту (значок вопроса в нижнем правом углу экрана на сайте). Так же вы можете заказать создание квиза под ваш бизнес и требования на нашей платформе, для заказа пишите <a href="https://t.me/penaquiz">@penaquiz</a>
+</p> 
+        </td>
+      </tr>
+
+      <tr>
+        <td colspan="2" style="text-align: center; padding: 0">
+          <a style="color: #7e2aea; font-size: 20px; font-style: normal; font-weight: 400; line-height: normal">
+            quiz.pena.digital
+          </a>
+        </td>
+      </tr>
+    </table>
+  </body>
 </html>