Csaba79-coder
diff --git a/‎.gitignore
Lines changed: 2 additions & 0 deletions b/‎.gitignore
Lines changed: 2 additions & 0 deletions
diff --git a/‎api-contract/src/main/resources/api-contract.yaml
Lines changed: 267 additions & 1 deletion b/‎api-contract/src/main/resources/api-contract.yaml
Lines changed: 267 additions & 1 deletion
diff --git a/‎api-gateway/src/main/resources/application.properties
Lines changed: 10 additions & 0 deletions b/‎api-gateway/src/main/resources/application.properties
Lines changed: 10 additions & 0 deletions
diff --git a/‎discovery-server/target/discovery-server-3.0.2.jar
0 Bytes b/‎discovery-server/target/discovery-server-3.0.2.jar
0 Bytes
diff --git a/‎government-service/src/main/resources/application.properties
Lines changed: 3 additions & 0 deletions b/‎government-service/src/main/resources/application.properties
Lines changed: 3 additions & 0 deletions
@@ -92,4 +92,6 @@ bin/
 /government-service/target/
 /discovery-server/target/
 /api-gateway/target/
+/logging-service/target/
+/user-service/target/
 /frontend/build/
@@ -13,6 +13,8 @@ tags:
   - name: government
   - name: menu
   - name: index
+  - name: log
+  - name: user
 
 paths:
   /:
@@ -268,6 +270,7 @@ paths:
               description: Expiration date header
               schema:
                 type: string
+
   /{languageShortName}/api/admin/governments/menu:
     get:
       tags:
@@ -305,6 +308,169 @@ paths:
               schema:
                 type: string
 
+  /api/admin/logging-service/log:
+    get:
+      tags:
+        - log
+      summary: Get all logs
+      operationId: renderAllLogs
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/LoggingModel'
+        '400':
+          description: Bad request
+        '401':
+          description: Unauthorized
+        '403':
+          description: Forbidden
+        '404':
+          description: Log not found
+        '405':
+          description: Validation exception
+
+    post:
+      tags:
+        - log
+      summary: Add new log in a service
+      description: Add new log in a service and save to database
+      operationId: addNewLog
+      requestBody:
+        description: Create a new log and store it
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoggingNewModel'
+        required: true
+      responses:
+        '201':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/LoggingModel'
+        '405':
+          description: Invalid input
+
+  /api/admin/user-service/users:
+    get:
+      tags:
+        - user
+      summary: Get all Users
+      operationId: renderAllUsers
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/UserModel'
+        '400':
+          description: Bad request
+        '401':
+          description: Unauthorized
+        '403':
+          description: Forbidden
+        '404':
+          description: User not found
+        '405':
+          description: Validation exception
+
+    post:
+      tags:
+        - user
+      summary: Add new user in a service
+      description: Add new user in a service and save to database
+      operationId: addNewUser
+      requestBody:
+        description: Create a user and store it
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UserNewModel'
+        required: true
+      responses:
+        '201':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserModel'
+        '405':
+          description: Invalid input
+
+  /api/admin/user-service/users/{userId}:
+    get:
+      tags:
+        - user
+      summary: Get user by Id
+      operationId: renderUserById
+      parameters:
+        - name: userId
+          in: path
+          description: ID of the user to update
+          required: true
+          schema:
+            type: string
+            format: uuid
+          example: '3a8ea9f1-1a95-4caf-932f-2f988052933b'
+      responses:
+        '200':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserModel'
+        '400':
+          description: Bad request
+        '401':
+          description: Unauthorized
+        '403':
+          description: Forbidden
+        '404':
+          description: User not found
+        '405':
+          description: Validation exception
+
+    put:
+      tags:
+        - user
+      summary: Modify an existing user in a service
+      description: Modify an existing user in a service and save to database
+      operationId: modifyUserById
+      parameters:
+        - name: userId
+          in: path
+          description: ID of the user to update
+          required: true
+          schema:
+            type: string
+            format: uuid
+          example: '3a8ea9f1-1a95-4caf-932f-2f988052933b'
+      requestBody:
+        description: Create a user and store it
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UserModel'
+        required: true
+      responses:
+        '201':
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserModifyModel'
+        '405':
+          description: Invalid input
+
 components:
   schemas:
     RepresentativeAdminModel:
@@ -511,4 +677,104 @@ components:
         translationKey:
           type: string
         translationValue:
-          type: string
+          type: string
+
+    LoggingNewModel:
+      type: object
+      properties:
+        message:
+          type: string
+        level:
+          type: string
+        serviceName:
+          type: string
+      required:
+        - message
+        - level
+        - serviceName
+
+    LoggingModel:
+      type: object
+      properties:
+        id:
+          type: string
+        timestamp:
+          type: string
+        message:
+          type: string
+        level:
+          type: string
+        serviceName:
+          type: string
+
+    UserNewModel:
+      type: object
+      properties:
+        username:
+          type: string
+        password:
+          type: string
+        repeatPassword:
+          type: string
+        email:
+          type: string
+      required:
+        - username
+        - password
+        - repeatPassword
+        - email
+
+    UserModel:
+      type: object
+      properties:
+        id:
+          description: Id of the User
+          type: string
+          format: uuid
+          example: '3a8ea9f1-1a95-4caf-932f-2f988052933b'
+        createdAt:
+          description: Creation time of User entity
+          type: string
+          format: datetime
+          example: '2019-01-21T05:47:08.644'
+        updatedAt:
+          description: Updated time of User entity
+          type: string
+          format: datetime
+          example: '2019-01-21T05:47:08.644'
+        createdBy:
+          description: Admin id who created the User entity
+          type: string
+          format: uuid
+          example: '3a8ea9f1-1a95-4caf-932f-2f988052933b'
+        updatedBy:
+          description: User/Admin id who updated the User entity and with setting availability to DELETE, will achieve a soft delete
+          type: string
+          format: uuid
+          example: '3a8ea9f1-1a95-4caf-932f-2f988052933b'
+        username:
+          type: string
+        email:
+            type: string
+        role:
+          $ref: '#/components/schemas/Role'
+        availability:
+          $ref: '#/components/schemas/Availability'
+    UserModifyModel:
+      type: object
+      properties:
+        username:
+          type: string
+        email:
+          type: string
+        role:
+          $ref: '#/components/schemas/Role'
+        availability:
+          $ref: '#/components/schemas/Availability'
+
+    Role:
+      type: string
+      enum:
+        - ADMIN
+        - USER
+        - SUPER_ADMIN
@@ -28,3 +28,13 @@ spring.cloud.gateway.routes[1].filters[0]=SetPath=/
 spring.cloud.gateway.routes[2].id=discovery-server
 spring.cloud.gateway.routes[2].uri=http://localhost:8761
 spring.cloud.gateway.routes[2].predicates[0]=Path=/eureka/**
+
+# Logging Service Route:
+spring.cloud.gateway.routes[3].id=logging-service
+spring.cloud.gateway.routes[3].uri=lb://logging-service
+spring.cloud.gateway.routes[3].predicates[0]=Path=/api/admin/logging-service/**
+
+# User Service Route:
+spring.cloud.gateway.routes[4].id=user-service
+spring.cloud.gateway.routes[4].uri=lb://user-service
+spring.cloud.gateway.routes[4].predicates[0]=Path=/api/admin/user-service/**
@@ -12,6 +12,9 @@ logging.level.root=info
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
+# Set logging level for your service to DEBUG
+logging.level.com.csaba79coder.government.service=DEBUG
+
 server.port=0
 
 eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka