Improvements for certificates table, adds expansion object to certificates

backend/internal/api/handler/certificates.go

@@ -26,7 +26,7 @@ func GetCertificates() func(http.ResponseWriter, *http.Request) {
 			return
 		}
 
-		certificates, err := certificate.List(pageInfo, middleware.GetFiltersFromContext(r))
+		certificates, err := certificate.List(pageInfo, middleware.GetFiltersFromContext(r), getExpandFromContext(r))
 		if err != nil {
 			h.ResultErrorJSON(w, r, http.StatusBadRequest, err.Error(), nil)
 		} else {
@@ -46,11 +46,16 @@ func GetCertificate() func(http.ResponseWriter, *http.Request) {
 			return
 		}
 
-		cert, err := certificate.GetByID(certificateID)
-		if err != nil {
+		item, err := certificate.GetByID(certificateID)
+		switch err {
+		case sql.ErrNoRows:
+			h.ResultErrorJSON(w, r, http.StatusNotFound, "Not found", nil)
+		case nil:
+			// nolint: errcheck,gosec
+			item.Expand(getExpandFromContext(r))
+			h.ResultResponseJSON(w, r, http.StatusOK, item)
+		default:
 			h.ResultErrorJSON(w, r, http.StatusBadRequest, err.Error(), nil)
-		} else {
-			h.ResultResponseJSON(w, r, http.StatusOK, cert)
 		}
 	}
 }

backend/internal/entity/certificate/methods.go

@@ -102,7 +102,7 @@ func Update(certificate *Model) error {
 }
 
 // List will return a list of certificates
-func List(pageInfo model.PageInfo, filters []model.Filter) (ListResponse, error) {
+func List(pageInfo model.PageInfo, filters []model.Filter, expand []string) (ListResponse, error) {
 	var result ListResponse
 	var exampleModel Model
 
@@ -135,6 +135,15 @@ func List(pageInfo model.PageInfo, filters []model.Filter) (ListResponse, error)
 		return result, err
 	}
 
+	if expand != nil {
+		for idx := range items {
+			expandErr := items[idx].Expand(expand)
+			if expandErr != nil {
+				logger.Error("CertificatesExpansionError", expandErr)
+			}
+		}
+	}
+
 	result = ListResponse{
 		Items:  items,
 		Total:  totalRows,

backend/internal/entity/certificate/model.go

@@ -13,8 +13,10 @@ import (
 	"npm/internal/database"
 	"npm/internal/entity/certificateauthority"
 	"npm/internal/entity/dnsprovider"
+	"npm/internal/entity/user"
 	"npm/internal/logger"
 	"npm/internal/types"
+	"npm/internal/util"
 )
 
 const (
@@ -59,6 +61,7 @@ type Model struct {
 	// Expansions:
 	CertificateAuthority *certificateauthority.Model `json:"certificate_authority,omitempty"`
 	DNSProvider          *dnsprovider.Model          `json:"dns_provider,omitempty"`
+	User                 *user.Model                 `json:"user,omitempty"`
 }
 
 func (m *Model) getByQuery(query string, params []interface{}) error {
@@ -161,7 +164,8 @@ func (m *Model) ValidateWildcardSupport() bool {
 	}
 
 	if hasWildcard {
-		m.Expand()
+		// nolint: errcheck, gosec
+		m.Expand([]string{"certificate-authority", "dns-provider"})
 		if !m.CertificateAuthority.IsWildcardSupported {
 			return false
 		}
@@ -182,15 +186,28 @@ func (m *Model) setDefaultStatus() {
 }
 
 // Expand will populate attached objects for the model
-func (m *Model) Expand() {
-	if m.CertificateAuthorityID > 0 {
-		certificateAuthority, _ := certificateauthority.GetByID(m.CertificateAuthorityID)
+func (m *Model) Expand(items []string) error {
+	var err error
+
+	if util.SliceContainsItem(items, "certificate-authority") && m.CertificateAuthorityID > 0 {
+		var certificateAuthority certificateauthority.Model
+		certificateAuthority, err = certificateauthority.GetByID(m.CertificateAuthorityID)
 		m.CertificateAuthority = &certificateAuthority
 	}
-	if m.DNSProviderID > 0 {
-		dnsProvider, _ := dnsprovider.GetByID(m.DNSProviderID)
+
+	if util.SliceContainsItem(items, "dns-provider") && m.DNSProviderID > 0 {
+		var dnsProvider dnsprovider.Model
+		dnsProvider, err = dnsprovider.GetByID(m.DNSProviderID)
 		m.DNSProvider = &dnsProvider
 	}
+
+	if util.SliceContainsItem(items, "user") && m.ID > 0 {
+		var usr user.Model
+		usr, err = user.GetByID(m.UserID)
+		m.User = &usr
+	}
+
+	return err
 }
 
 // GetCertificateLocations will return the paths on disk where the SSL
@@ -222,7 +239,8 @@ func (m *Model) GetCertificateLocations() (string, string, string) {
 func (m *Model) Request() error {
 	logger.Info("Requesting certificate for: #%d %v", m.ID, m.Name)
 
-	m.Expand()
+	// nolint: errcheck, gosec
+	m.Expand([]string{"certificate-authority", "dns-provider"})
 	m.Status = StatusRequesting
 	if err := m.Save(); err != nil {
 		logger.Error("CertificateSaveError", err)