Skip to content

merge dev into master #1203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atalyaalon merged 2 commits into from
Jun 26, 2025
Merged

merge dev into master #1203

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc53d7f
modify to query params
atalyaalon Jun 26, 2025
41f8732
Merge pull request #1202 from data-for-change/1195-refactor-query-params
atalyaalon Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/services/news.data.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,30 @@ export const updateNews = async (
streetLocation: IStreetData | null,
gpsLocation: IGpsData | null
): Promise<any> => {
const payload: any = {
// Construct query params
const queryParams: any = {
newsflash_location_qualification: newLocationQualification,
};

if (gpsLocation) {
payload.road_segment_id = gpsLocation.road_segment_id;
payload.road1 = gpsLocation.road1;
queryParams.road_segment_id = gpsLocation.road_segment_id;
queryParams.road1 = gpsLocation.road1;
} else if (streetLocation) {
payload.yishuv_name = streetLocation.city.yishuv_name;
payload.street1_hebrew = streetLocation.street.street_hebrew;
queryParams.yishuv_name = streetLocation.city.yishuv_name;
queryParams.street1_hebrew = streetLocation.street.street_hebrew;
}

const url = `${NEWS_FLASH_API}/${newsId}`;

try {
const response = await axios.patch(url, payload, { withCredentials: true });
const response = await axios.patch(
url,
{},
{
params: queryParams,
withCredentials: true,
}
);
return response.data;
} catch (error) {
console.error('Error updating newsflash:', error);
Expand Down