Merge pull request #18 from faithcomesbyhearing/develop

Dev to main: remove date from copyright response

Author: bradflood

.devcontainer/Dockerfile.lambda

@@ -1,7 +1,5 @@
 FROM public.ecr.aws/lambda/provided:al2023
 
-# Copy in your compiled bootstrap
-# COPY bin/bootstrap /var/task/bootstrap
 COPY bootstrap /var/task/bootstrap
 # Download and install the RIE and set bootstrap permissions
 RUN chmod +x /var/task/bootstrap && \

service/copyright/copyright.go

@@ -66,9 +66,8 @@ type ByOrganizations struct {
 	// it is an abstract struct to wrap the copyright information
 	Organizations []OrganizationsForCopyright `json:"organizations"`
 	// ProductCode is the product code for which the copyright applies.
-	ProductCode   string `json:"productCode"`
-	CopyrightDate string `json:"copyrightDate"`
-	Copyright     string `json:"copyright"`
+	ProductCode string `json:"productCode"`
+	Copyright   string `json:"copyright"`
 }
 
 type LogoOrganization struct {
@@ -189,7 +188,6 @@ func (m *Manager) GetCopyrightBy(
 	if err != nil {
 		// Handle the case where no rows were found
 		if errors.Is(err, sql.ErrNoRows) {
-			// Log the debug message and return nil, nil to indicate no copyrights found.
 			slog.Debug(
 				"No copyrights found for the provided product codes",
 				"productCodes", productCodes,
@@ -257,7 +255,6 @@ func (m *Manager) GetCopyrightBy(
 		entry := ByOrganizations{
 			OrganizationIDList: row.OrganizationIDList.String,
 			ProductCode:        row.ProductCode,
-			CopyrightDate:      row.CopyrightDate.String,
 			Copyright:          row.Copyright,
 			Organizations:      []OrganizationsForCopyright{},
 		}
@@ -581,15 +578,9 @@ func placeOrgInfo(pdf *fpdf.Fpdf, opts pdf_service.Options,
 
 	organizationName := copyrightOrg.OrganizationName
 
-	copyrightDate := copyright.CopyrightDate
-	if strings.TrimSpace(copyrightDate) == "" {
-		copyrightDate = "Not provided"
-	}
-
 	headerOrgNameHeight := pdf_service.CalculateOrgInfoHeight(pdf, organizationName, opts.CardWidth, opts.CellHeight)
 
 	orgNameLabel := "Org. Name: "
-	dateLabel := "Copyright Date: "
 
 	// Set bold font for labels
 	pdf.SetFont(opts.FontFamily, opts.FontStyleBold, opts.FontSize)
@@ -598,7 +589,6 @@ func placeOrgInfo(pdf *fpdf.Fpdf, opts pdf_service.Options,
 		headerHeightFactor      = 0.5  // Factor to adjust header height
 		paddingHeight           = 2    // Padding after the header
 		orgNameLabelWidthFactor = 0.22 // Factor for organization name label width
-		dateLabelWidthFactor    = 0.29 // Factor for copyright date label width
 	)
 	// Labels
 	pdf.SetXY(axisX+opts.CardPadding, currentY)
@@ -609,15 +599,6 @@ func placeOrgInfo(pdf *fpdf.Fpdf, opts pdf_service.Options,
 		opts.BorderText,
 		opts.AlignStrLeft,
 		false)
-	pdf.SetXY(axisX+opts.CardPadding, currentY+headerOrgNameHeight*headerHeightFactor)
-	pdf.MultiCell(
-		opts.CardWidth*dateLabelWidthFactor,
-		opts.CellHeight*headerHeightFactor,
-		dateLabel,
-		opts.BorderText,
-		opts.AlignStrLeft,
-		false,
-	)
 
 	// Values - switch back to regular font
 	pdf.SetFont(opts.FontFamily, opts.FontStyle, opts.FontSize)
@@ -631,19 +612,6 @@ func placeOrgInfo(pdf *fpdf.Fpdf, opts pdf_service.Options,
 		false,
 	)
 
-	pdf.SetXY(
-		axisX+opts.CardPadding+(opts.CardWidth*dateLabelWidthFactor),
-		currentY+headerOrgNameHeight*headerHeightFactor,
-	)
-	pdf.MultiCell(
-		opts.CardWidth*0.23,
-		opts.CellHeight*headerHeightFactor,
-		copyrightDate,
-		opts.BorderText,
-		opts.AlignStrLeft,
-		false,
-	)
-
 	// Account for height of drawn text
 	currentY += opts.CellHeight*headerHeightFactor + headerOrgNameHeight*headerHeightFactor
 	currentY += paddingHeight // Add padding after the header

sqlc/generated/copyright.sql.go

@@ -1,7 +1,6 @@
 -- name: GetFilesetCopyrights :many
 SELECT 
     GROUP_CONCAT(DISTINCT bfco.organization_id ORDER BY bfco.organization_id) AS organization_id_list,
-    bfc.copyright_date,
     bfc.copyright,
     bft.description AS product_code
 FROM bible_fileset_copyrights bfc
@@ -13,7 +12,6 @@ WHERE bft.description IN (sqlc.slice('productCodes'))
     AND (bft.name = 'product_code' OR bft.name LIKE 'product_code:%')
 GROUP BY
     bfc.hash_id,
-    bfc.copyright_date,
     bfc.copyright,
     bft.description
 ORDER BY bft.description;