Merge pull request #5 from virtualidentityag/develop

Merge dev to staging
virtualidentityag · Sep 18, 2024 · 7aac4df · 7aac4df
2 parents 8500c03 + 68c2464
commit 7aac4df
Show file tree

Hide file tree

Showing 108 changed files with 344 additions and 4,413 deletions.
diff --git a/.github/workflows/dockerImage.yml b/.github/workflows/dockerImage.yml
@@ -10,7 +10,6 @@ on:
             - 'dockerImage.v.*'
             - 'v*'
 
-
 jobs:
     build:
         name: Build

diff --git a/cypress/fixtures/registration/agency.json b/cypress/fixtures/registration/agency.json
@@ -4,7 +4,6 @@
 	"postcode": "postcode",
 	"city": "city",
 	"description": "description",
-	"teamAgency": true,
 	"offline": false,
 	"consultingType": 1,
 	"topicIds": null

diff --git a/cypress/fixtures/registration/consultingType.json b/cypress/fixtures/registration/consultingType.json
@@ -19,12 +19,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -46,20 +44,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.agencies.json b/cypress/fixtures/service.agencies.json
@@ -5,7 +5,6 @@
 		"postcode": "postcode",
 		"city": "city",
 		"description": "description",
-		"teamAgency": true,
 		"offline": false,
 		"consultingType": 1,
 		"url": "url",

diff --git a/cypress/fixtures/service.consultingtypes.addiction.json b/cypress/fixtures/service.consultingtypes.addiction.json
@@ -19,12 +19,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -46,20 +44,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.emigration.json b/cypress/fixtures/service.consultingtypes.emigration.json
@@ -21,12 +21,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "rw-auswanderung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 1731
@@ -43,20 +41,12 @@
 	"sendFurtherStepsMessage": true,
 	"sendSaveSessionDataMessage": true,
 	"sessionDataInitializing": {},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": false,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.pregnancy.json b/cypress/fixtures/service.consultingtypes.pregnancy.json
@@ -19,13 +19,11 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": true,
-	"isAnonymousConversationAllowed": true,
 	"isVideoCallAllowed": true,
 	"isSetEmailAllowed": true,
 	"slug": "suchtberatung",
 	"languageFormal": true,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": true,
 		"whiteSpotAgencyId": 100
@@ -47,20 +45,12 @@
 		"relation": true,
 		"state": false
 	},
-	"initializeFeedbackChat": false,
 	"roles": {
 		"consultant": {
 			"main": ["consultant"],
 			"peer": ["consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"welcomeScreen": {
 		"anonymous": {

diff --git a/cypress/fixtures/service.consultingtypes.u25.json b/cypress/fixtures/service.consultingtypes.u25.json
@@ -23,12 +23,10 @@
 		}
 	},
 	"isSubsequentRegistrationAllowed": false,
-	"isAnonymousConversationAllowed": false,
 	"isSetEmailAllowed": false,
 	"slug": "u25",
 	"languageFormal": false,
 	"lockedAgencies": false,
-	"excludeNonMainConsultantsFromTeamSessions": false,
 	"whiteSpot": {
 		"whiteSpotAgencyAssigned": false
 	},
@@ -50,20 +48,12 @@
 		"relation": false,
 		"state": true
 	},
-	"initializeFeedbackChat": true,
 	"roles": {
 		"consultant": {
 			"main": ["consultant", "u25-consultant", "u25-main-consultant"],
 			"peer": ["consultant", "u25-consultant"]
 		}
 	},
-	"notifications": {
-		"teamSessions": {
-			"newMessage": {
-				"allTeamConsultants": false
-			}
-		}
-	},
 	"showAskerProfile": true,
 	"requiredComponents": {
 		"age": {

diff --git a/cypress/fixtures/service.users.data.json b/cypress/fixtures/service.users.data.json
@@ -13,7 +13,6 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 0
 			}
@@ -23,11 +22,9 @@
 			"AUTHORIZATION_VIEW_AGENCY_CONSULTANTS",
 			"AUTHORIZATION_ASSIGN_CONSULTANT_TO_SESSION"
 		],
-		"hasAnonymousConversations": false,
 		"consultingTypes": null,
 		"formalLanguage": true,
 		"absent": false,
-		"inTeamAgency": true,
 		"languages": [],
 		"emailToggles": [
 			{
@@ -37,10 +34,6 @@
 			{
 				"name": "NEW_CHAT_MESSAGE_FROM_ADVICE_SEEKER",
 				"state": true
-			},
-			{
-				"name": "NEW_FEEDBACK_MESSAGE_FROM_ADVICE_SEEKER",
-				"state": true
 			}
 		]
 	},
@@ -58,17 +51,14 @@
 				"postcode": "12345",
 				"city": "city",
 				"description": "description",
-				"teamAgency": true,
 				"offline": false,
 				"consultingType": 2
 			}
 		],
 		"grantedAuthorities": ["AUTHORIZATION_CONSULTANT_DEFAULT"],
