Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post repo merge #69

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Post repo merge #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b3478
fix ci badges
firminochangani Sep 3, 2024
733ce4b
rename module's name
firminochangani Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Subscribed

[![main](https://github.com/subscribeddotdev/subscribed-backend/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/subscribeddotdev/subscribed-backend/actions/workflows/main.yml)
[![main.server](https://github.com/subscribeddotdev/subscribed/actions/workflows/main.server.yml/badge.svg?branch=main)](https://github.com/subscribeddotdev/subscribed-backend/actions/workflows/main.yml)
[![ci.web](https://github.com/subscribeddotdev/subscribed/actions/workflows/ci.web.yml/badge.svg?branch=main)](https://github.com/subscribeddotdev/subscribed-backend/actions/workflows/main.yml)

Subscribed is a webhook provider that allows software developers to quickly add webhook capabilities into their applications, without having to deal with common webhook-related challenges such as:

Expand Down
30 changes: 15 additions & 15 deletions server/cmd/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ import (
"github.com/ThreeDotsLabs/watermill/message/router/plugin"
"github.com/kelseyhightower/envconfig"
_ "github.com/lib/pq"
"github.com/subscribeddotdev/subscribed-backend/internal/app/query"
"github.com/subscribeddotdev/subscribed-backend/internal/common/messaging"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/app/query"
"github.com/subscribeddotdev/subscribed/server/internal/common/messaging"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"golang.org/x/sync/errgroup"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/events"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/transaction"
"github.com/subscribeddotdev/subscribed-backend/internal/app"
"github.com/subscribeddotdev/subscribed-backend/internal/app/auth"
"github.com/subscribeddotdev/subscribed-backend/internal/app/command"
"github.com/subscribeddotdev/subscribed-backend/internal/common/logs"
"github.com/subscribeddotdev/subscribed-backend/internal/common/observability"
"github.com/subscribeddotdev/subscribed-backend/internal/common/postgres"
amqpport "github.com/subscribeddotdev/subscribed-backend/internal/ports/amqp"
"github.com/subscribeddotdev/subscribed-backend/internal/ports/http"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/events"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/transaction"
"github.com/subscribeddotdev/subscribed/server/internal/app"
"github.com/subscribeddotdev/subscribed/server/internal/app/auth"
"github.com/subscribeddotdev/subscribed/server/internal/app/command"
"github.com/subscribeddotdev/subscribed/server/internal/common/logs"
"github.com/subscribeddotdev/subscribed/server/internal/common/observability"
"github.com/subscribeddotdev/subscribed/server/internal/common/postgres"
amqpport "github.com/subscribeddotdev/subscribed/server/internal/ports/amqp"
"github.com/subscribeddotdev/subscribed/server/internal/ports/http"
)

type Config struct {
Expand Down
4 changes: 2 additions & 2 deletions server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/subscribeddotdev/subscribed-backend
module github.com/subscribeddotdev/subscribed/server

go 1.22.3

Expand All @@ -9,6 +9,7 @@ require (
github.com/friendsofgo/errors v0.9.2
github.com/getkin/kin-openapi v0.126.0
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/labstack/echo/v4 v4.12.0
github.com/lib/pq v1.10.9
Expand All @@ -34,7 +35,6 @@ require (
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down
6 changes: 3 additions & 3 deletions server/internal/adapters/events/publisher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"time"

"github.com/ThreeDotsLabs/watermill/message"
events "github.com/subscribeddotdev/subscribed-backend/events/go"
"github.com/subscribeddotdev/subscribed-backend/internal/app/command"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
events "github.com/subscribeddotdev/subscribed/server/events/go"
"github.com/subscribeddotdev/subscribed/server/internal/app/command"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"google.golang.org/protobuf/types/known/timestamppb"
)

Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type ApiKeyRepository struct {
Expand Down
6 changes: 3 additions & 3 deletions server/internal/adapters/psql/api_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/brianvoe/gofakeit/v6"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestApiKeyRepository_Insert(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions server/internal/adapters/psql/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"fmt"

"github.com/friendsofgo/errors"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/app/query"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/app/query"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"github.com/volatiletech/sqlboiler/v4/boil"
"github.com/volatiletech/sqlboiler/v4/queries/qm"
)
Expand Down
10 changes: 5 additions & 5 deletions server/internal/adapters/psql/application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/app/query"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed-backend/tests"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/app/query"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/tests"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestApplicationRepository_Insert(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"

"github.com/friendsofgo/errors"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"
"github.com/volatiletech/sqlboiler/v4/queries/qm"
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/brianvoe/gofakeit/v6"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestEndpointRepository_Insert(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"errors"
"fmt"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"
)
Expand Down
6 changes: 3 additions & 3 deletions server/internal/adapters/psql/environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestEnvironmentRepository_Insert(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/event_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"
)
Expand Down
6 changes: 3 additions & 3 deletions server/internal/adapters/psql/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed-backend/internal/common/postgres"
"github.com/subscribeddotdev/subscribed-backend/misc/tools/wait/wait_for"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed/server/internal/common/postgres"
"github.com/subscribeddotdev/subscribed/server/misc/tools/wait/wait_for"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"

"github.com/friendsofgo/errors"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"github.com/volatiletech/sqlboiler/v4/boil"
)

Expand Down
8 changes: 4 additions & 4 deletions server/internal/adapters/psql/member_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
_ "github.com/lib/pq"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed-backend/tests"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/tests"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestMemberRepository_Lifecycle(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"

"github.com/friendsofgo/errors"
"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"
)
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/message_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/brianvoe/gofakeit/v6"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/tests/fixture"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/tests/fixture"
)

func TestMessageRepository_Lifecycle(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/adapters/psql/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package psql
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/models"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/models"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
"github.com/volatiletech/null/v8"
"github.com/volatiletech/sqlboiler/v4/boil"
)
Expand Down
2 changes: 1 addition & 1 deletion server/internal/adapters/psql/organization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
)

func TestOrganizationRepository_Insert(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions server/internal/adapters/transaction/psql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"context"
"fmt"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/psql"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/psql"
"github.com/volatiletech/sqlboiler/v4/boil"

"github.com/subscribeddotdev/subscribed-backend/internal/adapters/events"
"github.com/subscribeddotdev/subscribed-backend/internal/app/command"
"github.com/subscribeddotdev/subscribed-backend/internal/common/logs"
"github.com/subscribeddotdev/subscribed/server/internal/adapters/events"
"github.com/subscribeddotdev/subscribed/server/internal/app/command"
"github.com/subscribeddotdev/subscribed/server/internal/common/logs"
)

type PsqlProvider struct {
Expand Down
10 changes: 5 additions & 5 deletions server/internal/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package app
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/app/auth"
"github.com/subscribeddotdev/subscribed-backend/internal/app/command"
"github.com/subscribeddotdev/subscribed-backend/internal/app/query"
"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/app/auth"
"github.com/subscribeddotdev/subscribed/server/internal/app/command"
"github.com/subscribeddotdev/subscribed/server/internal/app/query"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
)

type CommandHandler[C any] interface {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/app/auth/authz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package auth
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
)

type Service struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/add_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package command
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type AddEndpoint struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/call_webhook_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"
"time"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/create_api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type CreateApiKey struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/create_application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package command
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type CreateApplication struct {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/app/command/create_event_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package command
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
)

type CreateEventType struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/destroy_api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package command
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type DestroyApiKey struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/send_message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/subscribeddotdev/subscribed-backend/internal/domain"
"github.com/subscribeddotdev/subscribed/server/internal/domain"
)

type SendMessage struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/app/command/signin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package command
import (
"context"

"github.com/subscribeddotdev/subscribed-backend/internal/domain/iam"
"github.com/subscribeddotdev/subscribed/server/internal/domain/iam"
)

type SignIn struct {
Expand Down
Loading
Loading