fix: failing tests

Author: jescalada

packages/git-proxy-cli/test/testCli.test.ts

@@ -563,7 +563,7 @@ describe('test git-proxy-cli', function () {
         await helper.startServer(service as unknown as Proxy);
         await helper.runCli(`${CLI_PATH} login --username admin --password admin`);
 
-        const cli = `${CLI_PATH} create-user --username ${uniqueUsername} --password newpass --email new@email.com --gitAccount newgit`;
+        const cli = `${CLI_PATH} create-user --username ${uniqueUsername} --password newpass --email ${uniqueUsername}@email.com --gitAccount newgit`;
         const expectedExitCode = 0;
         const expectedMessages = [`User '${uniqueUsername}' created successfully`];
         const expectedErrorMessages = null;
@@ -573,7 +573,7 @@ describe('test git-proxy-cli', function () {
         await helper.runCli(
           `${CLI_PATH} login --username ${uniqueUsername} --password newpass`,
           0,
-          [`Login "${uniqueUsername}" <new@email.com>: OK`],
+          [`Login "${uniqueUsername}" <${uniqueUsername}@email.com>: OK`],
           null,
         );
       } finally {

src/db/file/pushes.ts

@@ -24,16 +24,14 @@ try {
 }
 db.setAutocompactionInterval(COMPACTION_INTERVAL);
 
-const defaultPushQuery: PushQuery = {
+const defaultPushQuery: Partial<PushQuery> = {
   error: false,
   blocked: true,
   allowPush: false,
   authorised: false,
-  canceled: false,
-  rejected: false,
 };
 
-export const getPushes = (query: PushQuery): Promise<Action[]> => {
+export const getPushes = (query: Partial<PushQuery>): Promise<Action[]> => {
   if (!query) query = defaultPushQuery;
   return new Promise((resolve, reject) => {
     db.find(query, (err: Error, docs: Action[]) => {

src/db/mongo/pushes.ts

@@ -5,16 +5,16 @@ import { PushQuery } from '../types';
 
 const collectionName = 'pushes';
 
-const defaultPushQuery: PushQuery = {
+const defaultPushQuery: Partial<PushQuery> = {
   error: false,
   blocked: true,
   allowPush: false,
   authorised: false,
-  canceled: false,
-  rejected: false,
 };
 
-export const getPushes = async (query: PushQuery = defaultPushQuery): Promise<Action[]> => {
+export const getPushes = async (
+  query: Partial<PushQuery> = defaultPushQuery,
+): Promise<Action[]> => {
   return findDocuments<Action>(collectionName, query, {
     projection: {
       _id: 0,