-		"hasAnonymousConversations": false,
 		"consultingTypes": null,
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": true
+		"absent": false
 	},
 	{
 		"userId": "asker",
@@ -90,16 +80,13 @@
 					"postcode": "12345",
 					"city": "city",
 					"description": null,
-					"teamAgency": true,
 					"offline": false,
 					"consultingType": 1
 				}
 			},
 			"17": { "sessionData": null, "isRegistered": false, "agency": null }
 		},
-		"hasAnonymousConversations": false,
 		"formalLanguage": true,
-		"absent": false,
-		"inTeamAgency": false
+		"absent": false
 	}
 ]
diff --git a/cypress/fixtures/service.users.sessions.room.json b/cypress/fixtures/service.users.sessions.room.json
@@ -7,15 +7,11 @@
 		"postcode": "12345",
 		"language": "de",
 		"groupId": "someGroupId",
-		"feedbackGroupId": null,
-		"isPeerChat": false,
 		"askerRcId": "askerRcId",
 		"e2eLastMessage": null,
 		"lastMessage": null,
 		"messageDate": 0,
 		"messagesRead": false,
-		"feedbackRead": true,
-		"isTeamSession": false,
 		"registrationType": "REGISTERED",
 		"createDate": "2022-06-15T08:09:18Z",
 		"attachment": null,

diff --git a/cypress/support/commands/mockApi.ts b/cypress/support/commands/mockApi.ts
@@ -38,10 +38,6 @@ const defaultReturns = {
 			{
 				name: 'NEW_CHAT_MESSAGE_FROM_ADVICE_SEEKER',
 				state: false
-			},
-			{
-				name: 'NEW_FEEDBACK_MESSAGE_FROM_ADVICE_SEEKER',
-				state: false
 			}
 		]
 	},

diff --git a/cypress/support/sessions.ts b/cypress/support/sessions.ts
@@ -2,7 +2,6 @@ import { v4 as uuid } from 'uuid';
 import { SESSION_LIST_TYPES } from '../../src/components/session/sessionHelpers';
 import {
 	ListItemInterface,
-	SessionItemInterface,
 	SessionUserDataInterface
 } from '../../src/globalState/interfaces';
 
@@ -43,15 +42,10 @@ export const generateConsultantSession = ({
 			status,
 			postcode: 12345,
 			groupId: rcGroupId,
-			feedbackGroupId: null,
 			askerRcId: 'askerRcId',
 			lastMessage: 'lastMessage',
 			messageDate: 1606900238,
 			messagesRead: messagesRead === undefined ? true : messagesRead,
-			feedbackRead: true,
-			isTeamSession: true,
-			isFeedbackSession: false,
-			isPeerChat: false,
 			attachment: null,
 			registrationType: 'REGISTERED',
 			e2eLastMessage: {
@@ -90,11 +84,9 @@ export const generateMultipleConsultantSessions = (amount: number): void => {
 };
 
 export const generateAskerSession = ({
-	messagesRead,
-	isTeamSession
+	messagesRead
 }: {
 	messagesRead?: boolean;
-	isTeamSession?: boolean;
 } = {}): ListItemInterface => {
 	const sessionId = Math.random();
 	const rcGroupId = uuid();
@@ -112,15 +104,10 @@ export const generateAskerSession = ({
 			status: 2,
 			postcode: 12345,
 			groupId: rcGroupId,
-			feedbackGroupId: 'feedbackGroupId1',
 			askerRcId: 'askerRcId1',
 			lastMessage: null,
 			messageDate: null,
 			messagesRead: messagesRead === undefined ? true : messagesRead,
-			feedbackRead: null,
-			isTeamSession: isTeamSession === undefined ? true : isTeamSession,
-			isFeedbackSession: false,
-			isPeerChat: false,
 			attachment: null,
 			registrationType: 'REGISTERED',
 			e2eLastMessage: {
@@ -141,7 +128,6 @@ export const generateAskerSession = ({
 			postcode: '12345',
 			city: 'city',
 			description: null,
-			teamAgency: true,
 			offline: false,
 			consultingType: 1
 		},

diff --git a/src/api/apiAnonymousConversationAvailability.ts b/src/api/apiAnonymousConversationAvailability.ts
diff --git a/src/api/apiEnquiryAcceptance.ts b/src/api/apiEnquiryAcceptance.ts
@@ -1,13 +1,8 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { fetchData, FETCH_ERRORS, FETCH_METHODS } from './fetchData';
 
-export const apiEnquiryAcceptance = async (
-	sessionId: number,
-	isAnonymousEnquiry: boolean = false
-): Promise<any> => {
-	const url = isAnonymousEnquiry
-		? `${endpoints.anonymousAskerBase}${sessionId}/accept`
-		: `${endpoints.sessionBase}/new/${sessionId}`;
+export const apiEnquiryAcceptance = async (sessionId: number): Promise<any> => {
+	const url = `${endpoints.sessionBase}/new/${sessionId}`;
 
 	return fetchData({
 		url: url,
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ on: @@
                 - 'dockerImage.v.*'
                 - 'v*'
     jobs:
         build:
             name: Build
@@ Expand Down @@