From 95d114c478828ee79e2e12b81c887a6aea450c74 Mon Sep 17 00:00:00 2001 From: insssomniac Date: Sun, 8 Jun 2025 14:53:37 +0000 Subject: [PATCH 1/5] hw_3-1 --- app.py | 13 +++-- models/pydantic/models.py | 5 ++ models/sqlalchemy/models.py | 2 + pyproject.toml | 2 +- templates/home.html | 109 ++++++++++++++++++++++++++++-------- 5 files changed, 101 insertions(+), 30 deletions(-) diff --git a/app.py b/app.py index 11e2013..d71138c 100644 --- a/app.py +++ b/app.py @@ -5,11 +5,13 @@ from settings import settings from database import init_db from models.sqlalchemy.models import Animal +from flask_migrate import Migrate app = Flask(__name__) app.config['SQLALCHEMY_DATABASE_URI'] = settings.sqlalchemy_database_uri db = init_db(app) +migrate = Migrate(app, db) @app.route('/') @@ -17,6 +19,11 @@ def home() -> str: return render_template('home.html') +@app.route('/health') +def health() -> tuple[Response, int]: + return jsonify({"status": "ok"}), 200 + + @app.route('/animals', methods=['GET']) def index() -> Response: animals = Animal.query.all() @@ -84,11 +91,5 @@ def delete_animal(pk: int) -> Union[Response, tuple[Response, int]]: return jsonify({"message": "Animal deleted successfully!"}) -def initialize_app(): - with app.app_context(): - db.create_all() - - if __name__ == '__main__': - initialize_app() app.run(debug=True) diff --git a/models/pydantic/models.py b/models/pydantic/models.py index 91e66db..21c193a 100644 --- a/models/pydantic/models.py +++ b/models/pydantic/models.py @@ -1,4 +1,5 @@ from datetime import date +from typing import Optional from pydantic import BaseModel, ConfigDict @@ -6,6 +7,8 @@ class AnimalCreate(BaseModel): animal_type: str name: str birth_date: date + breed: Optional[str] = None + photo_url: Optional[str] = None class AnimalResponse(BaseModel): @@ -15,3 +18,5 @@ class AnimalResponse(BaseModel): animal_type: str name: str birth_date: date + breed: Optional[str] = None + photo_url: Optional[str] = None diff --git a/models/sqlalchemy/models.py b/models/sqlalchemy/models.py index dc6e14a..fb2d503 100644 --- a/models/sqlalchemy/models.py +++ b/models/sqlalchemy/models.py @@ -9,3 +9,5 @@ class Animal(db.Model): animal_type = db.Column(db.String, nullable=False) name = db.Column(db.String, nullable=False) birth_date = db.Column(db.Date, nullable=False) + breed = db.Column(db.String, nullable=True) + photo_url = db.Column(db.String, nullable=True) diff --git a/pyproject.toml b/pyproject.toml index 156df2c..83caf77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,6 +4,7 @@ version = "0.1.0" description = "" authors = ["marcustas "] readme = "README.md" +package-mode = false [tool.poetry.dependencies] python = "^3.11" @@ -13,7 +14,6 @@ flask-sqlalchemy = "^3.1.1" flask-migrate = "^4.0.5" pydantic-settings = "^2.0.3" - [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" diff --git a/templates/home.html b/templates/home.html index 80b942e..da927aa 100644 --- a/templates/home.html +++ b/templates/home.html @@ -33,6 +33,14 @@

Animals in the Shelter

+
+ + +
+
+ + +
@@ -46,6 +54,8 @@

List of animals:

Animal Type Name Birth Date + Breed + Photo Actions @@ -80,6 +90,15 @@
Edit Animal
+
+ + +
+
+ + +
+
@@ -93,34 +112,57 @@
Edit Animal
- + \ No newline at end of file From b95c85286b9734e6412ff3cf498a80354b48f99f Mon Sep 17 00:00:00 2001 From: 0xsheff <0xsheff@gmail.com> Date: Sun, 8 Jun 2025 19:11:28 +0300 Subject: [PATCH 2/5] Files upload --- .gitignore | 2 +- app.py | 115 ++++++++++++++++-- ...add_breed_and_photo_url_to_animal_table.py | 34 ++++++ 3 files changed, 139 insertions(+), 12 deletions(-) create mode 100644 migrations/versions/b432cb1d0393_add_breed_and_photo_url_to_animal_table.py diff --git a/.gitignore b/.gitignore index b3a358a..b4693c7 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ ENV/ *.sqlite3 # Logs and databases -*.log *.sql *.sqlite @@ -46,3 +45,4 @@ ENV/ .Trashes ehthumbs.db Thumbs.db +/static/uploads/ diff --git a/app.py b/app.py index d71138c..732ba43 100644 --- a/app.py +++ b/app.py @@ -1,15 +1,27 @@ -from flask import Flask, jsonify, request, Response, render_template +import os +import uuid +from flask import Flask, jsonify, request, Response, render_template, current_app +from werkzeug.utils import secure_filename -from models.pydantic.models import AnimalCreate, AnimalResponse +from models.pydantic.models import AnimalResponse from typing import Union from settings import settings from database import init_db from models.sqlalchemy.models import Animal from flask_migrate import Migrate +from datetime import datetime app = Flask(__name__) app.config['SQLALCHEMY_DATABASE_URI'] = settings.sqlalchemy_database_uri +# Upload configuration +UPLOAD_FOLDER = 'static/uploads' +ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg', 'gif'} +app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER + +os.makedirs(UPLOAD_FOLDER, exist_ok=True) + + db = init_db(app) migrate = Migrate(app, db) @@ -32,11 +44,42 @@ def index() -> Response: @app.route('/animal', methods=['POST']) def add_animal() -> tuple[Response, int]: - data = AnimalCreate(**request.get_json()) + animal_type = request.form.get('animal_type') + name = request.form.get('name') + birth_date_str = request.form.get('birth_date') + breed = request.form.get('breed') + + if not all([animal_type, name, birth_date_str]): + return jsonify({"message": "Missing required fields: animal_type, name, birth_date"}), 400 + + try: + birth_date = datetime.strptime(birth_date_str, '%Y-%m-%d').date() + except ValueError: + return jsonify({"message": "Invalid date format for birth_date. Use YYYY-MM-DD."}), 400 + + photo_url = None + if 'photo' in request.files: + file = request.files['photo'] + if file and file.filename and allowed_file(file.filename): + filename = secure_filename(file.filename) + unique_filename = str(uuid.uuid4()) + "_" + filename + file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) + + try: + file.save(file_path) + photo_url = f'/{UPLOAD_FOLDER}/{unique_filename}' + except Exception as e: + current_app.logger.error(f"Failed to save file: {e}") + return jsonify({"message": "Failed to save photo"}), 500 + elif file and file.filename and not allowed_file(file.filename): + return jsonify({"message": "File type not allowed"}), 400 + new_animal = Animal( - animal_type=data.animal_type, - name=data.name, - birth_date=data.birth_date + animal_type=animal_type, + name=name, + birth_date=birth_date, + breed=breed, + photo_url=photo_url ) db.session.add(new_animal) db.session.commit() @@ -50,14 +93,49 @@ def add_animal() -> tuple[Response, int]: @app.route('/animal/', methods=['PUT']) def update_animal(pk: int) -> Union[Response, tuple[Response, int]]: - data = AnimalCreate(**request.get_json()) animal = Animal.query.get(pk) if not animal: return jsonify({"message": "Animal not found"}), 404 - animal.animal_type = data.animal_type - animal.name = data.name - animal.birth_date = data.birth_date + animal.animal_type = request.form.get('animal_type', animal.animal_type) + animal.name = request.form.get('name', animal.name) + + birth_date_str = request.form.get('birth_date') + if birth_date_str: + try: + animal.birth_date = datetime.strptime(birth_date_str, '%Y-%m-%d').date() + except ValueError: + return jsonify({"message": "Invalid date format for birth_date. Use YYYY-MM-DD."}), 400 + + animal.breed = request.form.get('breed', animal.breed) + + if 'photo' in request.files: + file = request.files['photo'] + if file and file.filename and allowed_file(file.filename): + if animal.photo_url: + old_photo_path_relative = animal.photo_url.lstrip('/') + old_photo_path_absolute = os.path.join(os.getcwd(), old_photo_path_relative) + + if os.path.exists(old_photo_path_absolute): + try: + os.remove(old_photo_path_absolute) + current_app.logger.info(f"Deleted old photo: {old_photo_path_absolute}") + except OSError as e: + current_app.logger.error(f"Error deleting old photo {old_photo_path_absolute}: {e}") + + filename = secure_filename(file.filename) + unique_filename = str(uuid.uuid4()) + "_" + filename + file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) + + try: + file.save(file_path) + animal.photo_url = f'/{UPLOAD_FOLDER}/{unique_filename}' + except Exception as e: + current_app.logger.error(f"Failed to save updated file: {e}") + return jsonify({"message": "Failed to save updated photo"}), 500 + elif file and file.filename and not allowed_file(file.filename): + return jsonify({"message": "File type not allowed for update"}), 400 + db.session.commit() return jsonify( { @@ -86,10 +164,25 @@ def delete_animal(pk: int) -> Union[Response, tuple[Response, int]]: if not animal: return jsonify({"message": "Animal not found"}), 404 + if animal.photo_url: + photo_path_relative = animal.photo_url.lstrip('/') + photo_path_absolute = os.path.join(os.getcwd(), photo_path_relative) + if os.path.exists(photo_path_absolute): + try: + os.remove(photo_path_absolute) + current_app.logger.info(f"Deleted photo on animal delete: {photo_path_absolute}") + except OSError as e: + current_app.logger.error(f"Error deleting photo {photo_path_absolute} on animal delete: {e}") + db.session.delete(animal) db.session.commit() return jsonify({"message": "Animal deleted successfully!"}) +def allowed_file(filename: str) -> bool: + return '.' in filename and \ + filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS + + if __name__ == '__main__': - app.run(debug=True) + app.run(debug=True) \ No newline at end of file diff --git a/migrations/versions/b432cb1d0393_add_breed_and_photo_url_to_animal_table.py b/migrations/versions/b432cb1d0393_add_breed_and_photo_url_to_animal_table.py new file mode 100644 index 0000000..d68cd54 --- /dev/null +++ b/migrations/versions/b432cb1d0393_add_breed_and_photo_url_to_animal_table.py @@ -0,0 +1,34 @@ +"""add breed and photo_url to animal table + +Revision ID: b432cb1d0393 +Revises: e08fc0218f8b +Create Date: 2025-06-08 18:47:50.046990 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = 'b432cb1d0393' +down_revision = 'e08fc0218f8b' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('animal', schema=None) as batch_op: + batch_op.add_column(sa.Column('breed', sa.String(), nullable=True)) + batch_op.add_column(sa.Column('photo_url', sa.String(), nullable=True)) + + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('animal', schema=None) as batch_op: + batch_op.drop_column('photo_url') + batch_op.drop_column('breed') + + # ### end Alembic commands ### From 757dd668a6a43563a6b49f03e8d619e6d3017cd5 Mon Sep 17 00:00:00 2001 From: 0xsheff <0xsheff@gmail.com> Date: Sun, 8 Jun 2025 21:38:23 +0300 Subject: [PATCH 3/5] Age field --- models/pydantic/models.py | 21 ++++++++++++++++++++- templates/home.html | 23 +++++++++++------------ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/models/pydantic/models.py b/models/pydantic/models.py index 21c193a..a74ba80 100644 --- a/models/pydantic/models.py +++ b/models/pydantic/models.py @@ -1,6 +1,6 @@ from datetime import date from typing import Optional -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel, ConfigDict, computed_field class AnimalCreate(BaseModel): @@ -20,3 +20,22 @@ class AnimalResponse(BaseModel): birth_date: date breed: Optional[str] = None photo_url: Optional[str] = None + + @computed_field + def age(self) -> str: + today = date.today() + years = today.year - self.birth_date.year + months = today.month - self.birth_date.month + + if today.day < self.birth_date.day: + months -= 1 + if months < 0: + years -= 1 + months += 12 + + years_str = f"{years} year{'s' if years != 1 else ''}" + months_str = f"{months} month{'s' if months != 1 else ''}" + if months == 0: + return years_str + else: + return f"{years_str} {months_str}" diff --git a/templates/home.html b/templates/home.html index da927aa..6d2d359 100644 --- a/templates/home.html +++ b/templates/home.html @@ -53,6 +53,7 @@

List of animals:

Animal Type Name + Age Birth Date Breed Photo @@ -119,9 +120,8 @@
Edit Animal
$('#editAnimalBirthDate').val(data.animal.birth_date); $('#editAnimalBreed').val(data.animal.breed || ''); // Встановлюємо породу, або порожній рядок - // Відображення поточного фото const currentPhotoPreview = $('#currentPhotoPreview'); - currentPhotoPreview.empty(); // Очистити попередній перегляд + currentPhotoPreview.empty(); if (data.animal.photo_url) { currentPhotoPreview.html( `

Current photo:

@@ -132,14 +132,14 @@
Edit Animal
} else { currentPhotoPreview.html('

No current photo.

'); } - $('#editAnimalPhoto').val(''); // Очистити поле вибору файлу + $('#editAnimalPhoto').val(''); $('#editAnimalModal').modal('show'); }); } function submitEditAnimal() { const animalId = $('#editAnimalId').val(); - var formData = new FormData(); // Використовуємо FormData для файлів + var formData = new FormData(); formData.append('animal_type', $('#editAnimalType').val()); formData.append('name', $('#editAnimalName').val()); @@ -155,11 +155,11 @@
Edit Animal
url: `/animal/${animalId}`, type: 'PUT', data: formData, - contentType: false, // Важливо для FormData - processData: false, // Важливо для FormData + contentType: false, + processData: false, success: function() { $('#editAnimalModal').modal('hide'); - fetchAnimals(); // Оновити список тварин + fetchAnimals(); }, error: function(xhr) { alert('Error updating animal: ' + (xhr.responseJSON ? xhr.responseJSON.message : "Unknown error")); @@ -175,8 +175,6 @@
Edit Animal
data.animals.forEach(animal => { let photoHtml = 'N/A'; if (animal.photo_url) { - // Припускаємо, що photo_url - це прямий шлях до зображення, доступний з браузера - // наприклад, /static/uploads/image.jpg photoHtml = ` ${animal.name} `; @@ -185,6 +183,7 @@
Edit Animal
${animal.animal_type} ${animal.name} + ${animal.age} ${animal.birth_date} ${animal.breed || 'N/A'} ${photoHtml} @@ -201,7 +200,7 @@
Edit Animal
// Add new animal $('#addAnimalForm').on('submit', function(e) { e.preventDefault(); - var formData = new FormData(); // Використовуємо FormData для файлів + var formData = new FormData(); formData.append('animal_type', $('#animal_type').val()); formData.append('name', $('#name').val()); @@ -217,8 +216,8 @@
Edit Animal
url: '/animal', type: 'POST', data: formData, - contentType: false, // Важливо для FormData - processData: false, // Важливо для FormData + contentType: false, + processData: false, success: function() { fetchAnimals(); $('#addAnimalForm')[0].reset(); From 7d0edde6b564c72dac9a9a85a9d861dae7edf996 Mon Sep 17 00:00:00 2001 From: 0xsheff <0xsheff@gmail.com> Date: Sun, 8 Jun 2025 22:00:55 +0300 Subject: [PATCH 4/5] Refactor add_animal logic --- app.py | 86 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/app.py b/app.py index 732ba43..0df04f2 100644 --- a/app.py +++ b/app.py @@ -3,7 +3,7 @@ from flask import Flask, jsonify, request, Response, render_template, current_app from werkzeug.utils import secure_filename -from models.pydantic.models import AnimalResponse +from models.pydantic.models import AnimalResponse, AnimalCreate from typing import Union from settings import settings from database import init_db @@ -44,51 +44,53 @@ def index() -> Response: @app.route('/animal', methods=['POST']) def add_animal() -> tuple[Response, int]: - animal_type = request.form.get('animal_type') - name = request.form.get('name') - birth_date_str = request.form.get('birth_date') - breed = request.form.get('breed') + try: + animal_data = AnimalCreate( + animal_type=request.form.get('animal_type'), + name=request.form.get('name'), + birth_date=datetime.strptime(request.form.get('birth_date', ''), '%Y-%m-%d').date(), + breed=request.form.get('breed'), + photo_url=None + ) + except ValueError as e: + return jsonify({"message": str(e)}), 400 + + photo_result = _handle_photo_upload() + if isinstance(photo_result, tuple): # Error response + return photo_result + + if photo_result: + animal_data.photo_url = photo_result + + new_animal = Animal(**animal_data.model_dump()) + db.session.add(new_animal) + db.session.commit() - if not all([animal_type, name, birth_date_str]): - return jsonify({"message": "Missing required fields: animal_type, name, birth_date"}), 400 + return jsonify({ + "message": "Animal added successfully!", + "animal": AnimalResponse.model_validate(new_animal).model_dump(mode='json') + }), 201 - try: - birth_date = datetime.strptime(birth_date_str, '%Y-%m-%d').date() - except ValueError: - return jsonify({"message": "Invalid date format for birth_date. Use YYYY-MM-DD."}), 400 - photo_url = None - if 'photo' in request.files: - file = request.files['photo'] - if file and file.filename and allowed_file(file.filename): - filename = secure_filename(file.filename) - unique_filename = str(uuid.uuid4()) + "_" + filename - file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) +def _handle_photo_upload() -> Union[str, tuple[Response, int], None]: + if 'photo' not in request.files: + return None - try: - file.save(file_path) - photo_url = f'/{UPLOAD_FOLDER}/{unique_filename}' - except Exception as e: - current_app.logger.error(f"Failed to save file: {e}") - return jsonify({"message": "Failed to save photo"}), 500 - elif file and file.filename and not allowed_file(file.filename): - return jsonify({"message": "File type not allowed"}), 400 - - new_animal = Animal( - animal_type=animal_type, - name=name, - birth_date=birth_date, - breed=breed, - photo_url=photo_url - ) - db.session.add(new_animal) - db.session.commit() - return jsonify( - { - "message": "Animal added successfully!", - "animal": AnimalResponse.model_validate(new_animal).model_dump(mode='json') - } - ), 201 + file = request.files['photo'] + if not file or not file.filename: + return None + + if not allowed_file(file.filename): + return jsonify({"message": "File type not allowed"}), 400 + + try: + unique_filename = str(uuid.uuid4()) + "_" + secure_filename(file.filename) + file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) + file.save(file_path) + return f'/{UPLOAD_FOLDER}/{unique_filename}' + except Exception as e: + current_app.logger.error(f"Failed to save file: {e}") + return jsonify({"message": "Failed to save photo"}), 500 @app.route('/animal/', methods=['PUT']) From 958b18315ce1766d15f1d4fb6c5d35fc962c8a74 Mon Sep 17 00:00:00 2001 From: 0xsheff <0xsheff@gmail.com> Date: Sun, 8 Jun 2025 22:41:30 +0300 Subject: [PATCH 5/5] Minor refactoring --- app.py | 146 ++++++++++++++++++++++---------------------- templates/home.html | 2 +- 2 files changed, 73 insertions(+), 75 deletions(-) diff --git a/app.py b/app.py index 0df04f2..e71605f 100644 --- a/app.py +++ b/app.py @@ -1,10 +1,10 @@ import os import uuid -from flask import Flask, jsonify, request, Response, render_template, current_app +from flask import Flask, jsonify, request, Response, render_template, current_app, url_for from werkzeug.utils import secure_filename from models.pydantic.models import AnimalResponse, AnimalCreate -from typing import Union +from typing import Union, Optional from settings import settings from database import init_db from models.sqlalchemy.models import Animal @@ -72,79 +72,45 @@ def add_animal() -> tuple[Response, int]: }), 201 -def _handle_photo_upload() -> Union[str, tuple[Response, int], None]: - if 'photo' not in request.files: - return None - - file = request.files['photo'] - if not file or not file.filename: - return None - - if not allowed_file(file.filename): - return jsonify({"message": "File type not allowed"}), 400 - - try: - unique_filename = str(uuid.uuid4()) + "_" + secure_filename(file.filename) - file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) - file.save(file_path) - return f'/{UPLOAD_FOLDER}/{unique_filename}' - except Exception as e: - current_app.logger.error(f"Failed to save file: {e}") - return jsonify({"message": "Failed to save photo"}), 500 - - @app.route('/animal/', methods=['PUT']) def update_animal(pk: int) -> Union[Response, tuple[Response, int]]: animal = Animal.query.get(pk) if not animal: return jsonify({"message": "Animal not found"}), 404 - animal.animal_type = request.form.get('animal_type', animal.animal_type) - animal.name = request.form.get('name', animal.name) + try: + update_data = { + 'animal_type': request.form.get('animal_type', animal.animal_type), + 'name': request.form.get('name', animal.name), + 'birth_date': animal.birth_date, + 'breed': request.form.get('breed', animal.breed), + 'photo_url': animal.photo_url + } - birth_date_str = request.form.get('birth_date') - if birth_date_str: - try: - animal.birth_date = datetime.strptime(birth_date_str, '%Y-%m-%d').date() - except ValueError: - return jsonify({"message": "Invalid date format for birth_date. Use YYYY-MM-DD."}), 400 - - animal.breed = request.form.get('breed', animal.breed) - - if 'photo' in request.files: - file = request.files['photo'] - if file and file.filename and allowed_file(file.filename): - if animal.photo_url: - old_photo_path_relative = animal.photo_url.lstrip('/') - old_photo_path_absolute = os.path.join(os.getcwd(), old_photo_path_relative) - - if os.path.exists(old_photo_path_absolute): - try: - os.remove(old_photo_path_absolute) - current_app.logger.info(f"Deleted old photo: {old_photo_path_absolute}") - except OSError as e: - current_app.logger.error(f"Error deleting old photo {old_photo_path_absolute}: {e}") - - filename = secure_filename(file.filename) - unique_filename = str(uuid.uuid4()) + "_" + filename - file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) - - try: - file.save(file_path) - animal.photo_url = f'/{UPLOAD_FOLDER}/{unique_filename}' - except Exception as e: - current_app.logger.error(f"Failed to save updated file: {e}") - return jsonify({"message": "Failed to save updated photo"}), 500 - elif file and file.filename and not allowed_file(file.filename): - return jsonify({"message": "File type not allowed for update"}), 400 + if birth_date_str := request.form.get('birth_date'): + update_data['birth_date'] = datetime.strptime(birth_date_str, '%Y-%m-%d').date() - db.session.commit() - return jsonify( - { + updated_animal_data = AnimalCreate(**update_data) + + if 'photo' in request.files: + photo_result = _handle_photo_upload(animal.photo_url) + if isinstance(photo_result, tuple): # Error response + return photo_result + if photo_result: + updated_animal_data.photo_url = photo_result + + for field, value in updated_animal_data.model_dump().items(): + setattr(animal, field, value) + + db.session.commit() + + return jsonify({ "message": "Animal updated successfully!", - "animal": AnimalResponse.model_validate(animal).model_dump(mode='json'), - }, - ) + "animal": AnimalResponse.model_validate(animal).model_dump(mode='json') + }) + + except ValueError as e: + return jsonify({"message": str(e)}), 400 @app.route('/animal/', methods=['GET']) @@ -167,14 +133,7 @@ def delete_animal(pk: int) -> Union[Response, tuple[Response, int]]: return jsonify({"message": "Animal not found"}), 404 if animal.photo_url: - photo_path_relative = animal.photo_url.lstrip('/') - photo_path_absolute = os.path.join(os.getcwd(), photo_path_relative) - if os.path.exists(photo_path_absolute): - try: - os.remove(photo_path_absolute) - current_app.logger.info(f"Deleted photo on animal delete: {photo_path_absolute}") - except OSError as e: - current_app.logger.error(f"Error deleting photo {photo_path_absolute} on animal delete: {e}") + _delete_old_photo(animal.photo_url) db.session.delete(animal) db.session.commit() @@ -186,5 +145,44 @@ def allowed_file(filename: str) -> bool: filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS +def _handle_photo_upload(current_photo_url: Optional[str] = None) -> Union[str, tuple[Response, int], None]: + if 'photo' not in request.files: + return None + + file = request.files['photo'] + if not file or not file.filename: + return None + + if not allowed_file(file.filename): + return jsonify({"message": "File type not allowed"}), 400 + + try: + if current_photo_url: + _delete_old_photo(current_photo_url) + + unique_filename = str(uuid.uuid4()) + "_" + secure_filename(file.filename) + file_path = os.path.join(app.config['UPLOAD_FOLDER'], unique_filename) + file.save(file_path) + + uploaded_file_url = f"/{os.path.join(app.config['UPLOAD_FOLDER'], unique_filename)}" + return uploaded_file_url + + except Exception as e: + current_app.logger.error(f"Failed to save file: {e}") + return jsonify({"message": "Failed to save photo"}), 500 + + +def _delete_old_photo(photo_url: str) -> None: + old_photo_path_relative = photo_url.lstrip('/') + old_photo_path_absolute = os.path.join(os.getcwd(), old_photo_path_relative) + + if os.path.exists(old_photo_path_absolute): + try: + os.remove(old_photo_path_absolute) + current_app.logger.info(f"Deleted old photo: {old_photo_path_absolute}") + except OSError as e: + current_app.logger.error(f"Error deleting old photo {old_photo_path_absolute}: {e}") + + if __name__ == '__main__': app.run(debug=True) \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index 6d2d359..5d45b18 100644 --- a/templates/home.html +++ b/templates/home.html @@ -118,7 +118,7 @@
Edit Animal
$('#editAnimalType').val(data.animal.animal_type); $('#editAnimalName').val(data.animal.name); $('#editAnimalBirthDate').val(data.animal.birth_date); - $('#editAnimalBreed').val(data.animal.breed || ''); // Встановлюємо породу, або порожній рядок + $('#editAnimalBreed').val(data.animal.breed || ''); const currentPhotoPreview = $('#currentPhotoPreview'); currentPhotoPreview.empty();