Merge branch 'main' into feature/authorization-cache

digdir · Apr 9, 2024 · a96ca01 · a96ca01
2 parents b3de5eb + 02746c5
commit a96ca01
Show file tree

Hide file tree

Showing 102 changed files with 4,651 additions and 477 deletions.
diff --git a/.env b/.env
@@ -4,8 +4,4 @@ POSTGRES_PASSWORD=supersecret
 POSTGRES_DB=Dialogporten
 DB_CONNECTION_STRING=Server=dialogporten-postgres;Port=5432;Database=${POSTGRES_DB};User ID=${POSTGRES_USER};Password=${POSTGRES_PASSWORD};
 
-RABBITMQ_USER=guest
-RABBITMQ_PASSWORD=guest
-RABBITMQ_HOST=dialogporten-rabbitmq
-
 COMPOSE_PROJECT_NAME=digdir
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,19 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Related Issue(s)
+
+- #{issue number}
+
+## Verification
+
+- [ ] **Your** code builds clean without any errors or warnings
+- [ ] Manual testing done (required)
+- [ ] Relevant automated test added (if you find this hard, leave it and we'll help out)
+
+## Documentation
+
+- [ ] Documentation is updated (either in `docs`-directory, Altinnpedia or a separate linked PR in [altinn-studio-docs.](https://github.com/Altinn/altinn-studio-docs), if applicable)
diff --git a/.github/workflows/action-publish.yml b/.github/workflows/action-publish.yml
@@ -33,8 +33,6 @@ jobs:
             imageName: cdc
           - dockerfile: ./src/Digdir.Domain.Dialogporten.Infrastructure/MigrationBundle.dockerfile
             imageName: migration-bundle
-          - dockerfile: ./RabbitMq/Dockerfile
-            imageName: rabbitmq
 
     permissions:
       contents: read

diff --git a/RabbitMq/Dockerfile b/RabbitMq/Dockerfile
diff --git a/RabbitMq/enabled_plugins b/RabbitMq/enabled_plugins
diff --git a/docker-compose-no-webapi.yml b/docker-compose-no-webapi.yml
@@ -16,20 +16,6 @@ services:
       interval: 2s
       timeout: 20s
       retries: 5
-
-  dialogporten-rabbitmq:
-    build:
-      context: .
-      dockerfile: RabbitMq/Dockerfile
-    restart: always
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-    healthcheck:
-      test: [ "CMD-SHELL", "rabbitmq-diagnostics check_running" ]
-      interval: 5s
-      timeout: 20s
-      retries: 5
 
   dialogporten-redis:
     image: redis:6.0-alpine
@@ -50,14 +36,9 @@ services:
     depends_on:
       dialogporten-postgres:
         condition: service_healthy
-      dialogporten-rabbitmq:
-        condition: service_healthy
     environment:
       - Infrastructure:DialogDbConnectionString=${DB_CONNECTION_STRING}
       - ASPNETCORE_ENVIRONMENT=Development
-      - RabbitMq:Host=${RABBITMQ_HOST}
-      - RabbitMq:Username=${RABBITMQ_USERNAME}
-      - RabbitMq:Password=${RABBITMQ_PASSWORD}
 
   dialogporten-cdc:
     build:
@@ -67,14 +48,9 @@ services:
     depends_on:
       dialogporten-postgres:
         condition: service_healthy
-      dialogporten-rabbitmq:
-        condition: service_healthy
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - Infrastructure:DialogDbConnectionString=${DB_CONNECTION_STRING}
       - ReplicationSlotName=outboxmessage_replication_slot
       - PublicationName=outboxmessage_publication
       - TableName=OutboxMessage
-      - RabbitMq:Host=${RABBITMQ_HOST}
-      - RabbitMq:Username=${RABBITMQ_USERNAME}
-      - RabbitMq:Password=${RABBITMQ_PASSWORD}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,6 +25,7 @@ services:
     environment:
       - Infrastructure:Redis:ConnectionString=dialogporten-redis:6379
       - Infrastructure:DialogDbConnectionString=${DB_CONNECTION_STRING}
+      - Application:Dialogporten:BaseUri=http://localhost:7214
       - Serilog__WriteTo__0__Name=Console
       - Serilog__MinimumLevel__Default=Debug
       - ASPNETCORE_URLS=http://+:8080

diff --git a/docs/swagger/V1/swagger.verified.json b/docs/swagger/V1/swagger.verified.json
@@ -2200,13 +2200,15 @@
           "Title",
           "SenderName",
           "Summary",
-          "AdditionalInfo"
+          "AdditionalInfo",
+          "ExtendedStatus"
         ],
         "enum": [
           "Title",
           "SenderName",
           "Summary",
-          "AdditionalInfo"
+          "AdditionalInfo",
+          "ExtendedStatus"
         ]
       },
       "LocalizationDto": {
@@ -2511,7 +2513,6 @@
           "Information",
           "Error",
           "Closed",
-          "Seen",
           "Forwarded"
         ],
         "enum": [
@@ -2520,7 +2521,6 @@
           "Information",
           "Error",
           "Closed",
-          "Seen",
           "Forwarded"
         ]
       },
