Refactored code in app/Response/Image.hs (#1606)

Author: Japleen-Kaur2409

CHANGELOG.md

@@ -34,6 +34,7 @@
 - Added test cases for the `ExportModal` component in `js/components/common`
 - Updated backend tests to use `tasty-discover`
 - Added documentation for running a subset of the backend tests
+- Deleted `app/Response/Image` file and refactored `app/Util/Helpers` to include `returnImageData`
 
 ## [0.7.1] - 2025-06-16
 

README.md

@@ -121,6 +121,7 @@ Parker Hutcheson,
 Yoonie Jang,
 Jai Joshi,
 Aayush Karki,
+Japleen Kaur,
 Philip Kukulak,
 Jaeyong Lee,
 Ryan Lee,

app/Controllers/Graph.hs

@@ -15,8 +15,8 @@ import Database.Persist.Sqlite (Entity, SelectOpt (Asc), SqlPersistM, selectList
 import Database.Tables as Tables (EntityField (GraphDynamic, GraphTitle), Graph, SvgJSON, Text)
 import Export.GetImages (getActiveGraphImage)
 import Models.Graph (getGraph, insertGraph)
-import Response.Image (returnImageData)
 import Util.Happstack (createJSONResponse)
+import Util.Helpers (returnImageData)
 
 graphResponse :: ServerPart Response
 graphResponse =

app/Controllers/Timetable.hs

@@ -20,14 +20,13 @@ import Export.PdfGenerator
 import Happstack.Server
 import MasterTemplate
 import Models.Meeting (returnMeeting)
-import Response.Image (returnImageData)
 import Scripts
 import System.Directory (removeFile)
 import Text.Blaze ((!))
 import qualified Text.Blaze.Html5 as H
 import qualified Text.Blaze.Html5.Attributes as A
 import Text.Read (readMaybe)
-import Util.Helpers
+import Util.Helpers (returnImageData, safeHead)
 
 gridResponse :: ServerPart Response
 gridResponse =

app/Response.hs

@@ -2,6 +2,5 @@ module Response (module X) where
 
 import Response.About as X
 import Response.Draw as X
-import Response.Image as X
 import Response.Loading as X
 import Response.NotFound as X

app/Response/Image.hs

@@ -3,10 +3,25 @@
     Description : Contains general-use helper functions.
 -}
 module Util.Helpers
-    (safeHead) where
+    (safeHead, returnImageData) where
+
+import qualified Data.ByteString as BS (readFile)
+import qualified Data.ByteString.Base64 as BEnc (encode)
+import Happstack.Server (Response, toResponse)
+import System.Directory (removeFile)
 
 -- | Given a list and a default value, returns the head of the list, or the default value
 -- if the list is empty.
 safeHead :: a -> [a] -> a
 safeHead listHead [] = listHead
 safeHead _ (listHead:_) = listHead
+
+-- | Creates and converts an SVG file to an image file, deletes them both and
+-- returns the image data as a response.
+returnImageData :: String -> String -> IO Response
+returnImageData svgFilename imageFilename = do
+    imageData <- BS.readFile imageFilename
+    _ <- removeFile imageFilename
+    _ <- removeFile svgFilename
+    let encodedData = BEnc.encode imageData
+    return $ toResponse encodedData

app/Util/Helpers.hs

@@ -46,7 +46,6 @@ library
     Models.Graph,
     Models.Meeting,
     Models.Program,
-    Response.Image,
     Scripts,
     Svg.Builder,
     Svg.Database,
@@ -188,7 +187,6 @@ executable courseography
     Response,
     Response.About,
     Response.Draw,
-    Response.Image,
     Response.Loading,
     Response.NotFound,
     Routes,