ghostfolio

Commit Graph

Author	SHA1	Message	Date
Thomas Kaul	f06a0fbbee	Feature/validate duplicate orders for import (#416 ) * Validate duplicate orders * Update changelog	3 years ago
Thomas Kaul	4ab6a1a071	Feature/harmonize page layouts (#417 ) * Harmonize page layouts * Update changelog	3 years ago
Thomas Kaul	93dcbeb6c7	Feature/add validation for import (#415 ) * Valid data types * Maximum number of orders * Data provider service returns data for the dataSource / symbol pair	3 years ago
Valentin Zickner	f308ae7a13	add sectors and countries for ETFs (#410 ) * Update changelog Co-Authored-By: Valentin Zickner <valentin@coderworks.de> Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas Kaul	15a61b7a20	Feature/improve values of global heat map (#408 ) * Convert value * Update changelog	3 years ago
Thomas Kaul	d1eedf9726	Bugfix/various fixes (#407 ) * Fix links * Update column * Fix impersonation mode * Update changelog	3 years ago
Thomas Kaul	de94494aa0	Bugfix/fix symbol conversion for yahoo finance (#405 ) * Fix symbol conversion for Yahoo Finance * Update changelog	3 years ago
Thomas Kaul	3ec4a73b35	Feature/improve tooltips (#403 ) * Improve tooltips * Update changelog	3 years ago
Thomas Kaul	1050bfa098	Feature/improve yahoo finance symbol conversion (#402 ) * Improve symbol conversion * Update changelog	3 years ago
Thomas Kaul	8769fe4c90	Improve styling (#399 )	3 years ago
Thomas Kaul	4219e1121e	Improve style (#398 )	3 years ago
Thomas Kaul	f558eb8de8	Fix template (#397 )	3 years ago
Thomas Kaul	fe2bd6eea8	Feature/protect endpoints (#396 ) * Protect endpoints * Update changelog	3 years ago
Thomas Kaul	035052be99	Feature/improve exchange rates table (#394 ) * Improve exchange rates table * Update changelog	3 years ago
Thomas Kaul	39d9828f9f	Feature/respect account currency in exchange rate data service (#391 ) * Respect the accounts' currencies * Update changelog	3 years ago
Thomas Kaul	6333aa972d	Bugfix/fix data gathering after seed (#390 ) * Fix data gathering after seed * Update changelog	3 years ago
Thomas Kaul	dcee651098	Feature/support unlimited currencies (#387 ) * Support unlimited currencies * Update changelog	3 years ago
Thomas Kaul	508a48f4c3	Feature/hide actions in presenter view (#380 ) * Hide actions if restricted view is active * Update changelog	3 years ago
Thomas Kaul	8466e3d73f	Feature/always show adapted portfolio page (#388 ) * Always show adapted portfolio page * Update changelog	3 years ago
Thomas Kaul	9ae9904389	Feature/add story for line chart component (#385 ) * Add story for line chart component * Update changelog	3 years ago
Thomas Kaul	af022ae316	Feature/add story for portfolio proportion chart component (#384 ) * Add story * Use new component * Update changelog	3 years ago
Thomas Kaul	98be8745d9	Bugfix/fix create or edit transaction dialog (#382 ) * Fix create or edit transaction dialog * Update changelog	3 years ago
Thomas Kaul	0f72673ef4	Feature/respect data source in symbol data endpoint (#370 ) * Respect data source in symbol data endpoint * Respect data source in the data provider service * Combine symbol with data source in get() of data provider service * Improve search functionality for multiple data sources * Update changelog	3 years ago
Thomas Kaul	641fe4e8f4	Bugfix/net performance in positions endpoint (#377 ) * Nullify net performance * Update changelog	3 years ago
Thomas Kaul	5b588c2000	Bugfix/hide the current net performance (#373 ) * Hide the current net performance * Update changelog	3 years ago
Thomas Kaul	4a815d2031	Feature/change data gathering selection (#368 ) * Change data gathering selection from distinct orders to symbol profiles * Update changelog	3 years ago
Valentin Zickner	d2aeeb3e88	optimize annual performance calculation (#367 ) * Optimize annual performance calculation * Update changelog Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas Kaul	5ea455b98b	Feature/upgrade simplewebauthn dependencies to version 4.1.0 (#365 ) * Upgrade @simplewebauthn dependencies to version 4.1.0 * @simplewebauthn/browser * @simplewebauthn/server * Update changelog	3 years ago
Thomas Kaul	39f315aba0	Feature/add annualized performance (#364 ) * Add annualized performance * Update changelog	3 years ago
Thomas Kaul	df2dfc20a1	Feature/add slack channel (#363 ) * Add Slack channel * Update changelog	3 years ago
Thomas Kaul	5d4156ecec	Feature/refactor position detail dialog (#355 ) * Add name to portfolio position endpoint * Update changelog	3 years ago
Thomas Kaul	773444b1e2	Bugfix/fix home button overlap on ios (#360 ) * Fix overlap * Update changelog	3 years ago
Thomas Kaul	3c46bde8d5	Bugfix/fix fear and greed index (#359 ) * Fix fear and greed index * Refactor fear and greed index symbol * GF.FEAR_AND_GREED_INDEX -> _GF_FEAR_AND_GREED_INDEX * Update changelog	3 years ago
Matthias Frey	63ee33b685	Use 'import type' to import types, eliminate webpack warnings (#358 )	3 years ago
Thomas Kaul	9ed82ac82b	Feature/improve labels of allocation chart by symbol (#353 ) * Improve labels * Update changelog	3 years ago
Ivo Valchev	9c9ca4ab1e	Add labels to allocation piecharts (#337 )	3 years ago
Thomas Kaul	9cbf789c22	Bugfix/fix values in position detail dialog (#351 ) * Nullify netPerformance * Introduce precision * Update changelog	3 years ago
Thomas Kaul	ee5ab05d8a	Release 1.47.1 (#350 )	3 years ago
Thomas Kaul	bf8856ad19	Bugfix/fix search for cryptocurrencies (#348 ) * Fix the search for cryptocurrency symbols * Update changelog	3 years ago
Valentin Zickner	48ab862bb6	net performance for current positions (#330 ) * implement fees for transaction points #324 * add net performance to current positions #324 * add net performance to calculate timeline #324 * make timeline fee accumulated by default #324 * Update changelog Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas Kaul	ba234a470e	Feature/add storybook story for trend indicator component (#346 ) * Add storybook story for trend indicator component * Update changelog	3 years ago
Thomas Kaul	ccae660104	Feature/add storybook story for no transactions info component (#345 ) * Add storybook story for no transactions info component * Update changelog	3 years ago
Thomas Kaul	21ed91d184	Feature/add storybook story for logo component (#344 ) * Add storybook story for logo component * Update changelog	3 years ago
Thomas Kaul	5fd413e57e	Feature/setup storybook (#332 ) * Setup ui library with storybook * Add value component with story * Update changelog	3 years ago
Thomas Kaul	4c194c938a	Feature/add contributors count to statistics (#342 ) * Add contributors count to statistics * Update changelog	3 years ago
Thomas Kaul	747e5b63fa	Feature/restructure allocations page including allocations by symbol (#333 ) * Restructure allocations page * Update changelog	3 years ago
Ivo Valchev	b1187cf880	Add a new symbol allocation chart (#326 ) * Add a new symbol allocation chart * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas Kaul	ba9e6eab58	Feature/add link to transactions below holdings (#329 ) * Add link: Manage transactions * Update changelog	3 years ago
Ivo Valchev	01feead017	Show decimal `transactionCount` and singular for 1 transaction (#327 ) * Show decimal `transactionCount` and singular for 1 transaction * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas Kaul	6386786ac0	Bugfix/improve symbol lookup (#322 ) * Improve symbol lookup * Update changelog	3 years ago
Thomas Kaul	73a967a7e5	Feature/add cash as asset sub class (#319 ) * Add cash as asset sub class * Update changelog	3 years ago
Thomas Kaul	c5bb3023d3	Bugfix/filter out positions without quantity (#317 ) * Filter out positions without any quantity * Update changelog	3 years ago
Thomas Kaul	fe975945d1	Feature/add fallback for loading currencies (#315 ) * Add fallback for loading currencies * Update changelog	3 years ago
Thomas Kaul	d8782b0d4c	Feature/automate countries for stocks in symbol profile data (#314 ) * Automate countries for stocks in symbol profile data * Update changelog	3 years ago
Thomas Kaul	72c065a59d	Feature/introduce asset sub class (#312 ) * Introduce asset sub class * Update changelog	3 years ago
Thomas Kaul	98dac4052a	Feature/add subscription type to the admin user table (#311 ) * Add the subscription type to the user table in the admin control panel * Update changelog	3 years ago
Thomas Kaul	2083d28d02	Feature/minor improvements in the page components (#310 ) * Move permissions to constructor * Sort imports	3 years ago
Thomas Kaul	aad8f77093	Feature/improve allocations by account (#308 ) * Improve allocations by account * Eliminate accounts from PortfolioPosition * Ignore cash assets in the allocation chart by sector, continent and country * Add missing accounts to portfolio details * Update changelog	3 years ago
Thomas Kaul	a904208d06	Feature/improve table styling (#307 ) * Improve table styling * Update changelog	3 years ago
Thomas Kaul	2733b78044	Minor improvement (#306 )	3 years ago
Thomas Kaul	b43b515df1	Feature/add link to system status page (#305 ) * Add link to system status page * Update changelog	3 years ago
Thomas Kaul	70e14b4d3c	Feature/improve restricted view mode (#304 ) * Improve wording and padding * Update changelog	3 years ago
Thomas Kaul	c2ab6a6c44	Feature/improve portfolio details endpoint (#302 ) * Make details endpoint fault tolerant (do not throw error) * Update changelog	3 years ago
Thomas Kaul	c71a4c078e	Bugfix/convert g bp to gbp in yahoo finance service (#301 ) * Fix currency inconsistency in the yahoo finance service (GBp to GBP) * Update changelog	3 years ago
Thomas Kaul	e17b217032	Bugfix/fix issue on buy date in position detail dialog (#297 ) * Fix issue on buy date * Update changelog	3 years ago
Thomas Kaul	05b0efef82	Feature/add restricted view (#295 ) * Add restricted view * Update changelog	3 years ago
Thomas Kaul	7c91727eb1	Feature/restructure allocations page (#294 ) * Restructure allocations page * Update changelog	3 years ago
Thomas Kaul	0ee2258af8	Feature/improve impersonation mode (#293 ) * Improve the impersonation mode * Update changelog	3 years ago
Valentin Zickner	308b218487	introduce basic module structure for data provider (#278 ) * introduce basic module structure for data provider * introduce DataGatheringModule * introduce ExchangeRateDataModule * introduce ImpersonationModule * move RulesService * cleanup portfolio module * Sort imports Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas	77936e3bf3	Feature/improve users table (#291 ) * Improve users table * Engagement / Day * Registration * Update changelog	3 years ago
Thomas	13090bf6b5	Feature/add overview menu item on mobile (#290 ) * Add overview menu item * Update changelog	3 years ago
Thomas	b898c0678d	Feature/refactor exchange rate service (#289 ) * Refactor exchange rate service * Update changelog	3 years ago
Thomas	96a615dc5d	Bugfix/only allow supported currencies in symbol search (#287 ) * Only allow supported currencies in symbol search * Update changelog	3 years ago
Thomas	98f44323da	Feature/improve usability of tabs on home page (#283 ) * Improve usability: lazy load endpoints on tab change * Feature/improve portfolio summary (#285) * Update changelog	3 years ago
Thomas	908aba170d	Fix position chart for missing historical data (#284 ) * Fix position chart for missing historical data * Update changelog	3 years ago
Thomas	8ac1272a9d	Feature/eliminate name from scraper config (#277 ) * Eliminate name from scraper config * Update changelog	3 years ago
Thomas	0a85a56c67	Respect cash balance in allocations, do not hide cryptocurrency holdings (#280 ) * Respect cash balance in allocations, do not hide cryptocurrency holdings * Update changelog	3 years ago
Thomas	4ad5590838	Feature/improve data gathering (#276 ) * Improve data gathering * Refactoring * On server restart, only reset if hanging in LOCKED_DATA_GATHERING state * Update changelog	3 years ago
Thomas	80d043729d	Feature/replace type with asset class (#274 ) * Improved the asset classification * Add assetClass to symbolProfile * Remove type from position * Update changelog	3 years ago
Thomas	178166d86b	Extend investment chart by three months (#273 )	3 years ago
Thomas	37358fb480	Bugfix/add fallback if exchange service is not initialized (#264 ) * Add fallback and log error * Update changelog	3 years ago
Thomas	616d601cf6	Improve wording (#275 )	3 years ago
Thomas	e88b889fdd	Feature/optimize accounts table for mobile (#271 ) * Optimize accounts table * Update changelog	3 years ago
Thomas	f6cdc4ff47	Feature/disable pagination of tabs (#272 ) * Disable pagination * Update changelog	3 years ago
Thomas	3589e72aea	Harmonize prisma service (#266 )	3 years ago
Thomas	e68aa1fa68	Clean up imports (#267 )	3 years ago
Thomas	bb76ace95d	Feature/improve support for draft transactions (#265 ) * Improve support for draft transactions * Update changelog	3 years ago
Thomas	f743c03e17	Feature/restructure page hierarchy (#259 ) * Introduce portfolio group, remove tools * Extract allocations to separate page * Update changelog	3 years ago
Valentin Zickner	dfcf826b4f	implement support for buy-sell(-buy) scenario (#262 ) Co-authored-by: Valentin Zickner <github@zickner.ch>	3 years ago
Valentin Zickner	218efbb5bd	fix position diagram for sold items (#261 ) * fix position diagram for sold items * Add missing data to position from the past * Update changelog Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Valentin Zickner	ba3b4564cd	Bugfix/dashboard currencies (#260 ) * filter list of orders only for relevant orders * Update changelog Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Valentin Zickner	bf256ae50c	fix position currency conversion (#256 ) Co-authored-by: Valentin Zickner <github@zickner.ch>	3 years ago
Thomas	c4b6273886	Clean up viewport scroller (#255 )	3 years ago
Thomas	7f047362cc	Bugfix/fix division by zero in calculate overall gross performance (#253 ) * Fix error with division by zero * Update changelog	3 years ago
Thomas	94d2310217	Bugfix/fix spike of positions with differing currency of user (#248 ) * Convert market price back to currency of position * Update changelog	3 years ago
Thomas	b7d950f3f9	Bugfix/fix missing market state in positions (#250 ) * Fix missing market state in positions * Update changelog	3 years ago
Thomas	b7943889da	Feature/add screenshot (#251 ) * Add screenshot * Update changelog	3 years ago
Thomas	4bd41ffa41	Feature/eliminate name from timeline position (#245 ) * Eliminate name from timeline position: Get the name from the symbolProfileService instead * Update changelog	3 years ago
Thomas	423ceec317	Feature/remove symbol icon from dialog header (#244 ) * Remove symbol icon from dialog header * Clean up code	3 years ago
Valentin Zickner	5b4a1785ae	fix investment values for portfolio.service.ts (#243 ) * fix investment values for portfolio.service.ts * Update changelog Co-authored-by: Valentin Zickner <github@zickner.ch> Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas	823501f43e	Sort imports (#242 )	3 years ago
Valentin Zickner	331ac7ded2	remove unused method in portfolio.service.ts (#240 ) Co-authored-by: Valentin Zickner <github@zickner.ch>	3 years ago
Valentin Zickner	982ba7377a	remove legacy portfolio.ts	3 years ago
Valentin Zickner	4bbd17a37a	fix tests	3 years ago
Thomas	6a7def6c48	Clean up	3 years ago
Thomas	ea219f0b88	Add guard	3 years ago
Valentin Zickner	23b2e03923	refactor rule evaluation	3 years ago
Valentin Zickner	04e6518226	move report generation to PortfolioService	3 years ago
Valentin Zickner	72dbe00091	change rule service interface	3 years ago
Valentin Zickner	9834c52739	refactor rule settings	3 years ago
Thomas	c47578bd3e	Clean up	3 years ago
Thomas	9e4a49d811	Remove fallback	3 years ago
Thomas	a3a98c68a5	Fix missing currency conversion	3 years ago
Thomas	21570cca19	Fix impersonation in performance endpoint	3 years ago
Valentin Zickner	71a3115fc6	refactor get position endpoint Co-authored-by: Thomas <dotsilver@gmail.com>	3 years ago
Valentin Zickner	de83dc7b84	create investment endpoint for analysis timeline Co-authored-by: Thomas <dotsilver@gmail.com>	3 years ago
Valentin Zickner	4a0695613e	refactor PortfolioService#getOverview Co-authored-by: Thomas <dotsilver@gmail.com>	3 years ago
Valentin Zickner	328d814922	remove getPerformance from portfolio.ts Co-authored-by: Thomas <dotsilver@gmail.com>	3 years ago
Valentin Zickner	d23addb673	change getDetails to portfolio-calculator.ts Co-authored-by: Thomas <dotsilver@gmail.com>	3 years ago
Thomas	fb15cebb64	Add test (#237 ) * Add test * fix calculation for overall gross performance percentage Co-authored-by: Valentin Zickner <github@zickner.ch>	3 years ago
Valentin Zickner	9c51a257ae	fix performance of combination of investments	3 years ago
Thomas	f9b9dc32cb	Always show positions title	3 years ago
Thomas	e7194ef3ce	Use new positions service	3 years ago
Thomas	ec5523b459	Handle empty portfolio	3 years ago
Thomas	c8c21a016a	Handle empty portfolio	3 years ago
Thomas	9821b7f8f0	Add TWR test scenario 1 (#236 ) * Add TWR test scenario 1 * fix second transaction item * change time-weighted rate algorithm Co-authored-by: Valentin Zickner <valentin.zickner@flowable.com>	3 years ago
Valentin Zickner	ed731afc66	fix market price fetch in case symbols are missing	3 years ago
Thomas	ff15d5cbc4	Rename performance labels	3 years ago
Thomas	3c4949de35	Hide net performance	3 years ago
Thomas	bd0e53525b	Refactoring	3 years ago
Thomas	cbdb68e2f8	Refactoring	3 years ago
Thomas	8571709014	Refactoring	3 years ago
Thomas	e7ef1d426e	Refactoring	3 years ago
Thomas	39cba0a8eb	Refactoring	3 years ago
Thomas	a90c314e30	Refactoring	3 years ago
Thomas	47d71405e1	Refactoring	3 years ago
Thomas	5e9cecc6c1	Refactoring	3 years ago
Thomas	fb9e66318f	Improve test	3 years ago
Thomas	b8194eb64f	Clean up code	3 years ago
Thomas	cbb81916ee	Sort imports	3 years ago
Valentin Zickner	9b1e9397a8	add errors in case gross performance is not set	3 years ago
Valentin Zickner	b779964adb	add error handling to performance aggregation	3 years ago
Valentin Zickner	409afac2a9	fix rate conversion for todays symbols	3 years ago
Thomas	e0a4e16ea1	Improve error handling	3 years ago
Valentin Zickner	dc84abdc0a	change performance report to portfolio calculator	3 years ago
Valentin Zickner	b031b028f1	add today to getValues	3 years ago
Valentin Zickner	3b7e0a0106	remove unnecessary if condition	3 years ago
Valentin Zickner	ea66081073	move interfaces to separate files	3 years ago
Valentin Zickner	602a770a09	fix typo	3 years ago
Thomas	e522722aa6	Update comment	3 years ago
Valentin Zickner	03ca5d7663	add further tests for portfolio-calculator with one transaction	3 years ago
Valentin Zickner	136563c949	fix single buy test	3 years ago
Thomas	948c45c602	Update test	3 years ago
Thomas	e0be792e46	Re-enable all tests	3 years ago
Thomas	c3d010135f	Add test for single buy	3 years ago
Thomas	d6a16a6093	Improve error handling	3 years ago
Valentin Zickner	34c13c80ec	add error handling for current positions	3 years ago
Valentin Zickner	f65a108436	change hardcoded timestamp in test to timezone specific	3 years ago
Valentin Zickner	993f066e08	remove console.time statements during portfolio calls	3 years ago
Valentin Zickner	852902d1ab	add current position calculation with holding period return calculation	3 years ago
Thomas	ee89822bfe	Fix tests	3 years ago
Thomas	e0435e5cad	Add name to position	3 years ago
Thomas	e2c23703dc	Fix tests	3 years ago
Thomas	1226c26a9d	Refactor positions	3 years ago
Valentin Zickner	fdc89f7182	optimize performance of positions endpoint	3 years ago
Valentin Zickner	04e03bd080	add multi-date fetch for current values	3 years ago
Valentin Zickner	66e7ad3fd2	prepare for multi-day database fetch	3 years ago
Thomas	b4dc21dd61	Implement new positions endpoint	3 years ago
Valentin Zickner	8a482e63b9	fix gross performance number type	3 years ago
Valentin Zickner	aabfb39e8f	optimize portfolio calculator to fetch all symbols for one day	3 years ago
Valentin Zickner	cdc8faff7f	add current position gross performance (percentage)	3 years ago
Valentin Zickner	7b696e39de	add sorting and symbol as a result	3 years ago
Valentin Zickner	c88ad2c225	change getValues to multiple symbols	3 years ago
Valentin Zickner	cbe079ae66	ignore missing values	3 years ago
Valentin Zickner	8e4ee7feea	optimize order loading	3 years ago
Valentin Zickner	f1b3c61675	add additional time measurements	3 years ago
Thomas	24dc312367	Add logs to benchmark	3 years ago
Thomas	7ac7442f73	Declare functions explicitly as public	3 years ago
Thomas	099571437e	Extend current rate service with getRange()	3 years ago
Thomas	7dac059a55	Sort imports	3 years ago
Thomas	48fbeda72d	Sort imports	3 years ago
Thomas	19007cdc34	Optimize market data query	3 years ago
Thomas	5037393866	Support today in current rate service	3 years ago
Valentin Zickner	ddf24163b4	optimize database query execution for portfolio chart	3 years ago
Valentin Zickner	b26521c4bd	add workaround for database date search	3 years ago
Valentin Zickner	cfee6c1ddd	add draft integration of new portfolio calculator to chart	3 years ago
Valentin Zickner	19bcd601d1	add gross performance	3 years ago
Valentin Zickner	836df69e68	add calculation of current investment	3 years ago
Valentin Zickner	dd86adcea1	add investment to timeline calculation	3 years ago
Valentin Zickner	4f7628921d	add timeline time point calculation	3 years ago
Valentin Zickner	88f0cb095d	make it pretty	3 years ago
Valentin Zickner	7538133d09	implement getCurrentPositions of PortfolioCalculator	3 years ago
Thomas	67606e4026	Extend current rate service test	3 years ago
Valentin Zickner	9de56c32ac	create base structure for portfolio rewrite Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	3 years ago
Thomas	1c65599a16	Feature/add blog (#218 ) * Setup blog * Add german blog post * Add english blog post * Update changelog	3 years ago
Thomas	61e667213e	Feature/add date range selector to positions tab (#234 ) * Add date range selector * Update changelog	3 years ago
Thomas	f0c6517019	Improve tabs layout (#232 )	3 years ago
Thomas	80ba112bc0	Feature/change menu icon if menu open (#231 ) * Change menu icon * Update changelog	3 years ago
Thomas	40696b425e	Feature/add tabs on the home page (#230 ) * Add tabs * Update changelog	3 years ago
Thomas	cdcbe3ab71	Feature/various layout improvements (#224 ) * Various layout improvements * Update changelog	3 years ago

... 2 3 4 5 6 ...

493 Commits (dcc7ef89fe1141a420b674bcf391c5a4935406b7)