remove logging, make create superuser conditional

Author: ekraffmiller

jest.config.functional.ts

@@ -2,4 +2,5 @@ import config from './jest.config'
 
 config.modulePathIgnorePatterns = ['<rootDir>/test/unit', '<rootDir>/test/integration']
 console.log('RUNNING FUNCTIONAL TESTS')
+
 export default config

src/collections/domain/useCases/GetMyDataCollectionItems.ts

@@ -18,8 +18,9 @@ export class GetMyDataCollectionItems implements UseCase<CollectionItemSubset> {
    * @param {CollectionItemType[]} [collectionItemTypes] - the types of items to filter by.
    * @param {PublicationStatus[]} [publicationStatuses] - the publication statuses to filter by.
    * @param {number} [limit] - Limit number of items to return for pagination (optional).
-   * @param {number} [selected] - Offset (starting point) for pagination (optional).
+   * @param {number} [selectedPage] - Offset (starting point) for pagination (optional).
    * @param {string} [searchText] - filter by searching for this text in the results (optional).
+   * @param {string} [otherUserName] - filter by searching for this text in the results (optional).
    * * @returns {Promise<MyDataCollectionItemSubset>}
    */
   async execute(
@@ -31,17 +32,7 @@ export class GetMyDataCollectionItems implements UseCase<CollectionItemSubset> {
     searchText?: string,
     otherUserName?: string
   ): Promise<CollectionItemSubset> {
-    console.log('Execute called with params:', {
-      roleIds,
-      collectionItemTypes,
-      publicationStatuses,
-      limit,
-      selectedPage,
-      searchText,
-      otherUserName
-    })
-
-    const result = await this.collectionsRepository.getMyDataCollectionItems(
+    return this.collectionsRepository.getMyDataCollectionItems(
       roleIds,
       collectionItemTypes,
       publicationStatuses,
@@ -50,8 +41,5 @@ export class GetMyDataCollectionItems implements UseCase<CollectionItemSubset> {
       searchText,
       otherUserName
     )
-
-    console.log('Execute returned:', result)
-    return result
   }
 }

src/collections/infra/repositories/CollectionsRepository.ts

@@ -210,16 +210,6 @@ export class CollectionsRepository extends ApiRepository implements ICollections
     searchText?: string,
     userIdentifier?: string
   ): Promise<CollectionItemSubset> {
-    console.log('getMyDataCollectionItems called with params:', {
-      roleIds,
-      collectionItemTypes,
-      publicationStatuses,
-      limit,
-      selectedPage,
-      searchText,
-      userIdentifier
-    })
-
     const queryParams = new URLSearchParams()
 
     if (limit) {
@@ -267,7 +257,6 @@ export class CollectionsRepository extends ApiRepository implements ICollections
         publicationStatus.toString()
       )
     })
-    console.log('getMyDataCollectionItems queryParams:', queryParams)
     const result = await this.doGet('/mydata/retrieve', true, queryParams)
       .then((response) => {
         if (response.data.success !== true) {
@@ -279,7 +268,6 @@ export class CollectionsRepository extends ApiRepository implements ICollections
         throw error
       })
 
-    console.log('getMyDataCollectionItems returned:', result)
     return result
   }
 

test/integration/collections/CollectionsRepository.test.ts

@@ -1333,15 +1333,17 @@ describe('CollectionsRepository', () => {
     const testSubCollectionAlias = 'collectionsRepositoryMyDataCollection'
     const testCollectionName = 'Scientific Research'
     beforeAll(async () => {
-      const myDataUserApiToken = await createApiTokenViaApi('myDataUser')
+      const createSuperUser = true
+      const myDataUserApiToken = await createApiTokenViaApi('myDataUser', createSuperUser)
       ApiConfig.init(
         TestConstants.TEST_API_URL,
         DataverseApiAuthMechanism.API_KEY,
         myDataUserApiToken
       )
       process.env.TEST_API_KEY = myDataUserApiToken
       const collectionDTO = createCollectionDTO(testSubCollectionAlias)
-      await createCollection.execute(collectionDTO, testCollectionAlias).catch(() => {
+      await createCollection.execute(collectionDTO, testCollectionAlias).catch((error) => {
+        console.log(error.message)
         throw new Error(
           `Tests beforeAll(): Error while creating subcollection ${testSubCollectionAlias}`
         )

test/testHelpers/collections/collectionHelper.ts

@@ -90,8 +90,6 @@ export async function createCollectionViaApi(
     if (parentCollectionAlias == undefined) {
       parentCollectionAlias = ':root'
     }
-    // Print api key to make sure it is set
-    console.log(`creating collection, API Key: ${process.env.TEST_API_KEY}`)
     return await axios
       .post(
         `${TestConstants.TEST_API_URL}/dataverses/${parentCollectionAlias}`,

test/testHelpers/users/apiTokenHelper.ts

@@ -1,7 +1,10 @@
 import axios from 'axios'
 import { TestConstants } from '../TestConstants'
 
-export const createApiTokenViaApi = async (userName: string): Promise<string> => {
+export const createApiTokenViaApi = async (
+  userName: string,
+  createSuperUser = false
+): Promise<string> => {
   try {
     await axios.post(
       `${TestConstants.TEST_API_URL}/builtin-users?key=burrito&password=${userName}`,
@@ -20,8 +23,9 @@ export const createApiTokenViaApi = async (userName: string): Promise<string> =>
     const token = await axios
       .get(`${TestConstants.TEST_API_URL}/builtin-users/${userName}/api-token?password=${userName}`)
       .then((response) => response.data.data.message)
-    await axios.put(`${TestConstants.TEST_API_URL}/admin/superuser/${userName}`, 'true')
-    console.log(`Created API token for user ${userName}: ${token}`)
+    if (createSuperUser) {
+      await axios.put(`${TestConstants.TEST_API_URL}/admin/superuser/${userName}`, 'true')
+    }
     return token
   } catch (error: Error | any) {
     console.log(error.message)