refactor(database): streamline model merging

[suchapalaver]

Another small thing I caught while familiarizing myself with the code, this removes the need to create an intermediate vector when merging models in database.

[coveralls]

Pull Request Test Coverage Report for Build 9199775762

Details

• 1 of 1 (100.0%) changed or added relevant line in 1 file are covered.
• 1 unchanged line in 1 file lost coverage.
• Overall coverage decreased (-0.04%) to 69.673%

---

Files with Coverage Reduction	New Missed Lines	%
common/src/tap/checks/deny_list_check.rs	1	93.64%

Totals
Change from base Build 9195779458:	-0.04%
Covered Lines:	3816
Relevant Lines:	5477

---

💛 - Coveralls

[aasseman]

🤔 I see the streamlining of merging the 2 bits of code in the global model case into 1. But I don't think the early return actually makes the code mode readable

[suchapalaver]

🤔 I see the streamlining of merging the 2 bits of code in the global model case into 1. But I don't think the early return actually makes the code mode readable

NBD, I guess it's personal; the need to mutate the variable in the original threw me when I first read it. But the intention here is to remove the need to collect twice - if it would matter in this case(?).

I've simplified things now, leaving the mut variable alone and using extend instead of collect twice.

[aasseman]

Yeah the double collect was a bit nasty

[aasseman]

Well merging this whole thing

indexer-rs/service/src/database.rs

Lines 122 to 139 in edd1a89

	models = models
	.into_iter()
	.map(|model| merge_global(model, &global_model))
	.collect();
	// Inject a cost model for all deployments that don't have one
	models = models
	.into_iter()
	.chain(
	deployments_without_models
	.into_iter()
	.map(|deployment| CostModel {
	deployment: deployment.to_owned(),
	model: global_model.model.clone(),
	variables: global_model.variables.clone(),
	}),
	)
	.collect();

into 1 was nice though

[suchapalaver]

Well merging this whole thing

indexer-rs/service/src/database.rs

Lines 122 to 139 in edd1a89

	models = models
	.into_iter()
	.map(|model| merge_global(model, &global_model))
	.collect();
	// Inject a cost model for all deployments that don't have one
	models = models
	.into_iter()
	.chain(
	deployments_without_models
	.into_iter()
	.map(|deployment| CostModel {
	deployment: deployment.to_owned(),
	model: global_model.model.clone(),
	variables: global_model.variables.clone(),
	}),
	)
	.collect();

into 1 was nice though

You got it!