mirror of
https://github.com/gmbrax/Pilgrim.git
synced 2026-11-09 17:20:17 +00:00
Made some changes to naming in both the classes and the tables of the database to conform the correct naming scheme
This commit is contained in:
parent
7e29a590a2
commit
32b8a58c3a
@@ -1,4 +1,4 @@
|
||||
|
||||
from typing import List
|
||||
|
||||
from ..models.entry import Entry
|
||||
from ..models.travel_diary import TravelDiary
|
||||
@@ -20,33 +20,31 @@ class EntryService:
|
||||
|
||||
return new_entry
|
||||
|
||||
def read_by_id(self,entry_id:int):
|
||||
def read_by_id(self,entry_id:int)->Entry:
|
||||
entry = self.session.query(Entry).filter(Entry.id == entry_id).first()
|
||||
return entry
|
||||
|
||||
def read_all(self):
|
||||
def read_all(self)-> List[Entry]:
|
||||
entries = self.session.query(Entry).all()
|
||||
return entries
|
||||
|
||||
def update(self,entry_src:Entry,entry_dst:Entry):
|
||||
def update(self,entry_src:Entry,entry_dst:Entry) -> Entry | None:
|
||||
original:Entry = self.read_by_id(entry_src.id)
|
||||
if original:
|
||||
original.title = entry_dst.title
|
||||
original.text = entry_dst.text
|
||||
original.date = entry_dst.date
|
||||
original.fk_TravelDiary_id = entry_dst.fk_TravelDiary_id
|
||||
original.fk_travel_diary_id = entry_dst.fk_travel_diary_id
|
||||
original.photos = entry_dst.photos
|
||||
self.session.commit()
|
||||
self.session.refresh(original)
|
||||
return original
|
||||
return original
|
||||
return None
|
||||
|
||||
def delete(self,entry_src:Entry):
|
||||
def delete(self,entry_src:Entry)-> Entry | None:
|
||||
excluded = self.read_by_id(entry_src.id)
|
||||
if excluded is not None:
|
||||
self.session.delete(excluded)
|
||||
self.session.commit()
|
||||
return excluded
|
||||
return None
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -43,4 +43,3 @@ class PhotoService:
|
||||
self.session.refresh(excluded)
|
||||
return excluded
|
||||
return None
|
||||
|
||||
|
||||
@@ -16,4 +16,4 @@ class ServiceManager:
|
||||
def get_travel_diary_service(self):
|
||||
if self.session is not None:
|
||||
return TravelDiaryService(self.session)
|
||||
return None
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user