Photo delete

Author: datajohnson

src/api/routes/photo-router.ts

@@ -6,6 +6,7 @@ import { Photo, SavedFilter } from '../data';
 import multer from 'multer';
 import { createThumbnail } from '../utils/image';
 import { ReturnValidationErrors } from '../middleware';
+import knex from 'knex';
 
 const photoService = new PhotoService(DB_CONFIG);
 const ytPlaceService = new YtPlaceService(DB_CONFIG);
@@ -248,6 +249,30 @@ photoRouter.post(
 	}
 );
 
+photoRouter.delete('/:id', async (req: Request, res: Response) => {
+	const { id } = req.params;
+	const db = knex(DB_CONFIG);
+
+	db.transaction(async (trx) => {
+		try {
+			await trx('place.photo').where({ photo_RowId: id }).delete();
+			await trx('boat.photo').where({ photo_RowId: id }).delete();
+			await trx('aircrash.photo').where({ photo_RowId: id }).delete();
+			await trx('person.photo').where({ photoId: id }).delete();
+			await trx('burial.photo').where({ photo_RowId: id }).delete();
+			await trx('interpretiveSite.photos').where({ photo_RowId: id }).delete();
+			await trx('photo').where({ RowID: id }).delete();
+			await trx.commit();
+
+			return res.json({ data: 'successfully deleted' });
+		} catch (err) {
+			console.error('Error deleting photo:', err);
+			trx.rollback();
+			res.status(500).json({ errors: err });
+		}
+	});
+});
+
 photoRouter.put(
 	'/:id',
 	multer().single('file'),
@@ -370,16 +395,15 @@ photoRouter.get(
 	async (req: Request, res: Response) => {
 		const errors = validationResult(req);
 
-		if (!errors.isEmpty()) {
+		if (!errors.isEmpty())
 			return res.status(400).json({ errors: errors.array() });
-		}
 
 		await photoService
 			.getSavedFilterByUser(req.params.id)
 			.then((item) => {
 				if (item) return res.json({ data: item });
 
-				return res.status(404).send('Filters not found');
+				return res.json({ data: [] });
 			})
 			.catch((err) => {
 				console.error(err);

src/api/services/photo-service.ts

@@ -42,8 +42,6 @@ export class PhotoService {
 	}
 
 	async getForPlace(id: number): Promise<Photo[]> {
-
-		console.log("GETTING PHOTOS FOR PLACE", id);
 		return this.knex('photo')
 			.select<Photo[]>(PHOTO_FIELDS)
 			.where({ placeId: id })

src/web/src/components/MainPhotos/Accordion.vue

@@ -1,40 +1,51 @@
 <template>
-  <div>              
-    <button 
-      @click="toggleAccordion()" 
-      class="flex items-center space-x-3" 
-      :aria-controls="`collapse${_uid}`"
-    > 
-      <slot name="title" />
-        <v-icon v-if="isOpen" class="chevron" v-text="'mdi-chevron-up'"></v-icon>
-        <v-icon v-if="!isOpen" class="chevron" v-text="'mdi-chevron-down'"></v-icon>
-    </button>
-    
-    <v-divider inset></v-divider>
-    
-    <div v-show="isOpen" :id="`collapse${_uid}`">
-      <slot name="content" />
-    </div>
-  </div>
+	<div>
+		<button
+			@click="toggleAccordion()"
+			class="flex items-center space-x-3"
+			:aria-controls="`collapse${_uid}`"
+		>
+			<v-icon
+				v-if="isOpen"
+				class="chevron"
+				v-text="'mdi-chevron-up'"
+			/>
+			<v-icon
+				v-if="!isOpen"
+				class="chevron"
+				v-text="'mdi-chevron-down'"
+			/>
+			<slot name="title"></slot>
+		</button>
+
+		<v-divider />
+
+		<div
+			v-show="isOpen"
+			:id="`collapse${_uid}`"
+		>
+			<slot name="content" />
+		</div>
+	</div>
 </template>
 
 <script>
 export default {
-  data() {
-    return {
-      isOpen: true,
-    };
-  },
-  methods: {
-    toggleAccordion() {
-      this.isOpen = !this.isOpen;
-    },
-  },
+	data() {
+		return {
+			isOpen: true,
+		};
+	},
+	methods: {
+		toggleAccordion() {
+			this.isOpen = !this.isOpen;
+		},
+	},
 };
 </script>
 
 <style scoped>
-.v-icon.v-icon.chevron{
-  font-size: 36px;
+.v-icon.v-icon.chevron {
+	font-size: 36px;
 }
-</style>
+</style>