@@ -2602,6 +2602,12 @@
             "items": {
               "$ref": "#/components/schemas/SearchDialogContentDtoSO"
             }
+          },
+          "seenSinceLastUpdate": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SearchDialogDialogSeenRecordDtoSO"
+            }
           }
         }
       },
@@ -2620,6 +2626,31 @@
           }
         }
       },
+      "SearchDialogDialogSeenRecordDtoSO": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "guid"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endUserIdHash": {
+            "type": "string"
+          },
+          "endUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isCurrentEndUser": {
+            "type": "boolean",
+            "nullable": true
+          }
+        }
+      },
       "GetDialogDtoSO": {
         "type": "object",
         "additionalProperties": false,
@@ -2721,6 +2752,12 @@
             "items": {
               "$ref": "#/components/schemas/GetDialogDialogActivityDtoSO"
             }
+          },
+          "seenSinceLastUpdate": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/GetDialogDialogSeenRecordDtoSO"
+            }
           }
         }
       },
@@ -2961,6 +2998,31 @@
           }
         }
       },
+      "GetDialogDialogSeenRecordDtoSO": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "guid"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endUserIdHash": {
+            "type": "string"
+          },
+          "endUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isCurrentEndUser": {
+            "type": "boolean",
+            "nullable": true
+          }
+        }
+      },
       "CreateDialogCommand": {
         "type": "object",
         "additionalProperties": false,
@@ -3457,31 +3519,24 @@
           "status": {
             "$ref": "#/components/schemas/DialogStatus_Values"
           },
+          "latestActivity": {
+            "nullable": true,
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/SearchDialogDialogActivityDto"
+              }
+            ]
+          },
           "content": {
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/SearchDialogContentDto"
             }
           },
-          "latestActivities": {
+          "seenSinceLastUpdate": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/SearchDialogDialogActivityDto"
-            }
-          }
-        }
-      },
-      "SearchDialogContentDto": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "type": {
-            "$ref": "#/components/schemas/DialogContentType_Values"
-          },
-          "value": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/LocalizationDto"
+              "$ref": "#/components/schemas/SearchDialogDialogSeenRecordDto"
             }
           }
         }
@@ -3504,14 +3559,6 @@
             "format": "uri",
             "nullable": true
           },
-          "seenByEndUserIdHash": {
-            "type": "string",
-            "nullable": true
-          },
-          "seenActivityIsCurrentEndUser": {
-            "type": "boolean",
-            "nullable": true
-          },
           "type": {
             "$ref": "#/components/schemas/DialogActivityType_Values"
           },
@@ -3540,6 +3587,45 @@
           }
         }
       },
+      "SearchDialogContentDto": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "type": {
+            "$ref": "#/components/schemas/DialogContentType_Values"
+          },
+          "value": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LocalizationDto"
+            }
+          }
+        }
+      },
+      "SearchDialogDialogSeenRecordDto": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "guid"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endUserIdHash": {
+            "type": "string"
+          },
+          "endUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isCurrentEndUser": {
+            "type": "boolean"
+          }
+        }
+      },
       "GetDialogDto": {
         "type": "object",
         "additionalProperties": false,
@@ -3633,6 +3719,12 @@
             "items": {
               "$ref": "#/components/schemas/GetDialogDialogActivityDto"
             }
+          },
+          "seenSinceLastUpdate": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/GetDialogDialogSeenRecordDto"
+            }
           }
         }
       },
@@ -3847,10 +3939,6 @@
             "format": "uri",
             "nullable": true
           },
-          "seenByEndUserIdHash": {
-            "type": "string",
-            "nullable": true
-          },
           "type": {
             "$ref": "#/components/schemas/DialogActivityType_Values"
           },
@@ -3879,6 +3967,30 @@
           }
         }
       },
+      "GetDialogDialogSeenRecordDto": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "guid"
+          },
+          "createdAt": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "endUserIdHash": {
+            "type": "string"
+          },
+          "endUserName": {
+            "type": "string",
+            "nullable": true
+          },
+          "isCurrentEndUser": {
+            "type": "boolean"
+          }
+        }
+      },
       "Operation": {
         "type": "object",
         "additionalProperties": false,

diff --git a/enabled_plugins b/enabled_plugins