fix: resource ref creation

drodil · Feb 12, 2025 · f10661a · f10661a
1 parent 40cb5b5
commit f10661a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/plugins/qeta-backend/src/database/QetaStore.ts b/plugins/qeta-backend/src/database/QetaStore.ts
@@ -26,11 +26,15 @@ import { QetaFilters } from '../service/util';
 import { PermissionCriteria } from '@backstage/plugin-permission-common';
 
 export function isPost(entity: Post | Answer | Comment): entity is Post {
-  return 'answers' in entity;
+  return 'title' in entity;
 }
 
 export function isAnswer(entity: Post | Answer | Comment): entity is Answer {
-  return !('answers' in entity);
+  return 'postId' in entity && 'correct' in entity;
+}
+
+export function isComment(entity: Post | Answer | Comment): entity is Comment {
+  return !('title' in entity) && !('correct' in entity);
 }
 
 export type MaybeAnswer = Answer | null;

diff --git a/plugins/qeta-backend/src/service/util.ts b/plugins/qeta-backend/src/service/util.ts
@@ -16,9 +16,10 @@ import {
   PolicyDecision,
 } from '@backstage/plugin-permission-common';
 import {
+  isAnswer,
+  isComment,
   isPost,
   MaybeAnswer,
-  MaybeComment,
   MaybePost,
 } from '../database/QetaStore';
 import { Config } from '@backstage/config';
@@ -48,17 +49,6 @@ import { BlobServiceClient } from '@azure/storage-blob';
 import { DefaultAzureCredential } from '@azure/identity';
 import { BackstagePrincipalTypes } from '@backstage/backend-plugin-api';
 
-export const isAnswer = (
-  ent: MaybePost | MaybeAnswer | MaybeComment,
-): ent is Answer => ent !== null && (ent as Answer).postId !== undefined;
-
-export const isComment = (
-  ent: MaybePost | MaybeAnswer | MaybeComment,
-): ent is Comment =>
-  ent !== null &&
-  (ent as Answer).postId === undefined &&
-  (ent as Post).title === undefined;
-
 export const getUsername = async (
   req: Request<unknown>,
   options: RouterOptions,