forgot to manage link_text / company (39428bed) · Commits · Anthony Jacob / api

app/model/experience/experience.py

+29 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ def getExperiencesFull():
		'language_code', L.language_code,
		'job_title', ET.job_title,
		'job_description', ET.job_description,
		'job_place', ET.job_place
		'job_place', ET.job_place,
		'link_text', ET.link_text
		)
		) AS translations
		FROM experience E
		@@ -43,7 +44,8 @@ def getExperiencesFull():
		E.experience_start_date,
		E.experience_end_date,
		E.logo,
		E.website
		E.website,
		ET.link_text
		ORDER BY E.id;
		"""

		@@ -72,7 +74,8 @@ def getExperience(ExperienceId: int) -> Any \| Literal[-1] \| Literal[False]:
		'language_code', L.language_code,
		'job_title', ET.job_title,
		'job_description', ET.job_description,
		'job_place', ET.job_place
		'job_place', ET.job_place,
		'link_text', ET.link_text
		)
		) AS translations
		FROM experience E
		@@ -86,7 +89,8 @@ def getExperience(ExperienceId: int) -> Any \| Literal[-1] \| Literal[False]:
		E.experience_start_date,
		E.experience_end_date,
		E.logo,
		E.website
		E.website,
		ET.link_text
		ORDER BY E.id;
		"""

		@@ -154,14 +158,16 @@ def insertExperienceTranslation(
		job_title: str,
		job_description: str,
		job_place: str,
		link_text: str,
		) -> bool \| int:

		InsertExperienceQuery = """INSERT INTO experience_translation (experience_id, language_id, job_title, job_description, job_place)
		VALUES (%s, (SELECT id FROM language WHERE language_code= %s ), %s, %s, %s);"""
		InsertExperienceQuery = """INSERT INTO experience_translation (experience_id, language_id, job_title, job_description, job_place, link_text)
		VALUES (%s, (SELECT id FROM language WHERE language_code= %s ), %s, %s, %s, %s);"""

		job_title = None if job_title == "NULL" else job_title
		job_description = None if job_description == "NULL" else job_description
		job_place = None if job_place == "NULL" else job_place
		link_text = None if link_text == "NULL" else link_text

		try:
		with db_cursor() as (conn, cur):
		@@ -174,6 +180,7 @@ def insertExperienceTranslation(
		job_title,
		job_description,
		job_place,
		link_text
		),
		)

		@@ -193,6 +200,7 @@ def updateExperienceTranslation(
		job_title: str,
		job_description: str,
		job_place: str,
		link_text: str,
		):
		try:
		with db_cursor(dict_results=True) as (conn, cur):
		@@ -221,6 +229,13 @@ def updateExperienceTranslation(
		update_fields.append("job_place = %s")
		update_values.append(job_place)

		if link_text is not None:
		if link_text == "NULL":
		update_fields.append("link_text = NULL")
		else:
		update_fields.append("link_text = %s")
		update_values.append(link_text)

		if update_fields:
		update_query = f"""UPDATE experience_translation
		SET {', '.join(update_fields)}
		@@ -330,6 +345,12 @@ def updateExperience(
		else:
		experienceTranslation["job_place"] = None

		if "link_text" in experienceTranslation:
		if experienceTranslation["link_text"] is None:
		experienceTranslation["link_text"] = "NULL"
		else:
		experienceTranslation["link_text"] = None

		current_app.logger.error(
		f"""{isExperienceTranslationExists(id, experienceTranslation["language_code"])}"""
		)
		@@ -343,6 +364,7 @@ def updateExperience(
		experienceTranslation["job_title"],
		experienceTranslation["job_description"],
		experienceTranslation["job_place"],
		experienceTranslation["link_text"],
		):
		raise Exception(
		f"Database error while updating experience translation for {id} / {experienceTranslation['language_code']}"
		@@ -353,6 +375,7 @@ def updateExperience(
		experienceTranslation["job_title"],
		experienceTranslation["job_description"],
		experienceTranslation["job_place"],
		experienceTranslation["link_text"],
		):
		raise Exception(
		f"Database error while inserting experience translation for {id} / {experienceTranslation['language_code']}"