Did David bring the ark to Jerusalem before or after he defeated the Philistines?

When the Philistines heard that David had been anointed king, they came up against him; David defeated them twice, as far as Gazer.

But when the Philistines heard that they had anointed David king over Israel, all the Philistines came up to seek David; and David heard of it, and went down to the hold. The Philistines also came and spread themselves in the valley of Rephaim. And David enquired of the Lord, saying, Shall I go up to the Philistines? wilt thou deliver them into mine hand? And the Lord said unto David, Go up: for I will doubtless deliver the Philistines into thine hand. And David came to Baal–perazim, and David smote them there, and said, The Lord hath broken forth upon mine enemies before me, as the breach of waters. Therefore he called the name of that place Baal–perazim. And there they left their images, and David and his men burned them. And the Philistines came up yet again, and spread themselves in the valley of Rephaim. …

David set out to bring up the ark; Uzzah died on the way; after three months with Obed-edom the ark was brought into the city of David.

Again, David gathered together all the chosen men of Israel, thirty thousand. And David arose, and went with all the people that were with him from Baale of Judah, to bring up from thence the ark of God, whose name is called by the name of the Lord of hosts that dwelleth between the cherubims. And they set the ark of God upon a new cart, and brought it out of the house of Abinadab that was in Gibeah: and Uzzah and Ahio, the sons of Abinadab, drave the new cart. And they brought it out of the house of Abinadab which was at Gibeah, accompanying the ark of God: and Ahio went before the ark. And David and all the house of Israel played before the Lord on all manner of instruments made of fir wood, even on harps, and on psalteries, and on timbrels, and on cornets, and on cymbals. And when they came to Nachon’s threshingfloor, Uzzah put forth his hand to the ark of God, and took hold of it; for the oxen shook it. …

David consulted the leaders and set out to fetch the ark from Kirjath-jearim; after Uzza’s death it stayed three months with Obed-edom.

And David consulted with the captains of thousands and hundreds, and with every leader. And David said unto all the congregation of Israel, If it seem good unto you, and that it be of the Lord our God, let us send abroad unto our brethren every where, that are left in all the land of Israel, and with them also to the priests and Levites which are in their cities and suburbs, that they may gather themselves unto us: And let us bring again the ark of our God to us: for we enquired not at it in the days of Saul. And all the congregation said that they would do so: for the thing was right in the eyes of all the people. So David gathered all Israel together, from Shihor of Egypt even unto the entering of Hemath, to bring the ark of God from Kirjath–jearim. And David went up, and all Israel, to Baalah, that is, to Kirjath–jearim, which belonged to Judah, to bring up thence the ark of God the Lord, that dwelleth between the cherubims, whose name is called on it. …

“when the Philistines heard that David was anointed king over all Israel”, they came up; David defeated them from Gibeon to Gazer.

And when the Philistines heard that David was anointed king over all Israel, all the Philistines went up to seek David. And David heard of it, and went out against them. And the Philistines came and spread themselves in the valley of Rephaim. And David enquired of God, saying, Shall I go up against the Philistines? and wilt thou deliver them into mine hand? And the Lord said unto him, Go up; for I will deliver them into thine hand. So they came up to Baal–perazim; and David smote them there. Then David said, God hath broken in upon mine enemies by mine hand like the breaking forth of waters: therefore they called the name of that place Baal–perazim. And when they had left their gods there, David gave a commandment, and they were burned with fire. And the Philistines yet again spread themselves abroad in the valley. …

David prepared a place and pitched a tent for the ark, and gathered all Israel to bring it up to Jerusalem.

And David made him houses in the city of David, and prepared a place for the ark of God, and pitched for it a tent. Then David said, None ought to carry the ark of God but the Levites: for them hath the Lord chosen to carry the ark of God, and to minister unto him for ever. And David gathered all Israel together to Jerusalem, to bring up the ark of the Lord unto his place, which he had prepared for it.