Browse Source
			
			
			Feature/improve check for duplicates in preview step of activities import (comments) (#4498)
			
				* Improve check for duplicates in preview step of activities import (comments)
* Update changelog
			
			
				pull/4507/head
			
			
		 
		
			
				
					
						
						Marcin Szymański
					
					7 months ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: B5690EEEBB952194
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
2 additions and 
0 deletions
			 
			
		 
		
			
				- 
					
					
					 
					CHANGELOG.md
				
 
			
				- 
					
					
					 
					apps/api/src/app/import/import.service.ts
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					### Changed | 
					 | 
					 | 
					### Changed | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					- Improved the check for duplicates in the preview step of the activities import (allow different comments) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					- Improved the language localization for German (`fr`) | 
					 | 
					 | 
					- Improved the language localization for German (`fr`) | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					- Upgraded `ng-extract-i18n-merge` from version `2.14.1` to `2.14.3` | 
					 | 
					 | 
					- Upgraded `ng-extract-i18n-merge` from version `2.14.1` to `2.14.3` | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -519,6 +519,7 @@ export class ImportService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        const isDuplicate = existingActivities.some((activity) => { | 
					 | 
					 | 
					        const isDuplicate = existingActivities.some((activity) => { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					          return ( | 
					 | 
					 | 
					          return ( | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            activity.accountId === accountId && | 
					 | 
					 | 
					            activity.accountId === accountId && | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            activity.comment === comment && | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            activity.SymbolProfile.currency === currency && | 
					 | 
					 | 
					            activity.SymbolProfile.currency === currency && | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            activity.SymbolProfile.dataSource === dataSource && | 
					 | 
					 | 
					            activity.SymbolProfile.dataSource === dataSource && | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            isSameSecond(activity.date, date) && | 
					 | 
					 | 
					            isSameSecond(activity.date, date) && | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |