Move db to sdk conversions to db2sdk.go

coder · code-asher · Dec 21, 2023 · Dec 11, 2023 · Dec 11, 2023 · Dec 12, 2023
commit fd13c0261b8cfb3eacb87b51ab6e7f5f3a9e9019
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -217,3 +217,20 @@ func templateVersionParameterOptions(rawOptions json.RawMessage) ([]codersdk.Tem
 	}
 	return options, nil
 }
+
+func OAuth2ProviderApp(dbApp database.OAuth2ProviderApp) codersdk.OAuth2ProviderApp {
+	return codersdk.OAuth2ProviderApp{
+		ID:          dbApp.ID,
+		Name:        dbApp.Name,
+		CallbackURL: dbApp.CallbackURL,
+		Icon:        dbApp.Icon,
+	}
+}
+
+func OAuth2ProviderApps(dbApps []database.OAuth2ProviderApp) []codersdk.OAuth2ProviderApp {
+	apps := []codersdk.OAuth2ProviderApp{}
+	for _, dbApp := range dbApps {
+		apps = append(apps, OAuth2ProviderApp(dbApp))
+	}
+	return apps
+}
diff --git a/enterprise/coderd/oauth2.go b/enterprise/coderd/oauth2.go
@@ -7,22 +7,14 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/database/db2sdk"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/cryptorand"
 )
 
-func convertApp(app database.OAuth2ProviderApp) codersdk.OAuth2ProviderApp {
-	return codersdk.OAuth2ProviderApp{
-		ID:          app.ID,
-		Name:        app.Name,
-		CallbackURL: app.CallbackURL,
-		Icon:        app.Icon,
-	}
-}
-
 // @Summary Get OAuth2 applications.
 // @ID get-oauth2-applications
 // @Security CoderSessionToken
@@ -37,11 +29,7 @@ func (api *API) oAuth2ProviderApps(rw http.ResponseWriter, r *http.Request) {
 		httpapi.InternalServerError(rw, err)
 		return
 	}
-	apps := []codersdk.OAuth2ProviderApp{}
-	for _, app := range dbApps {
-		apps = append(apps, convertApp(app))
-	}
-	httpapi.Write(ctx, rw, http.StatusOK, apps)
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.OAuth2ProviderApps(dbApps))
 }
 
 // @Summary Get OAuth2 application.
@@ -55,7 +43,7 @@ func (api *API) oAuth2ProviderApps(rw http.ResponseWriter, r *http.Request) {
 func (*API) oAuth2ProviderApp(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	app := httpmw.OAuth2ProviderApp(r)
-	httpapi.Write(ctx, rw, http.StatusOK, convertApp(app))
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.OAuth2ProviderApp(app))
 }
 
 // @Summary Create OAuth2 application.
@@ -88,7 +76,7 @@ func (api *API) postOAuth2ProviderApp(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-	httpapi.Write(ctx, rw, http.StatusCreated, convertApp(app))
+	httpapi.Write(ctx, rw, http.StatusCreated, db2sdk.OAuth2ProviderApp(app))
 }
 
 // @Summary Update OAuth2 application.
@@ -122,7 +110,7 @@ func (api *API) putOAuth2ProviderApp(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-	httpapi.Write(ctx, rw, http.StatusOK, convertApp(app))
+	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.OAuth2ProviderApp(app))
 }
 
 // @Summary Delete OAuth2 application.