refactor: Update PostgresDatabase.ts and UserService.ts to use explic…

…it type annotations
OneUptime · Aug 14, 2024 · 2e850ed · 2e850ed
1 parent 7e54fc3
commit 2e850ed
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 16 deletions.
diff --git a/App/FeatureSet/Home/Views/Blog/List.ejs b/App/FeatureSet/Home/Views/Blog/List.ejs
@@ -20,7 +20,7 @@
     <div class="relative isolate overflow-hidden bg-white">
       <div class="py-24 sm:py-32">
 
-        <%- include('./Partials/BlogTitleAndDescription', { title: 'Engineering Uptime - Blog by OneUptime', description: 'Latest posts on Observability, Monitoring, Reliability and more.' }) -%>
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Engineering Uptime', smallTitle: '- Blog by OneUptime', description: 'Latest posts on Observability, Monitoring, Reliability and more.' }) -%>
 
         <div class="mx-auto max-w-7xl px-6 lg:px-8">
 

diff --git a/App/FeatureSet/Home/Views/Blog/ListByTag.ejs b/App/FeatureSet/Home/Views/Blog/ListByTag.ejs
@@ -20,7 +20,7 @@
     <div class="relative isolate overflow-hidden bg-white">
       <div class="py-24 sm:py-32">
 
-        <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, description: 'Here are some of the latest posts on '+tagName }) -%>
+        <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, smallTitle: "", description: 'Here are some of the latest posts on '+tagName }) -%>
 
         <div class="mx-auto max-w-7xl px-6 lg:px-8">
 

diff --git a/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs b/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs
@@ -3,6 +3,13 @@
     <h1 class="max-w-5xl text-center text-6xl font-bold text-gray-900 leading-tight">
         <%= title %>
     </h1>
+    </div>
+    <div class="mx-auto flex justify-center text-center ">
+    <%  if(smallTitle){ %> 
+    <h3 class="max-w-5xl mt-5 text-center text-2xl font-medium text-gray-900 leading-tight">
+      <%= smallTitle %>
+    </h3>
+    <% } %>
   </div>
   <p class="text-2xl text-center leading-8 text-gray-600 mt-8 leading-normal">
     <%= description %>

diff --git a/App/FeatureSet/Home/Views/Blog/Post.ejs b/App/FeatureSet/Home/Views/Blog/Post.ejs
@@ -73,7 +73,7 @@
             <div class="py-24 sm:py-32">
                 <div class="mx-auto max-w-7xl px-6 lg:px-8">
 
-                    <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , description:
+                    <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , smallTitle: "", description:
                         blogPost.description }) -%>
 
 

diff --git a/Common/Server/Infrastructure/PostgresDatabase.ts b/Common/Server/Infrastructure/PostgresDatabase.ts
@@ -27,7 +27,7 @@ export default class Database {
   public async connect(): Promise<DataSource> {
     let retry: number = 0;
 
-    const dataSourceOptions = this.getDatasourceOptions();
+    const dataSourceOptions: DataSourceOptions = this.getDatasourceOptions();
 
     try {
       type ConnectToDatabaseFunction = () => Promise<DataSource>;

diff --git a/Common/Server/Services/TeamService.ts b/Common/Server/Services/TeamService.ts
@@ -6,7 +6,7 @@ import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import BadDataException from "Common/Types/Exception/BadDataException";
 import Model from "Common/Models/DatabaseModels/Team";
 
-export class TeamService extends DatabaseService<Model> {
+export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
@@ -69,4 +69,4 @@ export class TeamService extends DatabaseService<Model> {
     return { deleteBy, carryForward: null };
   }
 }
-export default new TeamService();
+export default new Service();
diff --git a/Common/Server/Services/UserService.ts b/Common/Server/Services/UserService.ts
@@ -33,7 +33,7 @@ import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
 import UserTwoFactorAuthService from "./UserTwoFactorAuthService";
 import BadDataException from "Common/Types/Exception/BadDataException";
 
-export class UserService extends DatabaseService<Model> {
+export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
@@ -318,4 +318,4 @@ export class UserService extends DatabaseService<Model> {
   }
 }
 
-export default new UserService();
+export default new Service();
diff --git a/Common/Tests/Server/Services/TeamMemberService.test.ts b/Common/Tests/Server/Services/TeamMemberService.test.ts
@@ -820,12 +820,12 @@ describe("TeamMemberService", () => {
     const SUBSCRIPTION_ID: string = "subscriptionId";
 
     it("should update subscription seats based on unique team members", async () => {
-      const user1 = await UserService.create({
+      const user1: User = await UserService.create({
         data: UserServiceHelper.generateRandomUser(),
         props: { isRoot: true },
       });
 
-      const project = await ProjectService.create({
+      const project: Project = await ProjectService.create({
         data: ProjectServiceHelper.generateRandomProject(),
         props: { isRoot: true, userId: user1.id! },
       });
@@ -847,14 +847,14 @@ describe("TeamMemberService", () => {
 
       // now add users.
 
-      const user2 = await UserService.create({
+      const user2: User = await UserService.create({
         data: UserServiceHelper.generateRandomUser(),
         props: { isRoot: true },
       });
 
       // add team
 
-      const team = await TeamService.create({
+      const team: Team = await TeamService.create({
         data: TeamServiceHelper.generateRandomTeam({
           projectId: new ObjectID(project._id!),
         }),

diff --git a/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts
@@ -3,7 +3,9 @@ import Project from "Common/Models/DatabaseModels/Project";
 import { PlanType } from "../../../../Types/Billing/SubscriptionPlan";
 
 export default class ProjectTestService {
-  public static generateRandomProject(data?: { seatLimit?: number } | undefined): Project {
+  public static generateRandomProject(
+    data?: { seatLimit?: number } | undefined,
+  ): Project {
     const project: Project = new Project();
 
     // required fields
@@ -12,7 +14,7 @@ export default class ProjectTestService {
     project.isBlocked = false;
     project.requireSsoForLogin = false;
 
-    if(data && data.seatLimit){
+    if (data && data.seatLimit) {
       project.seatLimit = data.seatLimit;
     }
 

diff --git a/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts b/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts
@@ -1,11 +1,15 @@
 import getTestDataSourceOptions from "../Postgres/TestDataSourceOptions";
-import { PostgresAppInstance } from "../../../../Server/Infrastructure/PostgresDatabase";
+import {
+  DatabaseSourceOptions,
+  PostgresAppInstance,
+} from "../../../../Server/Infrastructure/PostgresDatabase";
 import Redis from "../../../../Server/Infrastructure/Redis";
 import getTestRedisConnectionOptions from "../Redis/TestRedisOptions";
 
 export class TestDatabaseMock {
   public static async connectDbMock(): Promise<void> {
-    const testDataSourceOptions = getTestDataSourceOptions();
+    const testDataSourceOptions: DatabaseSourceOptions =
+      getTestDataSourceOptions();
 
     PostgresAppInstance.getDatasourceOptions = () => {
       return testDataSourceOptions;