SMQ - 2435 - Merge invitations into domains service (#2676)

Signed-off-by: Felix Gateru <[email protected]>

.github/workflows/api-tests.yml

@@ -17,7 +17,6 @@ on:
       - "domains/api/http/**"
       - "groups/api/http/**"
       - "http/api/**"
-      - "invitations/api/**"
       - "journal/api/**"
       - "users/api/**"
 
@@ -33,7 +32,6 @@ env:
   CHANNELS_URL: http://localhost:9005
   GROUPS_URL: http://localhost:9004
   HTTP_ADAPTER_URL: http://localhost:8008
-  INVITATIONS_URL: http://localhost:9020
   AUTH_URL: http://localhost:9001
   CERTS_URL: http://localhost:9019
   JOURNAL_URL: http://localhost:9021
@@ -95,11 +93,6 @@ jobs:
               - "apidocs/openapi/http.yml"
               - "http/api/**"
 
-            invitations:
-              - ".github/workflows/api-tests.yml"
-              - "apidocs/openapi/invitations.yml"
-              - "invitations/api/**"
-
             clients:
               - ".github/workflows/api-tests.yml"
               - "apidocs/openapi/clients.yml"
@@ -170,16 +163,6 @@ jobs:
           report: false
           args: '--header "Authorization: Client ${{ env.CLIENT_SECRET }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
 
-      - name: Run Invitations API tests
-        if: steps.changes.outputs.invitations == 'true'
-        uses: schemathesis/action@v1
-        with:
-          schema: apidocs/openapi/invitations.yml
-          base-url: ${{ env.INVITATIONS_URL }}
-          checks: all
-          report: false
-          args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
-
       - name: Run Auth API tests
         if: steps.changes.outputs.auth == 'true'
         uses: schemathesis/action@v1

.github/workflows/check-generated-files.yml

@@ -58,7 +58,6 @@ jobs:
               - "auth/service.go"
               - "pkg/events/events.go"
               - "pkg/groups/groups.go"
-              - "invitations/invitations.go"
               - "users/emailer.go"
               - "users/hasher.go"
               - "certs/certs.go"
@@ -119,8 +118,6 @@ jobs:
           MOCKERY_VERSION=v2.43.2
           go install github.com/vektra/mockery/v2@$MOCKERY_VERSION
 
-          mv ./invitations/mocks/repository.go ./invitations/mocks/repository.go.tmp
-          mv ./invitations/mocks/service.go ./invitations/mocks/service.go.tmp
           mv ./auth/mocks/token_client.go ./auth/mocks/token_client.go.tmp
           mv ./auth/mocks/authz.go ./auth/mocks/authz.go.tmp
           mv ./auth/mocks/keys.go ./auth/mocks/keys.go.tmp
@@ -177,8 +174,6 @@ jobs:
             fi
           }
 
-          check_mock_changes ./invitations/mocks/repository.go " ./invitations/mocks/repository.go"
-          check_mock_changes ./invitations/mocks/service.go " ./invitations/mocks/service.go"
           check_mock_changes ./auth/mocks/token_client.go " ./auth/mocks/token_client.go"
           check_mock_changes ./auth/mocks/authz.go " ./auth/mocks/authz.go"
           check_mock_changes ./auth/mocks/keys.go " ./auth/mocks/keys.go"

.github/workflows/tests.yml

@@ -164,14 +164,6 @@ jobs:
             internal:
               - "internal/**"
 
-            invitations:
-              - "invitations/**"
-              - "cmd/invitations/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/sdk/**"
-
             journal:
               - "journal/**"
               - "cmd/journal/**"
@@ -292,11 +284,6 @@ jobs:
         run: |
           go test --race -v -count=1 -coverprofile=coverage/internal.out ./internal/...
 
-      - name: Run invitations tests
-        if: steps.changes.outputs.invitations == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/invitations.out ./invitations/...
-
       - name: Run logger tests
         if: steps.changes.outputs.logger == 'true' || steps.changes.outputs.workflow == 'true'
         run: |

Makefile

@@ -3,8 +3,8 @@
 
 SMQ_DOCKER_IMAGE_NAME_PREFIX ?= supermq
 BUILD_DIR ?= build
-SERVICES = auth users clients groups channels domains http coap ws cli mqtt certs invitations journal
-TEST_API_SERVICES = journal auth certs http invitations clients users channels groups domains
+SERVICES = auth users clients groups channels domains http coap ws cli mqtt certs journal
+TEST_API_SERVICES = journal auth certs http clients users channels groups domains
 TEST_API = $(addprefix test_api_,$(TEST_API_SERVICES))
 DOCKERS = $(addprefix docker_,$(SERVICES))
 DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
@@ -172,7 +172,6 @@ test_api_domains: TEST_API_URL := http://localhost:9003
 test_api_channels: TEST_API_URL := http://localhost:9005
 test_api_groups: TEST_API_URL := http://localhost:9004
 test_api_http: TEST_API_URL := http://localhost:8008
-test_api_invitations: TEST_API_URL := http://localhost:9020
 test_api_auth: TEST_API_URL := http://localhost:9001
 test_api_certs: TEST_API_URL := http://localhost:9019
 test_api_journal: TEST_API_URL := http://localhost:9021

apidocs/openapi/README.md

@@ -2,4 +2,4 @@
 
 This folder contains an OpenAPI specifications for SuperMQ API.
 
-View specification in Swagger UI at [docs.api.magistrala.abstractmachines.fr](https://docs.api.supermq.abstractmachines.fr)
+View specification in Swagger UI at [docs.api.magistrala.abstractmachines.fr](https://docs.api.supermq.abstractmachines.fr)